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

Commit c25400e4 authored by Jeff Chang's avatar Jeff Chang Committed by Automerger Merge Worker
Browse files

Merge "Fix the target TaskFragment lost in ActivityStarter" into sc-v2-dev am:... 

Merge "Fix the target TaskFragment lost in ActivityStarter" into sc-v2-dev am: 5dbecb2f am: 4f2fd408

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

Change-Id: Iedf93f78a0aacedcfbad8940bcdc0093b438d553
parents c479b7ee 4f2fd408

services/core/java/com/android/server/wm/ActivityStarter.java

+17 −13
Original line number Diff line number Diff line
@@ -841,7 +841,7 @@ class ActivityStarter { 
        final int startFlags = request.startFlags;

        final SafeActivityOptions options = request.activityOptions;

        Task inTask = request.inTask;

        mInTaskFragment = request.inTaskFragment;

        TaskFragment inTaskFragment = request.inTaskFragment;



        int err = ActivityManager.START_SUCCESS;

        // Pull the optional Ephemeral Installer-only bundle out of the options early.
@@ -1182,8 +1182,8 @@ class ActivityStarter { 
        }



        mLastStartActivityResult = startActivityUnchecked(r, sourceRecord, voiceSession,

                request.voiceInteractor, startFlags, true /* doResume */, checkedOptions, inTask,

                restrictedBgActivity, intentGrants);

                request.voiceInteractor, startFlags, true /* doResume */, checkedOptions,

                inTask, inTaskFragment, restrictedBgActivity, intentGrants);



        if (request.outActivity != null) {

            request.outActivity[0] = mLastStartActivityRecord;
@@ -1555,7 +1555,8 @@ class ActivityStarter { 
    private int startActivityUnchecked(final ActivityRecord r, ActivityRecord sourceRecord,

            IVoiceInteractionSession voiceSession, IVoiceInteractor voiceInteractor,

            int startFlags, boolean doResume, ActivityOptions options, Task inTask,

                boolean restrictedBgActivity, NeededUriGrants intentGrants) {

            TaskFragment inTaskFragment, boolean restrictedBgActivity,

            NeededUriGrants intentGrants) {

        int result = START_CANCELED;

        final Task startedActivityRootTask;
@@ -1580,7 +1581,8 @@ class ActivityStarter { 
            mService.deferWindowLayout();

            Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "startActivityInner");

            result = startActivityInner(r, sourceRecord, voiceSession, voiceInteractor,

                    startFlags, doResume, options, inTask, restrictedBgActivity, intentGrants);

                    startFlags, doResume, options, inTask, inTaskFragment, restrictedBgActivity,

                    intentGrants);

        } finally {

            Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);

            startedActivityRootTask = handleStartResult(r, result);
@@ -1683,9 +1685,10 @@ class ActivityStarter { 
    int startActivityInner(final ActivityRecord r, ActivityRecord sourceRecord,

            IVoiceInteractionSession voiceSession, IVoiceInteractor voiceInteractor,

            int startFlags, boolean doResume, ActivityOptions options, Task inTask,

            boolean restrictedBgActivity, NeededUriGrants intentGrants) {

        setInitialState(r, options, inTask, doResume, startFlags, sourceRecord, voiceSession,

                voiceInteractor, restrictedBgActivity);

            TaskFragment inTaskFragment, boolean restrictedBgActivity,

            NeededUriGrants intentGrants) {

        setInitialState(r, options, inTask, inTaskFragment, doResume, startFlags, sourceRecord,

                voiceSession, voiceInteractor, restrictedBgActivity);



        computeLaunchingTaskFlags();
@@ -2253,9 +2256,9 @@ class ActivityStarter { 
    }



    private void setInitialState(ActivityRecord r, ActivityOptions options, Task inTask,

            boolean doResume, int startFlags, ActivityRecord sourceRecord,

            IVoiceInteractionSession voiceSession, IVoiceInteractor voiceInteractor,

            boolean restrictedBgActivity) {

            TaskFragment inTaskFragment, boolean doResume, int startFlags,

            ActivityRecord sourceRecord, IVoiceInteractionSession voiceSession,

            IVoiceInteractor voiceInteractor, boolean restrictedBgActivity) {

        reset(false /* clearRequest */);



        mStartActivity = r;
@@ -2358,6 +2361,7 @@ class ActivityStarter { 
            Slog.w(TAG, "Starting activity in task not in recents: " + inTask);

            mInTask = null;

        }

        mInTaskFragment = inTaskFragment;



        mStartFlags = startFlags;

        // If the onlyIfNeeded flag is set, then we can do this if the activity being launched

services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java

+26 −0
Original line number Diff line number Diff line
@@ -1136,6 +1136,7 @@ public class ActivityStarterTests extends WindowTestsBase { 
                /* doResume */true,

                /* options */null,

                /* inTask */null,

                /* inTaskFragment */ null,

                /* restrictedBgActivity */false,

                /* intentGrants */null);
@@ -1145,6 +1146,31 @@ public class ActivityStarterTests extends WindowTestsBase { 
        assertTrue(targetRecord.mVisibleRequested);

    }



    @Test

    public void testStartActivityInner_inTaskFragment() {

        final ActivityStarter starter = prepareStarter(0, false);

        final ActivityRecord targetRecord = new ActivityBuilder(mAtm).build();

        final ActivityRecord sourceRecord = new ActivityBuilder(mAtm).setCreateTask(true).build();

        final TaskFragment taskFragment = new TaskFragment(mAtm, sourceRecord.token,

                true /* createdByOrganizer */);

        sourceRecord.getTask().addChild(taskFragment, POSITION_TOP);



        starter.startActivityInner(

                /* r */targetRecord,

                /* sourceRecord */ sourceRecord,

                /* voiceSession */null,

                /* voiceInteractor */ null,

                /* startFlags */ 0,

                /* doResume */true,

                /* options */null,

                /* inTask */null,

                /* inTaskFragment */ taskFragment,

                /* restrictedBgActivity */false,

                /* intentGrants */null);



        assertTrue(taskFragment.hasChild());

    }



    @Test

    public void testLaunchCookie_newAndExistingTask() {

        final ActivityStarter starter = prepareStarter(0, false);