From f77abc583c7a7766c7a0e356ddab5e0febc6ea68 Mon Sep 17 00:00:00 2001
From: Joshua Gross <joshuagross@fb.com>
Date: Tue, 5 Nov 2019 18:17:50 -0800
Subject: [PATCH] Add UI asserts and logs to a few more places

Summary:
Add UI asserts to ensure thread safety of some operations.

Changelog: [Internal]

Reviewed By: mdvacca

Differential Revision: D18339981

fbshipit-source-id: 9162b6351f40bdd543d3e255691e9f54d1934589
---
 .../facebook/react/uimanager/NativeViewHierarchyManager.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java
index a31cb883c3f..412fe269e0d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java
@@ -484,6 +484,10 @@ public class NativeViewHierarchyManager {
               new LayoutAnimationListener() {
                 @Override
                 public void onAnimationEnd() {
+                  // This should be called only on the UI thread, because
+                  // onAnimationEnd is called (indirectly) by Android View Animation.
+                  UiThreadUtil.assertOnUiThread();
+
                   viewManager.removeView(viewToManage, viewToDestroy);
                   dropView(viewToDestroy);