1 files changed, 12 insertions, 3 deletions
diff --git a/bridge/src/android/view/ViewRootImpl_Accessor.java b/bridge/src/android/view/ViewRootImpl_Accessor.java
index 81ffe2e324..d15952ad3d 100644
--- a/bridge/src/android/view/ViewRootImpl_Accessor.java
+++ b/bridge/src/android/view/ViewRootImpl_Accessor.java
@@ -26,8 +26,17 @@ public class ViewRootImpl_Accessor {
 
     public static void setChild(ViewRootImpl viewRoot, View child) {
         viewRoot.mView = child;
-        child.assignParent(viewRoot);
-        viewRoot.mWidth = child.getWidth();
-        viewRoot.mHeight = child.getHeight();
+        if (child != null) {
+            viewRoot.mWidth = child.getWidth();
+            viewRoot.mHeight = child.getHeight();
+        } else {
+            viewRoot.mWidth = -1;
+            viewRoot.mHeight = -1;
+        }
+    }
+
+    public static void detachFromWindow(ViewRootImpl viewRoot) {
+        viewRoot.mAccessibilityInteractionConnectionManager.ensureNoConnection();
+        viewRoot.mAccessibilityInteractionConnectionManager.ensureNoDirectConnection();
     }
 }