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

Commit b559ac4e authored by Chris Li's avatar Chris Li Committed by Automerger Merge Worker
Browse files

Merge "Active container should contain non-finishing activity" into sc-v2-dev... 

Merge "Active container should contain non-finishing activity" into sc-v2-dev am: d0f8b5e9 am: 7f876cde

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

Change-Id: I7bcda47a4e1f12d35985ef3e156adc14ead594bf
parents 2ea72557 7f876cde

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

+1 −1
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
    TaskFragmentContainer getTopActiveContainer() {

        for (int i = mContainers.size() - 1; i >= 0; i--) {

            TaskFragmentContainer container = mContainers.get(i);

            if (!container.isFinished()) {

            if (!container.isFinished() && container.getTopNonFinishingActivity() != null) {

                return container;

            }

        }