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

Commit be25ff38 authored by Charles Chen's avatar Charles Chen
Browse files

Remove KEY_ACTIVITY_STACK_TOKEN in SplitController 

As the prebuilt library was updated, we could remove
the temporary constant KEY_ACTIVITY_STACK_TOKEN
in SplitController.

Test: none
Flag: EXEMPT clean up
Fixes: 295993745
Change-Id: Ibb55553d9966a540113c0892684bd500f70a56f4
parent 1996bc3a

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

+0 −10
Original line number Diff line number Diff line
@@ -440,14 +440,6 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
        return mSplitAttributesCalculator;

    }



    // TODO(b/295993745): remove after we migrate to the bundle approach.

    @NonNull

    public ActivityOptions setLaunchingActivityStack(@NonNull ActivityOptions options,

            @NonNull IBinder token) {

        options.setLaunchTaskFragmentToken(token);

        return options;

    }



    @NonNull

    @GuardedBy("mLock")

    @VisibleForTesting
@@ -3130,8 +3122,6 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
            }



            // Early return if the launching taskfragment is already been set.

            // TODO(b/295993745): Use KEY_LAUNCH_TASK_FRAGMENT_TOKEN after WM Jetpack migrates to

            // bundle. This is still needed to support #setLaunchingActivityStack.

            if (options.getBinder(KEY_LAUNCH_TASK_FRAGMENT_TOKEN) != null) {

                return super.onStartActivity(who, intent, options);

            }