commit | 1e09d0e489f1626b3ef09313f3f63d3c130471bb | [log] [tgz] |
---|---|---|
author | Jeff Chang <chengjeff@google.com> | Tue Apr 30 07:14:30 2019 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Apr 30 07:14:30 2019 +0000 |
tree | e31ba8a95b8b4a50ac82eb5b24f790fd5f8a461a | |
parent | b0815a51e93452b57b4bc22c224f72b635baa187 [diff] | |
parent | a2ee83dbc66a87ef76eddf6eee827156ad261f74 [diff] |
Merge "Fix NPE on ActivityStack.removeTask when launched with invalid taskId" into qt-dev
diff --git a/services/core/java/com/android/server/wm/ActivityStack.java b/services/core/java/com/android/server/wm/ActivityStack.java index 4ed07c3..8a834c8 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 @@ if (isAttached()) { getDisplay().positionChildAtBottom(this); } - if (!isActivityTypeHome() || getDisplay().isRemoved()) { + if (!isActivityTypeHome() || !isAttached()) { remove(); } }