Merge "SurfaceView: Fix positioning issue when toggling visibility." into oc-dev am: 70f1565b55

am: bf78acda44

Change-Id: I98b615cd1f52385bb3cdbc4dcc287911f3eabad0

core/java/android/view/SurfaceView.java

@@ -838,6 +838,8 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
             Log.d(TAG, String.format("%d windowPositionLost, frameNr = %d",
                     System.identityHashCode(this), frameNumber));
         }
+        mRTLastReportedPosition.setEmpty();
+
         if (mSurfaceControl == null) {
             return;
         }
@@ -858,7 +860,6 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
                     Log.e(TAG, "Exception configuring surface", ex);
                 }
             }
-            mRTLastReportedPosition.setEmpty();
         }
     }