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

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

Change-Id: Id44ea143e76b978c59447f782553d9827cd74671
This commit is contained in:
Louis Chang
2021-08-18 02:45:18 +00:00
committed by Automerger Merge Worker

View File

@@ -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;
}