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

Commit f5da1d47 authored by Andrii Kulian's avatar Andrii Kulian Committed by Automerger Merge Worker
Browse files

Merge "Don't send split info callback before activity is created" into tm-dev... 

Merge "Don't send split info callback before activity is created" into tm-dev am: 7bc9ba3b am: 529691a1

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



Change-Id: I1df240d832072d73ada9355cfce77bcfac268d2d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7b6e3392 529691a1

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

+4 −17
Original line number Diff line number Diff line
@@ -777,22 +777,14 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
        return null;

    }



    private void updateCallbackIfNecessary() {

        updateCallbackIfNecessary(true /* deferCallbackUntilAllActivitiesCreated */);

    }



    /**

     * Notifies listeners about changes to split states if necessary.

     *

     * @param deferCallbackUntilAllActivitiesCreated boolean to indicate whether the split info

     *                                               callback should be deferred until all the

     *                                               organized activities have been created.

     */

    private void updateCallbackIfNecessary(boolean deferCallbackUntilAllActivitiesCreated) {

    private void updateCallbackIfNecessary() {

        if (mEmbeddingCallback == null) {

            return;

        }

        if (deferCallbackUntilAllActivitiesCreated && !allActivitiesCreated()) {

        if (!allActivitiesCreated()) {

            return;

        }

        List<SplitInfo> currentSplitStates = getActiveSplitStates();
@@ -848,9 +840,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
        for (int i = mTaskContainers.size() - 1; i >= 0; i--) {

            final List<TaskFragmentContainer> containers = mTaskContainers.valueAt(i).mContainers;

            for (TaskFragmentContainer container : containers) {

                if (container.getInfo() == null

                        || container.getInfo().getActivities().size()

                        != container.collectActivities().size()) {

                if (!container.taskInfoActivityCountMatchesCreated()) {

                    return false;

                }

            }
@@ -1035,11 +1025,8 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
                            && container.getTaskFragmentToken().equals(initialTaskFragmentToken)) {

                        // The onTaskFragmentInfoChanged callback containing this activity has not

                        // reached the client yet, so add the activity to the pending appeared

                        // activities and send a split info callback to the client before

                        // {@link Activity#onCreate} is called.

                        // activities.

                        container.addPendingAppearedActivity(activity);

                        updateCallbackIfNecessary(

                                false /* deferCallbackUntilAllActivitiesCreated */);

                        return;

                    }

                }

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

+12 −0
Original line number Diff line number Diff line
@@ -145,6 +145,18 @@ class TaskFragmentContainer { 
        return allActivities;

    }



    /**

     * Checks if the count of activities from the same process in task fragment info corresponds to

     * the ones created and available on the client side.

     */

    boolean taskInfoActivityCountMatchesCreated() {

        if (mInfo == null) {

            return false;

        }

        return mPendingAppearedActivities.isEmpty()

                && mInfo.getActivities().size() == collectActivities().size();

    }



    ActivityStack toActivityStack() {

        return new ActivityStack(collectActivities(), isEmpty());

    }