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

Merge "Do nothing when a finishing Activity configuration changed" into tm-dev am: 725d1534ad

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

Change-Id: Id12a82173f072557d3025960cc921f085ad85386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Louis Chang
2022-06-23 00:47:50 +00:00
committed by Automerger Merge Worker
parent 6923a28e75 725d1534ad
commit aa5757e76d
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java
View File

@@ -642,6 +642,11 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen
} }
private void onActivityConfigurationChanged(@NonNull Activity activity) { private void onActivityConfigurationChanged(@NonNull Activity activity) {
if (activity.isFinishing()) {
// Do nothing if the activity is currently finishing.
return;
}
if (isInPictureInPicture(activity)) { if (isInPictureInPicture(activity)) {
// We don't embed activity when it is in PIP. // We don't embed activity when it is in PIP.
return; return;
@@ -1115,6 +1120,10 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen
} }
boolean launchPlaceholderIfNecessary(@NonNull Activity activity, boolean isOnCreated) { boolean launchPlaceholderIfNecessary(@NonNull Activity activity, boolean isOnCreated) {
if (activity.isFinishing()) {
return false;
}
final TaskFragmentContainer container = getContainerWithActivity(activity); final TaskFragmentContainer container = getContainerWithActivity(activity);
// Don't launch placeholder if the container is occluded. // Don't launch placeholder if the container is occluded.
if (container != null && container != getTopActiveContainer(container.getTaskId())) { if (container != null && container != getTopActiveContainer(container.getTaskId())) {