Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf41100f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Ensure the next activity of non-focusable task to be visible" into... 

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

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

Change-Id: I798e2487076dfcee035714c41719a65487cb2514
parents 0abd962e b33de1f6

services/core/java/com/android/server/wm/ActivityStarter.java

+5 −1
Original line number Diff line number Diff line
@@ -2538,7 +2538,11 @@ class ActivityStarter { 


    private void resumeTargetStackIfNeeded() {

        if (mDoResume) {

            if (mTargetStack.isFocusable()) {

                mRootWindowContainer.resumeFocusedStacksTopActivities(mTargetStack, null, mOptions);

            } else {

                mRootWindowContainer.ensureActivitiesVisible(null, 0, !PRESERVE_WINDOWS);

            }

        } else {

            ActivityOptions.abort(mOptions);

        }