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

Commit 72e7981e authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove KEY_ACTIVITY_STACK_TOKEN in SplitController" into main

parents ae698afc be25ff38
Loading
Loading
Loading
Loading
+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);
            }