diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityStarter.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index 85305cc6403f..0d447e34502e 100644 --- a/services/core/java/com/android/server/wm/ActivityStarter.java +++ b/services/core/java/com/android/server/wm/ActivityStarter.java @@ -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 */); } |