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

Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-03-07 05:40:46 +00:00
committed by Android (Google) Code Review
parent 4d7ca1dbce f2d4787451
commit 88bdf80af8
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/ActivityStack.java
View File

@@ -2145,7 +2145,9 @@ class ActivityStack extends ConfigurationContainer {
boolean aboveTop = top != null; boolean aboveTop = top != null;
final boolean stackShouldBeVisible = shouldBeVisible(starting); final boolean stackShouldBeVisible = shouldBeVisible(starting);
boolean behindFullscreenActivity = !stackShouldBeVisible; 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) { for (int taskNdx = mTaskHistory.size() - 1; taskNdx >= 0; --taskNdx) {
final TaskRecord task = mTaskHistory.get(taskNdx); final TaskRecord task = mTaskHistory.get(taskNdx);
final ArrayList<ActivityRecord> activities = task.mActivities; final ArrayList<ActivityRecord> activities = task.mActivities;