commit 1b08a4a8a3271f04b98c34747fe077610b7ee534
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Aug 17 18:38:04 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 17 18:38:04 2017 +0000
tree b70fe1e1d7b3aeb82542f00e1d4d2224c8a33d15
parent 36d3f3fd02163e836ffea6a335ebe78a110fcd9c
parent eafe737ac31c9dcc5b0f42884b4d27c568e255c0

Merge "Don't call surface.remove if surface is null." into oc-mr1-dev

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

diff --git a/services/core/java/com/android/server/wm/AppWindowContainerController.java b/services/core/java/com/android/server/wm/AppWindowContainerController.java
index 1ca98ac..f142ff6 100644
--- a/services/core/java/com/android/server/wm/AppWindowContainerController.java
+++ b/services/core/java/com/android/server/wm/AppWindowContainerController.java
@@ -632,9 +632,12 @@
                 mContainer.startingSurface = null;
                 mContainer.startingWindow = null;
                 mContainer.startingDisplayed = false;
-                if (surface == null && DEBUG_STARTING_WINDOW) {
-                    Slog.v(TAG_WM, "startingWindow was set but startingSurface==null, couldn't "
-                            + "remove");
+                if (surface == null) {
+                    if (DEBUG_STARTING_WINDOW) {
+                        Slog.v(TAG_WM, "startingWindow was set but startingSurface==null, couldn't "
+                                + "remove");
+                    }
+                    return;
                 }
             } else {
                 if (DEBUG_STARTING_WINDOW) {