Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 285c3726 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Do nothing when a finishing Activity configuration changed" into tm-dev... 

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

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



Change-Id: I3b49cfe887088a183b566031b5723e2412c35c2f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7700ee15 aa5757e7

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

+9 −0
Original line number Original line Diff line number Diff line
@@ -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())) {