Merge "Avoid the scenario Where taskdisplayarea is null" into sc-v2-dev

2021-08-18 02:17:16 +00:00
parent 53719f8b68 8e4db8ed40
commit 3767ba9926
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
@@ -1509,7 +1509,7 @@ class ActivityStarter {
        final Task targetTask = r.getTask() != null
                ? r.getTask()
                : mTargetTask;
-        if (startedActivityRootTask == null || targetTask == null) {
+        if (startedActivityRootTask == null || targetTask == null || !targetTask.isAttached()) {
            return;
        }