diff options
author | Louis Chang <louischang@google.com> | 2022-06-23 00:30:19 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-06-23 00:30:19 +0000 |
commit | 725d1534ad9223db7c0c84430a90ae7e626e7a86 (patch) | |
tree | e648860a4045cf01bb406bfb324888da90e2c62d | |
parent | 3a4731d94975df21486c235aa347444126327566 (diff) | |
parent | b6297b6a46a4bb7498e0bb4ccccfc57c3f2dc22f (diff) | |
download | base-725d1534ad9223db7c0c84430a90ae7e626e7a86.tar.gz |
Merge "Do nothing when a finishing Activity configuration changed" into tm-dev
-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 0ed23cb9ba6d..8ffe0c12f8ca 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; @@ -1115,6 +1120,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())) { |