Merge "RESTRICT AUTOMERGE Avoid the scenario Where taskdisplayarea is null"

2021-08-23 09:46:12 +00:00
parent c875fc5613 26d8e9e85a
commit 493baa1280
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/ActivityStarter.java
+++ b/services/core/java/com/android/server/wm/ActivityStarter.java
@@ -1468,7 +1468,7 @@ class ActivityStarter {
        final Task targetTask = r.getTask() != null
                ? r.getTask()
                : mTargetTask;
-        if (startedActivityStack == null || targetTask == null) {
+        if (startedActivityStack == null || targetTask == null || !targetTask.isAttached()) {
            return;
        }