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

am: 5bee11f577

Change-Id: Ie3f01cf1a7409f82bf13e4d10199e386109d994e

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

@@ -632,9 +632,12 @@ public class AppWindowContainerController
                 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) {