Merge "Fix bad merge"

2017-01-13 13:28:49 +00:00
parent a7d1580547 553cec66f7
commit 61301e9cf5
1 changed files with 3 additions and 0 deletions
--- a/services/core/java/com/android/server/wm/AppWindowContainerController.java
+++ b/services/core/java/com/android/server/wm/AppWindowContainerController.java
@@ -92,6 +92,9 @@ public class AppWindowContainerController
            if (DEBUG_STARTING_WINDOW) Slog.v(TAG_WM, "Remove starting " + mContainer
                    + ": startingWindow=" + mContainer.startingWindow
                    + " startingView=" + mContainer.startingSurface);
+            if (mContainer == null) {
+                return;
+            }
            if (mContainer.startingWindow != null) {
                surface = mContainer.startingSurface;
                data = mContainer.startingData;