Merge "Add null-check when adding starting window"

2017-01-18 23:23:08 +00:00
parent 1b9c85894f 70176432f5
commit 57c45562cd
1 changed files with 3 additions and 0 deletions
--- a/services/core/java/com/android/server/am/ActivityRecord.java
+++ b/services/core/java/com/android/server/am/ActivityRecord.java
@@ -1802,6 +1802,9 @@ final class ActivityRecord implements AppWindowContainerListener {
    }

    void showStartingWindow(ActivityRecord prev, boolean newTask, boolean taskSwitch) {
+        if (mWindowContainerController == null) {
+            return;
+        }
        final CompatibilityInfo compatInfo =
                service.compatibilityInfoForPackageLocked(info.applicationInfo);
        final boolean shown = mWindowContainerController.addStartingWindow(packageName, theme,