diff options
| author | Rob Carr <racarr@google.com> | 2017-04-26 21:43:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-04-26 21:43:30 +0000 |
| commit | bd1ef76684cbc804dc82f35c0d59f96e46ac83c5 (patch) | |
| tree | c734609bffa2fad3de96f2c1cff73f8cf7e8ecec /core/java/android | |
| parent | 1c2964bdeb9c021953f501c7ba18c041e5fc94cf (diff) | |
| parent | 3651ab8e097e2c5abcd55dde6005ec0c196c62f6 (diff) | |
Merge "Fix logspam NPE." into oc-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/SurfaceView.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java index 9d40895f6ad9..f53975239e4a 100644 --- 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, " + |