From a2ee83dbc66a87ef76eddf6eee827156ad261f74 Mon Sep 17 00:00:00 2001
From: Jeff Chang <chengjeff@google.com>
Date: Wed, 26 Dec 2018 20:24:47 +0800
Subject: [PATCH] Fix NPE on ActivityStack.removeTask when launched with
 invalid taskId

Prevents NPE in removeTask when use getDisplay directly.

Bug: 119023840
Test: atest WmTests:ActivityStackTests

Change-Id: I894f4b13e8a61c267f51af5331d8524a26cea009
---
 services/core/java/com/android/server/wm/ActivityStack.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/ActivityStack.java b/services/core/java/com/android/server/wm/ActivityStack.java
index 4ed07c351847a..8a834c8f942bd 100644
--- a/services/core/java/com/android/server/wm/ActivityStack.java
+++ b/services/core/java/com/android/server/wm/ActivityStack.java
@@ -5438,7 +5438,7 @@ class ActivityStack extends ConfigurationContainer {
             if (isAttached()) {
                 getDisplay().positionChildAtBottom(this);
             }
-            if (!isActivityTypeHome() || getDisplay().isRemoved()) {
+            if (!isActivityTypeHome() || !isAttached()) {
                 remove();
             }
         }