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

Merge "Not resume the invisible TaskFragment when resume top Task" into sc-v2-dev

Browse Source
This commit is contained in:
Chris Li
2021-08-18 04:25:45 +00:00
committed by Android (Google) Code Review
parent 3aa94ca277 ec7b3c2c53
commit db888014dc
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/wm/Task.java
View File

@@ -3114,10 +3114,6 @@ class Task extends TaskFragment {
}); });
} }
boolean isFocusableAndVisible() {
return isTopActivityFocusable() && shouldBeVisible(null /* starting */);
}
void positionChildAtTop(ActivityRecord child) { void positionChildAtTop(ActivityRecord child) {
positionChildAt(child, POSITION_TOP); positionChildAt(child, POSITION_TOP);
} }
@@ -5037,7 +5033,10 @@ class Task extends TaskFragment {
if (topFragment == f) { if (topFragment == f) {
return; return;
} }
if (!f.isFocusableAndVisible()) {
// No need to resume activity in TaskFragment that is not visible.
return;
}
resumed[0] |= f.resumeTopActivity(prev, options, deferPause); resumed[0] |= f.resumeTopActivity(prev, options, deferPause);
}, true); }, true);
return resumed[0]; return resumed[0];

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

@@ -1262,6 +1262,10 @@ class TaskFragment extends WindowContainer<WindowContainer> {
return getVisibility(starting) != TASK_FRAGMENT_VISIBILITY_INVISIBLE; return getVisibility(starting) != TASK_FRAGMENT_VISIBILITY_INVISIBLE;
} }
boolean isFocusableAndVisible() {
return isTopActivityFocusable() && shouldBeVisible(null /* starting */);
}
final boolean startPausing(boolean uiSleeping, ActivityRecord resuming, String reason) { final boolean startPausing(boolean uiSleeping, ActivityRecord resuming, String reason) {
return startPausing(mTaskSupervisor.mUserLeaving, uiSleeping, resuming, reason); return startPausing(mTaskSupervisor.mUserLeaving, uiSleeping, resuming, reason);
} }