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

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

Merge "Remove duplicated TFContainer.getToken" into main

parents da28176a 428efc64

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

+4 −2
Original line number Diff line number Diff line
@@ -89,13 +89,15 @@ class ParcelableSplitContainerData implements Parcelable { 


    @NonNull

    IBinder getPrimaryContainerToken() {

        return mSplitContainer != null ? mSplitContainer.getPrimaryContainer().getToken()

        return mSplitContainer != null

                ? mSplitContainer.getPrimaryContainer().getTaskFragmentToken()

                : mPrimaryContainerToken;

    }



    @NonNull

    IBinder getSecondaryContainerToken() {

        return mSplitContainer != null ? mSplitContainer.getSecondaryContainer().getToken()

        return mSplitContainer != null

                ? mSplitContainer.getSecondaryContainer().getTaskFragmentToken()

                : mSecondaryContainerToken;

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -62,8 +62,8 @@ class SplitContainer { 
            @NonNull SplitRule splitRule,

            @NonNull SplitAttributes splitAttributes, boolean isPrimaryContainerMutable) {

        mParcelableData = new ParcelableSplitContainerData(this, new Binder("SplitContainer"),

                primaryContainer.getToken(), secondaryContainer.getToken(), splitRule.getTag(),

                isPrimaryContainerMutable);

                primaryContainer.getTaskFragmentToken(), secondaryContainer.getTaskFragmentToken(),

                splitRule.getTag(), isPrimaryContainerMutable);

        mPrimaryContainer = primaryContainer;

        mSecondaryContainer = secondaryContainer;

        mSplitRule = splitRule;

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

+0 −5
Original line number Diff line number Diff line
@@ -1010,11 +1010,6 @@ class TaskFragmentContainer { 
        return mTaskContainer.getTaskId();

    }



    @NonNull

    IBinder getToken() {

        return mParcelableData.mToken;

    }



    @NonNull

    ParcelableTaskFragmentContainerData getParcelableData() {

        return mParcelableData;