diff options
| author | 2022-06-23 01:23:57 +0000 | |
|---|---|---|
| committer | 2022-06-23 01:23:57 +0000 | |
| commit | 86f79b107d77ceb0e3936f164c23fb2bb166a5f2 (patch) | |
| tree | f1e6eb9a084656f766ee813d2cac5e798609dc81 /libs | |
| parent | b6a9d7998497df1d460be82b0562174540138565 (diff) | |
| parent | 285c3726045841919ec0236e1684ca4e20e7a61c (diff) | |
Merge "Do nothing when a finishing Activity configuration changed" into tm-dev am: 725d1534ad am: aa5757e76d am: 285c372604
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19008927
Change-Id: Iaedafd55038d5dc5501344f31fa2db0772f49a99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java index 242e9ab6beee..b15dce7f3f17 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java @@ -642,6 +642,11 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen } private void onActivityConfigurationChanged(@NonNull Activity activity) { + if (activity.isFinishing()) { + // Do nothing if the activity is currently finishing. + return; + } + if (isInPictureInPicture(activity)) { // We don't embed activity when it is in PIP. return; @@ -1119,6 +1124,10 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen } boolean launchPlaceholderIfNecessary(@NonNull Activity activity, boolean isOnCreated) { + if (activity.isFinishing()) { + return false; + } + final TaskFragmentContainer container = getContainerWithActivity(activity); // Don't launch placeholder if the container is occluded. if (container != null && container != getTopActiveContainer(container.getTaskId())) { |