Merge "Revert "ViewRootImpl: Fix child lifetime."" into oc-dev

core/java/android/view/SurfaceView.java

@@ -683,8 +683,7 @@ public class SurfaceView extends View {
                     mTranslator.translateRectInAppWindowToScreen(mScreenRect);
                 }
 
-                if (mSurfaceControl != null
-                        && (!isHardwareAccelerated() || !mRtHandlingPositionUpdates)) {
+                if (!isHardwareAccelerated() || !mRtHandlingPositionUpdates) {
                     try {
                         if (DEBUG) Log.d(TAG, String.format("%d updateSurfacePosition UI, " +
                                 "postion = [%d, %d, %d, %d]", System.identityHashCode(this),

core/java/android/view/ViewRootImpl.java

@@ -1249,13 +1249,6 @@ public final class ViewRootImpl implements ViewParent,
         mIsAmbientMode = ambient;
     }
 
-    void setWindowVisibility(int visibility) {
-        if (visibility != mAttachInfo.mWindowVisibility) {
-            mAttachInfo.mWindowVisibility = visibility;
-            mView.dispatchWindowVisibilityChanged(visibility);
-        }
-    }
-
     void setWindowStopped(boolean stopped) {
         if (mStopped != stopped) {
             mStopped = stopped;
@@ -1270,7 +1263,6 @@ public final class ViewRootImpl implements ViewParent,
                 if (renderer != null) {
                     renderer.destroyHardwareResources(mView);
                 }
-                mView.dispatchWindowVisibilityChanged(View.GONE);
             }
         }
     }
@@ -1305,8 +1297,7 @@ public final class ViewRootImpl implements ViewParent,
     }
 
     int getHostVisibility() {
-        return (mAppVisible || mForceDecorViewVisibility) && !mStopped
-            ? mView.getVisibility() : View.GONE;
+        return (mAppVisible || mForceDecorViewVisibility) ? mView.getVisibility() : View.GONE;
     }
 
     /**
@@ -1663,8 +1654,8 @@ public final class ViewRootImpl implements ViewParent,
         }
 
         if (viewVisibilityChanged) {
-            setWindowVisibility(viewVisibility);
-
+            mAttachInfo.mWindowVisibility = viewVisibility;
+            host.dispatchWindowVisibilityChanged(viewVisibility);
             if (viewUserVisibilityChanged) {
                 host.dispatchVisibilityAggregated(viewVisibility == View.VISIBLE);
             }