From 553cec66f736052535390b29531e8602bc4cab23 Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Fri, 13 Jan 2017 13:00:42 +0100
Subject: [PATCH] Fix bad merge

Test: Boot device, hope for the best
Change-Id: I0231874a5f4d7cc8b49cc6f978c17c1af6fa93be
Fixes: 34227241
---
 .../com/android/server/wm/AppWindowContainerController.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/core/java/com/android/server/wm/AppWindowContainerController.java b/services/core/java/com/android/server/wm/AppWindowContainerController.java
index 1eb74fa41f337..9b2d3c6b090f1 100644
--- 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;