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

Merge "Fix dismissing activity getting relaunch signal while dismissing split" into sc-v2-dev am: a07f72ca00

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

Change-Id: I4847074bce4cbb934853ca852ff434e96aa2d14e
This commit is contained in:
Jerry Chang
2021-09-02 04:13:23 +00:00
committed by Automerger Merge Worker
parent b280e6c531 a07f72ca00
commit 9184cb52dd
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -1354,14 +1354,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
updatePictureInPictureMode(null, false);
} else {
mLastReportedMultiWindowMode = inMultiWindowMode;
// If the activity is in stopping or stopped state, for instance, it's in the
// split screen task and not the top one, the last configuration it should keep
// is the one before multi-window mode change.
final State state = getState();
if (state != STOPPED && state != STOPPING) {
ensureActivityConfiguration(0 /* globalChanges */, PRESERVE_WINDOWS,
true /* ignoreVisibility */);
}
ensureActivityConfiguration(0 /* globalChanges */, PRESERVE_WINDOWS,
false /* ignoreVisibility */);
}
}
}