From 73f8820ccca9ae962a218967160792ef187de105 Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Thu, 12 Jan 2017 13:54:40 +0100
Subject: [PATCH] Fix NPE when trying to add starting window

Container may already have been removed, so protect against that
situation.

Test: Boot device
Change-Id: Ic76d74c6df0801e2a50352a4b04d67b5d216d4fe
Fixes: 34227241
---
 .../com/android/server/wm/AppWindowContainerController.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/services/core/java/com/android/server/wm/AppWindowContainerController.java b/services/core/java/com/android/server/wm/AppWindowContainerController.java
index 76309847a1723..d2f604d671321 100644
--- a/services/core/java/com/android/server/wm/AppWindowContainerController.java
+++ b/services/core/java/com/android/server/wm/AppWindowContainerController.java
@@ -85,6 +85,9 @@ public class AppWindowContainerController
         final Configuration mergedOverrideConfiguration;
 
         synchronized (mWindowMap) {
+            if (mContainer == null) {
+                return;
+            }
             startingData = mContainer.startingData;
             mergedOverrideConfiguration = mContainer.getMergedOverrideConfiguration();
         }
@@ -150,6 +153,9 @@ public class AppWindowContainerController
                     + mContainer + ": startingWindow="
                     + mContainer.startingWindow + " startingView="
                     + mContainer.startingSurface);
+            if (mContainer == null) {
+                return;
+            }
             if (mContainer.startingWindow != null) {
                 contents = mContainer.startingSurface;
                 token = mContainer.token;