summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorRobert Carr <racarr@google.com>2017-04-25 12:05:34 -0700
committerRobert Carr <racarr@google.com>2017-04-25 12:05:34 -0700
commit3651ab8e097e2c5abcd55dde6005ec0c196c62f6 (patch)
tree56028080a65c95fd04f1022cc77feeb685ca6bc1 /core/java
parent13ba34bf3789a33a0ab62947b12445820dffa945 (diff)
Fix logspam NPE.
Harmless but spammy. Bug: 37622525 Test: Repro from bug. Change-Id: I7fa2404fddb0c62efdd4553d5c61e92ae8f3a876
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/view/SurfaceView.java4
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, " +