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

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

Browse Source
This commit is contained in:
Evan Rosky
2022-05-12 00:10:00 +00:00
committed by Android (Google) Code Review
parent bc501c5e02 ac9edf2f93
commit 77a72dc470
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1674,6 +1674,7 @@ class ActivityStarter {
private @Nullable Task handleStartResult(@NonNull ActivityRecord started, private @Nullable Task handleStartResult(@NonNull ActivityRecord started,
ActivityOptions options, int result, Transition newTransition, ActivityOptions options, int result, Transition newTransition,
RemoteTransition remoteTransition) { RemoteTransition remoteTransition) {
final boolean userLeaving = mSupervisor.mUserLeaving;
mSupervisor.mUserLeaving = false; mSupervisor.mUserLeaving = false;
final Task currentRootTask = started.getRootTask(); final Task currentRootTask = started.getRootTask();
final Task startedActivityRootTask = final Task startedActivityRootTask =
@@ -1747,7 +1748,7 @@ class ActivityStarter {
// until after we launched to identify the relevant activity. // until after we launched to identify the relevant activity.
transitionController.setTransientLaunch(mLastStartActivityRecord, mPriorAboveTask); transitionController.setTransientLaunch(mLastStartActivityRecord, mPriorAboveTask);
} }
if (!mSupervisor.mUserLeaving) { if (!userLeaving) {
// no-user-leaving implies not entering PiP. // no-user-leaving implies not entering PiP.
transitionController.setCanPipOnFinish(false /* canPipOnFinish */); transitionController.setCanPipOnFinish(false /* canPipOnFinish */);
} }