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

Commit 12424c3f authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Disallow background activity starts when starting a dropped intent" into main

parents b7834aa2 c0dc208e

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt

+1 −1
Original line number Diff line number Diff line
@@ -1166,7 +1166,7 @@ class DesktopTasksController( 
            pendingIntentLaunchFlags =

                Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK

            setPendingIntentBackgroundActivityStartMode(

                ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED

                ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_DENIED

            )

            isPendingIntentBackgroundActivityLaunchAllowedByPermission = true

        }

libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DragAndDropPolicy.java

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.wm.shell.draganddrop;



import static android.app.ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_DENIED;

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;
@@ -301,6 +302,8 @@ public class DragAndDropPolicy { 
                position);

        final ActivityOptions baseActivityOpts = ActivityOptions.makeBasic();

        baseActivityOpts.setDisallowEnterPictureInPictureWhileLaunching(true);

        baseActivityOpts.setPendingIntentBackgroundActivityStartMode(

                MODE_BACKGROUND_ACTIVITY_START_DENIED);

        // TODO(b/255649902): Rework this so that SplitScreenController can always use the options

        // instead of a fillInIntent since it's assuming that the PendingIntent is mutable

        baseActivityOpts.setPendingIntentLaunchFlags(FLAG_ACTIVITY_NEW_TASK