assert on UIBackground thread if UIBackground thread is available

Reviewed By: raluca-elena Differential Revision: D5008046 fbshipit-source-id: 033b9ee76b331f6a4abcf4070e1a3206d7a8a422
facebook · May 5, 2017 · 83a58f6 · 83a58f6
1 parent d353b75
commit 83a58f6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java
@@ -312,6 +312,14 @@ public boolean hasUIBackgroundRunnableThread() {
     return mUiBackgroundMessageQueueThread != null;
   }
 
+  public void assertOnUIBackgroundOrNativeModulesThread() {
+    if (mUiBackgroundMessageQueueThread == null) {
+      assertOnNativeModulesQueueThread();
+    } else {
+      assertOnUiBackgroundQueueThread();
+    }
+  }
+
   public void runUIBackgroundRunnable(Runnable runnable) {
     if (mUiBackgroundMessageQueueThread == null) {
       runOnNativeModulesQueueThread(runnable);

diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java
@@ -233,7 +233,7 @@ public void removeRootView(int rootViewTag) {
   }
 
   public void updateNodeSize(int nodeViewTag, int newWidth, int newHeight) {
-    getReactApplicationContext().assertOnNativeModulesQueueThread();
+    getReactApplicationContext().assertOnUIBackgroundOrNativeModulesThread();
 
     mUIImplementation.updateNodeSize(nodeViewTag, newWidth, newHeight);
   }