From 5d58831eacfca24d60f5786bc15144a974baf8c6 Mon Sep 17 00:00:00 2001
From: Aaron Chiu <aaronechiu@fb.com>
Date: Fri, 25 Aug 2017 18:25:56 -0700
Subject: [PATCH] revert D5609280

Reviewed By: achen1

Differential Revision: D5711182

fbshipit-source-id: 5b4d813d144d92671090443990a3e2ea2abf3abe
---
 .../com/facebook/react/ReactInstanceManager.java     |  1 +
 .../main/java/com/facebook/react/ReactRootView.java  | 12 ++++++------
 .../com/facebook/react/uimanager/TaggedRootView.java |  9 ---------
 .../facebook/react/uimanager/UIManagerModule.java    |  2 +-
 4 files changed, 8 insertions(+), 16 deletions(-)
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/uimanager/TaggedRootView.java

diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
index 88f245a6a..52e44d387 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
@@ -932,6 +932,7 @@ public class ReactInstanceManager {
     Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "attachRootViewToInstance");
     UIManagerModule uiManagerModule = catalystInstance.getNativeModule(UIManagerModule.class);
     final int rootTag = uiManagerModule.addRootView(rootView);
+    rootView.setRootViewTag(rootTag);
     rootView.runApplication();
     Systrace.beginAsyncSection(
       TRACE_TAG_REACT_JAVA_BRIDGE,
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
index 082c7fedd..e33f85ee9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
@@ -41,10 +41,8 @@ import com.facebook.react.modules.deviceinfo.DeviceInfoModule;
 import com.facebook.react.uimanager.DisplayMetricsHolder;
 import com.facebook.react.uimanager.JSTouchDispatcher;
 import com.facebook.react.uimanager.PixelUtil;
-import com.facebook.react.uimanager.ReactRootViewTagGenerator;
 import com.facebook.react.uimanager.RootView;
 import com.facebook.react.uimanager.SizeMonitoringFrameLayout;
-import com.facebook.react.uimanager.TaggedRootView;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.systrace.Systrace;
@@ -62,7 +60,7 @@ import javax.annotation.Nullable;
  * subsequent touch events related to that gesture (in case when JS code want to handle that
  * gesture).
  */
-public class ReactRootView extends SizeMonitoringFrameLayout implements RootView, TaggedRootView {
+public class ReactRootView extends SizeMonitoringFrameLayout implements RootView {
 
   /**
    * Listener interface for react root view events
@@ -79,7 +77,7 @@ public class ReactRootView extends SizeMonitoringFrameLayout implements RootView
   private @Nullable Bundle mAppProperties;
   private @Nullable CustomGlobalLayoutListener mCustomGlobalLayoutListener;
   private @Nullable ReactRootViewEventListener mRootViewEventListener;
-  private int mRootViewTag = ReactRootViewTagGenerator.getNextRootViewTag();
+  private int mRootViewTag;
   private boolean mIsAttachedToInstance;
   private boolean mShouldLogContentAppeared;
   private final JSTouchDispatcher mJSTouchDispatcher = new JSTouchDispatcher(this);
@@ -257,7 +255,6 @@ public class ReactRootView extends SizeMonitoringFrameLayout implements RootView
     if (mReactInstanceManager != null && mIsAttachedToInstance) {
       mReactInstanceManager.detachRootView(this);
       mIsAttachedToInstance = false;
-      mRootViewTag = ReactRootViewTagGenerator.getNextRootViewTag();
     }
     mShouldLogContentAppeared = false;
   }
@@ -361,11 +358,14 @@ public class ReactRootView extends SizeMonitoringFrameLayout implements RootView
         "the onDestroyView() of your hosting Fragment.");
   }
 
-  @Override
   public int getRootViewTag() {
     return mRootViewTag;
   }
 
+  public void setRootViewTag(int rootViewTag) {
+    mRootViewTag = rootViewTag;
+  }
+
   private class CustomGlobalLayoutListener implements ViewTreeObserver.OnGlobalLayoutListener {
     private final Rect mVisibleViewArea;
     private final int mMinKeyboardHeightDetected;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/TaggedRootView.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/TaggedRootView.java
deleted file mode 100644
index 17899a070..000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/TaggedRootView.java
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-package com.facebook.react.uimanager;
-
-/** Interface for the a ReactRootView with a tag. */
-public interface TaggedRootView {
-
-  int getRootViewTag();
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java
index b3ea5dbf5..b71a3e9d9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java
@@ -183,7 +183,7 @@ public class UIManagerModule extends ReactContextBaseJavaModule implements
     Systrace.beginSection(
       Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,
       "UIManagerModule.addRootView");
-    final int tag = ((TaggedRootView) rootView).getRootViewTag();
+    final int tag = ReactRootViewTagGenerator.getNextRootViewTag();
 
     final int width;
     final int height;