Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Treehugger Robot
2021-08-23 09:46:12 +00:00
committed by Gerrit Code Review
parent c875fc5613 26d8e9e85a
commit 493baa1280
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/ActivityStarter.java
View File

@@ -1468,7 +1468,7 @@ class ActivityStarter {
final Task targetTask = r.getTask() != null final Task targetTask = r.getTask() != null
? r.getTask() ? r.getTask()
: mTargetTask; : mTargetTask;
if (startedActivityStack == null || targetTask == null) { if (startedActivityStack == null || targetTask == null || !targetTask.isAttached()) {
return; return;
} }