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

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

Merge "Renaming to `initial` TaskFragment token" into sc-v2-dev am: 7e59a8f1 

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

Change-Id: I6f4fa2049e3a03a2a0453d20b482b361044d3891
parents 93589b08 7e59a8f1

core/java/android/app/ActivityThread.java

+5 −4
Original line number Original line Diff line number Diff line
@@ -530,8 +530,9 @@ public final class ActivityThread extends ClientTransactionHandler 
        // A reusable token for other purposes, e.g. content capture, translation. It shouldn't be

        // A reusable token for other purposes, e.g. content capture, translation. It shouldn't be

        // used without security checks

        // used without security checks

        public IBinder shareableActivityToken;

        public IBinder shareableActivityToken;

        // The token of the TaskFragment that embedded this activity.

        // The token of the initial TaskFragment that embedded this activity. Do not rely on it

        @Nullable public IBinder mTaskFragmentToken;

        // after creation because the activity could be reparented.

        @Nullable public IBinder mInitialTaskFragmentToken;

        int ident;

        int ident;

        @UnsupportedAppUsage

        @UnsupportedAppUsage

        Intent intent;

        Intent intent;
@@ -626,7 +627,7 @@ public final class ActivityThread extends ClientTransactionHandler 
                boolean isForward, ProfilerInfo profilerInfo, ClientTransactionHandler client,

                boolean isForward, ProfilerInfo profilerInfo, ClientTransactionHandler client,

                IBinder assistToken, FixedRotationAdjustments fixedRotationAdjustments,

                IBinder assistToken, FixedRotationAdjustments fixedRotationAdjustments,

                IBinder shareableActivityToken, boolean launchedFromBubble,

                IBinder shareableActivityToken, boolean launchedFromBubble,

                IBinder taskFragmentToken) {

                IBinder initialTaskFragmentToken) {

            this.token = token;

            this.token = token;

            this.assistToken = assistToken;

            this.assistToken = assistToken;

            this.shareableActivityToken = shareableActivityToken;

            this.shareableActivityToken = shareableActivityToken;
@@ -648,7 +649,7 @@ public final class ActivityThread extends ClientTransactionHandler 
            mActivityOptions = activityOptions;

            mActivityOptions = activityOptions;

            mPendingFixedRotationAdjustments = fixedRotationAdjustments;

            mPendingFixedRotationAdjustments = fixedRotationAdjustments;

            mLaunchedFromBubble = launchedFromBubble;

            mLaunchedFromBubble = launchedFromBubble;

            mTaskFragmentToken = taskFragmentToken;

            mInitialTaskFragmentToken = initialTaskFragmentToken;

            init();

            init();

        }

        }

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -270,7 +270,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
    private TaskFragmentContainer getContainerWithActivity(@NonNull IBinder activityToken,

    private TaskFragmentContainer getContainerWithActivity(@NonNull IBinder activityToken,

            Activity activityToAdd) {

            Activity activityToAdd) {

        final IBinder taskFragmentToken = ActivityThread.currentActivityThread().getActivityClient(

        final IBinder taskFragmentToken = ActivityThread.currentActivityThread().getActivityClient(

                activityToken).mTaskFragmentToken;

                activityToken).mInitialTaskFragmentToken;

        for (TaskFragmentContainer container : mContainers) {

        for (TaskFragmentContainer container : mContainers) {

            if (container.hasActivity(activityToken)) {

            if (container.hasActivity(activityToken)) {

                return container;

                return container;