[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: f2d4787451

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

Change-Id: I1e4c3d42668d5f6459f4a07436edb7ff46f3e90f
This commit is contained in:
Jeff Chang
2022-03-07 06:00:36 +00:00
committed by Automerger Merge Worker

View File

@@ -2147,7 +2147,9 @@ class ActivityStack extends ConfigurationContainer {
boolean aboveTop = top != null;
final boolean stackShouldBeVisible = shouldBeVisible(starting);
boolean behindFullscreenActivity = !stackShouldBeVisible;
boolean resumeNextActivity = isFocusable() && isInStackLocked(starting) == null;
boolean resumeNextActivity = isFocusable()
&& getVisibility(starting) == STACK_VISIBILITY_VISIBLE
&& isInStackLocked(starting) == null;
for (int taskNdx = mTaskHistory.size() - 1; taskNdx >= 0; --taskNdx) {
final TaskRecord task = mTaskHistory.get(taskNdx);
final ArrayList<ActivityRecord> activities = task.mActivities;