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 am: b33de1f64b

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

Change-Id: I798e2487076dfcee035714c41719a65487cb2514
This commit is contained in:
TreeHugger Robot
2021-03-31 00:15:37 +00:00
committed by Automerger Merge Worker
parent 0abd962e42 b33de1f64b
commit bf41100f50
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

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