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

Merge "Ensure the next activity of non-focusable task to be visible" into rvc-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-03-30 23:31:09 +00:00
committed by Android (Google) Code Review
parent 3e20c3e9a1 1d83fdbaf6
commit b33de1f64b
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wm/ActivityStarter.java
View File

@@ -2545,7 +2545,11 @@ class ActivityStarter {
private void resumeTargetStackIfNeeded() { private void resumeTargetStackIfNeeded() {
if (mDoResume) { if (mDoResume) {
mRootWindowContainer.resumeFocusedStacksTopActivities(mTargetStack, null, mOptions); if (mTargetStack.isFocusable()) {
mRootWindowContainer.resumeFocusedStacksTopActivities(mTargetStack, null, mOptions);
} else {
mRootWindowContainer.ensureActivitiesVisible(null, 0, !PRESERVE_WINDOWS);
}
} else { } else {
ActivityOptions.abort(mOptions); ActivityOptions.abort(mOptions);
} }