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

Merge "Avoid the scenario Where taskdisplayarea is null" into sc-v2-dev am: 3767ba9926

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15581985

Change-Id: Id7c3736efe945f323eb0618a56d57afbbe3e8280
This commit is contained in:
Louis Chang
2021-08-18 02:27:54 +00:00
committed by Automerger Merge Worker
parent 12b48a8aa8 3767ba9926
commit b56e8efca6
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

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