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

Commit 87550b06 authored by Shivam Agrawal's avatar Shivam Agrawal Committed by Android (Google) Code Review
Browse files

Merge changes from topic "embedding-race-condition" into tm-dev 

* changes:
  Send Split Info Callback before Activity#onCreate
  Revert "Removing TaskFragment token from LaunchActivityItem"
parents 0db54b28 d8659858

core/java/android/app/ActivityThread.java

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

        // used without security checks

        public IBinder shareableActivityToken;

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

        // after creation because the activity could be reparented.

        @Nullable public IBinder mInitialTaskFragmentToken;

        int ident;

        @UnsupportedAppUsage

        Intent intent;
@@ -618,7 +621,8 @@ public final class ActivityThread extends ClientTransactionHandler 
                PersistableBundle persistentState, List<ResultInfo> pendingResults,

                List<ReferrerIntent> pendingNewIntents, ActivityOptions activityOptions,

                boolean isForward, ProfilerInfo profilerInfo, ClientTransactionHandler client,

                IBinder assistToken, IBinder shareableActivityToken, boolean launchedFromBubble) {

                IBinder assistToken, IBinder shareableActivityToken, boolean launchedFromBubble,

                IBinder initialTaskFragmentToken) {

            this.token = token;

            this.assistToken = assistToken;

            this.shareableActivityToken = shareableActivityToken;
@@ -639,6 +643,7 @@ public final class ActivityThread extends ClientTransactionHandler 
                    compatInfo);

            mActivityOptions = activityOptions;

            mLaunchedFromBubble = launchedFromBubble;

            mInitialTaskFragmentToken = initialTaskFragmentToken;

            init();

        }

core/java/android/app/servertransaction/LaunchActivityItem.java

+14 −7
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ public class LaunchActivityItem extends ClientTransactionItem { 
    private IBinder mAssistToken;

    private IBinder mShareableActivityToken;

    private boolean mLaunchedFromBubble;

    private IBinder mTaskFragmentToken;

    /**

     * It is only non-null if the process is the first time to launch activity. It is only an

     * optimization for quick look up of the interface so the field is ignored for comparison.
@@ -95,7 +96,8 @@ public class LaunchActivityItem extends ClientTransactionItem { 
        ActivityClientRecord r = new ActivityClientRecord(token, mIntent, mIdent, mInfo,

                mOverrideConfig, mCompatInfo, mReferrer, mVoiceInteractor, mState, mPersistentState,

                mPendingResults, mPendingNewIntents, mActivityOptions, mIsForward, mProfilerInfo,

                client, mAssistToken, mShareableActivityToken, mLaunchedFromBubble);

                client, mAssistToken, mShareableActivityToken, mLaunchedFromBubble,

                mTaskFragmentToken);

        client.handleLaunchActivity(r, pendingActions, null /* customIntent */);

        Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER);

    }
@@ -119,7 +121,7 @@ public class LaunchActivityItem extends ClientTransactionItem { 
            List<ReferrerIntent> pendingNewIntents, ActivityOptions activityOptions,

            boolean isForward, ProfilerInfo profilerInfo, IBinder assistToken,

            IActivityClientController activityClientController, IBinder shareableActivityToken,

            boolean launchedFromBubble) {

            boolean launchedFromBubble, IBinder taskFragmentToken) {

        LaunchActivityItem instance = ObjectPool.obtain(LaunchActivityItem.class);

        if (instance == null) {

            instance = new LaunchActivityItem();
@@ -128,7 +130,7 @@ public class LaunchActivityItem extends ClientTransactionItem { 
                voiceInteractor, procState, state, persistentState, pendingResults,

                pendingNewIntents, activityOptions, isForward, profilerInfo, assistToken,

                activityClientController, shareableActivityToken,

                launchedFromBubble);

                launchedFromBubble, taskFragmentToken);



        return instance;

    }
@@ -136,7 +138,7 @@ public class LaunchActivityItem extends ClientTransactionItem { 
    @Override

    public void recycle() {

        setValues(this, null, 0, null, null, null, null, null, null, 0, null, null, null, null,

                null, false, null, null, null, null, false);

                null, false, null, null, null, null, false, null);

        ObjectPool.recycle(this);

    }
@@ -166,6 +168,7 @@ public class LaunchActivityItem extends ClientTransactionItem { 
        dest.writeStrongInterface(mActivityClientController);

        dest.writeStrongBinder(mShareableActivityToken);

        dest.writeBoolean(mLaunchedFromBubble);

        dest.writeStrongBinder(mTaskFragmentToken);

    }



    /** Read from Parcel. */
@@ -184,7 +187,8 @@ public class LaunchActivityItem extends ClientTransactionItem { 
                in.readStrongBinder(),

                IActivityClientController.Stub.asInterface(in.readStrongBinder()),

                in.readStrongBinder(),

                in.readBoolean());

                in.readBoolean(),

                in.readStrongBinder());

    }



    public static final @NonNull Creator<LaunchActivityItem> CREATOR =
@@ -222,7 +226,8 @@ public class LaunchActivityItem extends ClientTransactionItem { 
                && mIsForward == other.mIsForward

                && Objects.equals(mProfilerInfo, other.mProfilerInfo)

                && Objects.equals(mAssistToken, other.mAssistToken)

                && Objects.equals(mShareableActivityToken, other.mShareableActivityToken);

                && Objects.equals(mShareableActivityToken, other.mShareableActivityToken)

                && Objects.equals(mTaskFragmentToken, other.mTaskFragmentToken);

    }



    @Override
@@ -244,6 +249,7 @@ public class LaunchActivityItem extends ClientTransactionItem { 
        result = 31 * result + Objects.hashCode(mProfilerInfo);

        result = 31 * result + Objects.hashCode(mAssistToken);

        result = 31 * result + Objects.hashCode(mShareableActivityToken);

        result = 31 * result + Objects.hashCode(mTaskFragmentToken);

        return result;

    }
@@ -291,7 +297,7 @@ public class LaunchActivityItem extends ClientTransactionItem { 
            List<ResultInfo> pendingResults, List<ReferrerIntent> pendingNewIntents,

            ActivityOptions activityOptions, boolean isForward, ProfilerInfo profilerInfo,

            IBinder assistToken, IActivityClientController activityClientController,

            IBinder shareableActivityToken, boolean launchedFromBubble) {

            IBinder shareableActivityToken, boolean launchedFromBubble, IBinder taskFragmentToken) {

        instance.mIntent = intent;

        instance.mIdent = ident;

        instance.mInfo = info;
@@ -312,5 +318,6 @@ public class LaunchActivityItem extends ClientTransactionItem { 
        instance.mActivityClientController = activityClientController;

        instance.mShareableActivityToken = shareableActivityToken;

        instance.mLaunchedFromBubble = launchedFromBubble;

        instance.mTaskFragmentToken = taskFragmentToken;

    }

}

core/tests/coretests/src/android/app/servertransaction/ObjectPoolTests.java

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ public class ObjectPoolTests { 
                .setPendingResults(resultInfoList()).setPendingNewIntents(referrerIntentList())

                .setIsForward(true).setAssistToken(assistToken)

                .setShareableActivityToken(shareableActivityToken)

                .build();

                .setTaskFragmentToken(new Binder()).build();



        LaunchActivityItem emptyItem = new LaunchActivityItemBuilder().build();

        LaunchActivityItem item = itemSupplier.get();

core/tests/coretests/src/android/app/servertransaction/TestUtils.java

+7 −1
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ class TestUtils { 
        private IBinder mAssistToken;

        private IBinder mShareableActivityToken;

        private boolean mLaunchedFromBubble;

        private IBinder mTaskFragmentToken;



        LaunchActivityItemBuilder setIntent(Intent intent) {

            mIntent = intent;
@@ -206,13 +207,18 @@ class TestUtils { 
            return this;

        }



        LaunchActivityItemBuilder setTaskFragmentToken(IBinder taskFragmentToken) {

            mTaskFragmentToken = taskFragmentToken;

            return this;

        }



        LaunchActivityItem build() {

            return LaunchActivityItem.obtain(mIntent, mIdent, mInfo,

                    mCurConfig, mOverrideConfig, mCompatInfo, mReferrer, mVoiceInteractor,

                    mProcState, mState, mPersistentState, mPendingResults, mPendingNewIntents,

                    mActivityOptions, mIsForward, mProfilerInfo, mAssistToken,

                    null /* activityClientController */, mShareableActivityToken,

                    mLaunchedFromBubble);

                    mLaunchedFromBubble, mTaskFragmentToken);

        }

    }

}

core/tests/coretests/src/android/app/servertransaction/TransactionParcelTests.java

+1 −0
Original line number Diff line number Diff line
@@ -203,6 +203,7 @@ public class TransactionParcelTests { 
                .setPendingResults(resultInfoList()).setActivityOptions(ActivityOptions.makeBasic())

                .setPendingNewIntents(referrerIntentList()).setIsForward(true)

                .setAssistToken(new Binder()).setShareableActivityToken(new Binder())

                .setTaskFragmentToken(new Binder())

                .build();



        writeAndPrepareForReading(item);