commit 0606597cab4f659128b3dc32e9654d7526be2118
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Feb 01 18:03:15 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 01 18:03:15 2019 +0000
tree ee1e63938b695bf1af9986cf85e279c1d5b52adc
parent a28aa5e6ec9e9be09b8c7982e1479760e35d79bb
parent d8e4fb78699c1475e0a1ed3ab7bb0b6e6634d925

Merge "AppWindowToken: Guard against null SurfaceControl in prepareSurfaces"

services/core/java/com/android/server/wm/AppWindowToken.java

diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java
index ebb61f2..29ba166 100644
--- a/services/core/java/com/android/server/wm/AppWindowToken.java
+++ b/services/core/java/com/android/server/wm/AppWindowToken.java
@@ -2852,10 +2852,13 @@
         // to check super here.
         final boolean reallyAnimating = super.isSelfAnimating();
         final boolean show = !isHidden() || reallyAnimating;
-        if (show && !mLastSurfaceShowing) {
-            mPendingTransaction.show(mSurfaceControl);
-        } else if (!show && mLastSurfaceShowing) {
-            mPendingTransaction.hide(mSurfaceControl);
+
+        if (mSurfaceControl != null) {
+            if (show && !mLastSurfaceShowing) {
+                mPendingTransaction.show(mSurfaceControl);
+            } else if (!show && mLastSurfaceShowing) {
+                mPendingTransaction.hide(mSurfaceControl);
+            }
         }
         if (mThumbnail != null) {
             mThumbnail.setShowing(mPendingTransaction, show);