Merge "Fix logspam NPE." into oc-dev

am: bd1ef76684 Change-Id: I16bfcd16236ba42302208dce37e3eb08907f2c91
2017-04-26 21:54:48 +00:00
parent 7430a65136 bd1ef76684
commit 96a018166a
1 changed files with 4 additions and 0 deletions
--- a/core/java/android/view/SurfaceView.java
+++ b/core/java/android/view/SurfaceView.java
@@ -711,6 +711,10 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
                    mTranslator.translateRectInAppWindowToScreen(mScreenRect);
                }

+                if (mSurfaceControl == null) {
+                    return;
+                }
+
                if (!isHardwareAccelerated() || !mRtHandlingPositionUpdates) {
                    try {
                        if (DEBUG) Log.d(TAG, String.format("%d updateSurfacePosition UI, " +