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

Commit 73001d9d authored by Liran Binyamin's avatar Liran Binyamin
Browse files

Clean up onlyReuseBubbledTaskWhenLaunchedFromBubble flag 

Fixes: 409611341
Flag: EXEMPT flag cleanup
Test: EXEMPT flag cleanup
Change-Id: Ia0a69712e75df318078f5a917aa98e718431c26c
parent ac7fd0c0

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

+2 −7
Original line number Original line Diff line number Diff line
@@ -155,7 +155,6 @@ import com.android.server.wm.BackgroundActivityStartController.BalCode; 
import com.android.server.wm.BackgroundActivityStartController.BalVerdict;

import com.android.server.wm.BackgroundActivityStartController.BalVerdict;

import com.android.server.wm.LaunchParamsController.LaunchParams;

import com.android.server.wm.LaunchParamsController.LaunchParams;

import com.android.server.wm.TaskFragment.EmbeddingCheckResult;

import com.android.server.wm.TaskFragment.EmbeddingCheckResult;

import com.android.wm.shell.Flags;





import java.io.PrintWriter;

import java.io.PrintWriter;

import java.lang.annotation.Retention;

import java.lang.annotation.Retention;
@@ -1937,13 +1936,9 @@ class ActivityStarter { 
        // Get top task at beginning because the order may be changed when reusing existing task.

        // Get top task at beginning because the order may be changed when reusing existing task.

        final Task prevTopRootTask = mPreferredTaskDisplayArea.getFocusedRootTask();

        final Task prevTopRootTask = mPreferredTaskDisplayArea.getFocusedRootTask();

        final Task prevTopTask = prevTopRootTask != null ? prevTopRootTask.getTopLeafTask() : null;

        final Task prevTopTask = prevTopRootTask != null ? prevTopRootTask.getTopLeafTask() : null;

        final boolean sourceActivityLaunchedFromBubble =

        // allow reusing bubbled tasks only if the source activity is bubbled.

                sourceRecord != null && sourceRecord.getLaunchedFromBubble();

        // if the flag is enabled, allow reusing bubbled tasks only if the source activity is

        // bubbled.

        final boolean includeLaunchedFromBubble =

        final boolean includeLaunchedFromBubble =

                Flags.onlyReuseBubbledTaskWhenLaunchedFromBubble()

                sourceRecord != null && sourceRecord.getLaunchedFromBubble();

                        ? sourceActivityLaunchedFromBubble : true;

        final Task reusedTask = resolveReusableTask(includeLaunchedFromBubble);

        final Task reusedTask = resolveReusableTask(includeLaunchedFromBubble);





        // If requested, freeze the task list

        // If requested, freeze the task list

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

+0 −43
Original line number Original line Diff line number Diff line
@@ -95,7 +95,6 @@ import android.graphics.Rect; 
import android.os.Binder;

import android.os.Binder;

import android.os.IBinder;

import android.os.IBinder;

import android.os.RemoteException;

import android.os.RemoteException;

import android.platform.test.annotations.DisableFlags;

import android.platform.test.annotations.EnableFlags;

import android.platform.test.annotations.EnableFlags;

import android.platform.test.annotations.Presubmit;

import android.platform.test.annotations.Presubmit;

import android.provider.DeviceConfig;

import android.provider.DeviceConfig;
@@ -115,7 +114,6 @@ import com.android.server.pm.pkg.AndroidPackage; 
import com.android.server.wm.BackgroundActivityStartController.BalVerdict;

import com.android.server.wm.BackgroundActivityStartController.BalVerdict;

import com.android.server.wm.LaunchParamsController.LaunchParamsModifier;

import com.android.server.wm.LaunchParamsController.LaunchParamsModifier;

import com.android.server.wm.utils.MockTracker;

import com.android.server.wm.utils.MockTracker;

import com.android.wm.shell.Flags;





import org.junit.After;

import org.junit.After;

import org.junit.Before;

import org.junit.Before;
@@ -1796,7 +1794,6 @@ public class ActivityStarterTests extends WindowTestsBase { 
        assertEquals(ActivityRecord.LAUNCH_SOURCE_TYPE_HOME, baseActivity.mLaunchSourceType);

        assertEquals(ActivityRecord.LAUNCH_SOURCE_TYPE_HOME, baseActivity.mLaunchSourceType);

    }

    }





    @EnableFlags(Flags.FLAG_ONLY_REUSE_BUBBLED_TASK_WHEN_LAUNCHED_FROM_BUBBLE)

    @Test

    @Test

    public void launchActivity_reusesBubbledTask() {

    public void launchActivity_reusesBubbledTask() {

        final ActivityStarter starter = prepareStarter(0, false);

        final ActivityStarter starter = prepareStarter(0, false);
@@ -1813,7 +1810,6 @@ public class ActivityStarterTests extends WindowTestsBase { 
        assertEquals(bubbledActivity.getTask(), targetRecord.getTask());

        assertEquals(bubbledActivity.getTask(), targetRecord.getTask());

    }

    }





    @EnableFlags(Flags.FLAG_ONLY_REUSE_BUBBLED_TASK_WHEN_LAUNCHED_FROM_BUBBLE)

    @Test

    @Test

    public void launchActivity_nullSourceRecord_doesNotReuseBubbledTask() {

    public void launchActivity_nullSourceRecord_doesNotReuseBubbledTask() {

        final ActivityStarter starter = prepareStarter(0, false);

        final ActivityStarter starter = prepareStarter(0, false);
@@ -1833,7 +1829,6 @@ public class ActivityStarterTests extends WindowTestsBase { 
        assertNotEquals(bubbledActivity.getTask(), targetRecord.getTask());

        assertNotEquals(bubbledActivity.getTask(), targetRecord.getTask());

    }

    }





    @EnableFlags(Flags.FLAG_ONLY_REUSE_BUBBLED_TASK_WHEN_LAUNCHED_FROM_BUBBLE)

    @Test

    @Test

    public void launchActivity_nonBubbledSourceRecord_doesNotReuseBubbledTask() {

    public void launchActivity_nonBubbledSourceRecord_doesNotReuseBubbledTask() {

        final ActivityStarter starter = prepareStarter(0, false);

        final ActivityStarter starter = prepareStarter(0, false);
@@ -1860,44 +1855,6 @@ public class ActivityStarterTests extends WindowTestsBase { 
        assertNotEquals(bubbledActivity.getTask(), targetRecord.getTask());

        assertNotEquals(bubbledActivity.getTask(), targetRecord.getTask());

    }

    }





    @DisableFlags(Flags.FLAG_ONLY_REUSE_BUBBLED_TASK_WHEN_LAUNCHED_FROM_BUBBLE)

    @Test

    public void launchActivity_nullSourceRecord_flagDisabled_reusesBubbledTask() {

        final ActivityStarter starter = prepareStarter(0, false);

        final ActivityRecord bubbledActivity = createBubbledActivity();



        // create the target activity to be launched

        final ActivityRecord targetRecord =

                new ActivityBuilder(mAtm)

                        .setLaunchMode(LAUNCH_SINGLE_TASK)

                        .setComponent(ActivityBuilder.getDefaultComponent()).build();

        starter.getIntent().setComponent(bubbledActivity.mActivityComponent);



        // pass null as the source record

        startActivityInner(starter, targetRecord, null, null /* options */,

                null /* inTask */, null /* inTaskFragment */);



        assertEquals(bubbledActivity.getTask(), targetRecord.getTask());

    }



    @DisableFlags(Flags.FLAG_ONLY_REUSE_BUBBLED_TASK_WHEN_LAUNCHED_FROM_BUBBLE)

    @Test

    public void launchActivity_fromBubble_flagDisabled_reusesBubbledTask() {

        final ActivityStarter starter = prepareStarter(0, false);

        final ActivityRecord bubbledActivity = createBubbledActivity();



        // create the target activity to be launched with the same component as the bubbled activity

        final ActivityRecord targetRecord =

                new ActivityBuilder(mAtm)

                        .setLaunchMode(LAUNCH_SINGLE_TASK)

                        .setComponent(ActivityBuilder.getDefaultComponent()).build();

        starter.getIntent().setComponent(bubbledActivity.mActivityComponent);

        startActivityInner(starter, targetRecord, bubbledActivity, null /* options */,

                null /* inTask */, null /* inTaskFragment */);



        assertEquals(bubbledActivity.getTask(), targetRecord.getTask());

    }



    private ActivityRecord createBubbledActivity() {

    private ActivityRecord createBubbledActivity() {

        final ActivityOptions opts = ActivityOptions.makeBasic();

        final ActivityOptions opts = ActivityOptions.makeBasic();

        opts.setTaskAlwaysOnTop(true);

        opts.setTaskAlwaysOnTop(true);