Merge "Fix NPE on ActivityStack.removeTask when launched with invalid taskId" into qt-dev

2019-04-30 07:14:30 +00:00
parent b0815a51e9 a2ee83dbc6
commit 1e09d0e489
1 changed files with 1 additions and 1 deletions
--- 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();
            }
        }