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

Commit eabd7969 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Use the pre-reset userLeaving for canPipOnFinish" into tm-qpr-dev am:... 

Merge "Use the pre-reset userLeaving for canPipOnFinish" into tm-qpr-dev am: 77a72dc4 am: f2b01dc9

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



Change-Id: I04cb5efa6855f96628ebd6ebc3d45843db9913ba
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8b3cbc32 f2b01dc9

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

+2 −1
Original line number Diff line number Diff line
@@ -1674,6 +1674,7 @@ class ActivityStarter { 
    private @Nullable Task handleStartResult(@NonNull ActivityRecord started,

            ActivityOptions options, int result, Transition newTransition,

            RemoteTransition remoteTransition) {

        final boolean userLeaving = mSupervisor.mUserLeaving;

        mSupervisor.mUserLeaving = false;

        final Task currentRootTask = started.getRootTask();

        final Task startedActivityRootTask =
@@ -1747,7 +1748,7 @@ class ActivityStarter { 
            // until after we launched to identify the relevant activity.

            transitionController.setTransientLaunch(mLastStartActivityRecord, mPriorAboveTask);

        }

        if (!mSupervisor.mUserLeaving) {

        if (!userLeaving) {

            // no-user-leaving implies not entering PiP.

            transitionController.setCanPipOnFinish(false /* canPipOnFinish */);

        }