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

Commit 56a56ebd authored by Achim Thesmann's avatar Achim Thesmann
Browse files

Fix StageCoordinator to use API 

Use the ActivityOptions API instead of accessing the underlying Bundle.

The Bundle representing the ActivityOptions is internal and may change,
so accessing it directly should be avoided where possible.

Test: atest StageCoordinatorTest
Bug: 341140181
Flag: EXEMPT bugfix

Change-Id: Ie16f7219bac3eba53acd19310943be1a5d78c46b
parent 8f30bc9e

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+6 −7
Original line number Diff line number Diff line
@@ -16,10 +16,8 @@ 


package com.android.wm.shell.splitscreen;



import static android.app.ActivityOptions.KEY_LAUNCH_ROOT_TASK_TOKEN;

import static android.app.ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED;

import static android.app.ActivityTaskManager.INVALID_TASK_ID;

import static android.app.ComponentOptions.KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED;

import static android.app.ComponentOptions.KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED_BY_PERMISSION;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS;

import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
@@ -48,7 +46,6 @@ import static com.android.wm.shell.common.split.SplitScreenUtils.reverseSplitPos 
import static com.android.wm.shell.common.split.SplitScreenUtils.splitFailureMessage;

import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_SPLIT_SCREEN;

import static com.android.wm.shell.shared.TransitionUtil.isClosingType;

import static com.android.wm.shell.shared.TransitionUtil.isOpeningMode;

import static com.android.wm.shell.shared.TransitionUtil.isOpeningType;

import static com.android.wm.shell.splitscreen.SplitScreen.STAGE_TYPE_MAIN;

import static com.android.wm.shell.splitscreen.SplitScreen.STAGE_TYPE_SIDE;
@@ -1888,13 +1885,15 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
    }



    private void addActivityOptions(Bundle opts, @Nullable StageTaskListener launchTarget) {

        ActivityOptions options = ActivityOptions.fromBundle(opts);

        if (launchTarget != null) {

            opts.putParcelable(KEY_LAUNCH_ROOT_TASK_TOKEN, launchTarget.mRootTaskInfo.token);

            options.setLaunchRootTask(launchTarget.mRootTaskInfo.token);

        }

        // Put BAL flags to avoid activity start aborted. Otherwise, flows like shortcut to split

        // will be canceled.

        opts.putBoolean(KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED, true);

        opts.putBoolean(KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED_BY_PERMISSION, true);

        options.setPendingIntentBackgroundActivityStartMode(MODE_BACKGROUND_ACTIVITY_START_ALLOWED);

        options.setPendingIntentBackgroundActivityLaunchAllowedByPermission(true);

        opts.putAll(options.toBundle());

    }



    void updateActivityOptions(Bundle opts, @SplitPosition int position) {

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageCoordinatorTests.java

+9 −11
Original line number Diff line number Diff line
@@ -16,10 +16,7 @@ 


package com.android.wm.shell.splitscreen;



import static android.app.ActivityOptions.KEY_LAUNCH_ROOT_TASK_TOKEN;

import static android.app.ActivityTaskManager.INVALID_TASK_ID;

import static android.app.ComponentOptions.KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED;

import static android.app.ComponentOptions.KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED_BY_PERMISSION;

import static android.view.Display.DEFAULT_DISPLAY;



import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_BOTTOM_OR_RIGHT;
@@ -31,8 +28,9 @@ import static com.android.wm.shell.splitscreen.SplitScreen.STAGE_TYPE_UNDEFINED; 
import static com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON_RETURN_HOME;

import static com.android.wm.shell.transition.Transitions.TRANSIT_SPLIT_DISMISS;



import static com.google.common.truth.Truth.assertThat;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertTrue;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.ArgumentMatchers.notNull;
@@ -45,6 +43,7 @@ import static org.mockito.Mockito.verify; 
import static org.mockito.Mockito.when;



import android.app.ActivityManager;

import android.app.ActivityOptions;

import android.app.PendingIntent;

import android.content.res.Configuration;

import android.graphics.Rect;
@@ -54,7 +53,6 @@ import android.os.Looper; 
import android.view.SurfaceControl;

import android.view.SurfaceSession;

import android.window.RemoteTransition;

import android.window.WindowContainerToken;

import android.window.WindowContainerTransaction;



import androidx.test.annotation.UiThreadTest;
@@ -343,14 +341,14 @@ public class StageCoordinatorTests extends ShellTestCase { 


    @Test

    public void testAddActivityOptions_addsBackgroundActivitiesFlags() {

        Bundle options = mStageCoordinator.resolveStartStage(STAGE_TYPE_MAIN,

        Bundle bundle = mStageCoordinator.resolveStartStage(STAGE_TYPE_MAIN,

                SPLIT_POSITION_UNDEFINED, null /* options */, null /* wct */);

        ActivityOptions options = ActivityOptions.fromBundle(bundle);



        assertEquals(options.getParcelable(KEY_LAUNCH_ROOT_TASK_TOKEN, WindowContainerToken.class),

                mMainStage.mRootTaskInfo.token);

        assertTrue(options.getBoolean(KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED));

        assertTrue(options.getBoolean(

                KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED_BY_PERMISSION));

        assertThat(options.getLaunchRootTask()).isEqualTo(mMainStage.mRootTaskInfo.token);

        assertThat(options.getPendingIntentBackgroundActivityStartMode())

                .isEqualTo(ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);

        assertThat(options.isPendingIntentBackgroundActivityLaunchAllowedByPermission()).isTrue();

    }



    @Test