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

Commit 805b26ac authored by Jonathan Scott's avatar Jonathan Scott Committed by Android (Google) Code Review
Browse files

Merge "Allow starting activities across user with INTERACT_ACROSS_USERS."

parents 724b6028 9233534a

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1705,7 +1705,7 @@ package android.content { 
    method public abstract void sendBroadcast(android.content.Intent, @Nullable String, @Nullable android.os.Bundle);

    method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public abstract void sendBroadcastAsUser(@RequiresPermission android.content.Intent, android.os.UserHandle, @Nullable String, @Nullable android.os.Bundle);

    method public abstract void sendOrderedBroadcast(@NonNull android.content.Intent, @Nullable String, @Nullable android.os.Bundle, @Nullable android.content.BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle);

    method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public void startActivityAsUser(@NonNull @RequiresPermission android.content.Intent, @NonNull android.os.UserHandle);

    method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public void startActivityAsUser(@NonNull @RequiresPermission android.content.Intent, @NonNull android.os.UserHandle);

    field public static final String APP_INTEGRITY_SERVICE = "app_integrity";

    field public static final String APP_PREDICTION_SERVICE = "app_prediction";

    field public static final String BACKUP_SERVICE = "backup";

core/java/android/content/Context.java

+3 −3
Original line number Diff line number Diff line
@@ -1825,7 +1825,7 @@ public abstract class Context { 
     * @throws ActivityNotFoundException  

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL)

    @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS)

    @SystemApi

    public void startActivityAsUser(@RequiresPermission @NonNull Intent intent,

            @NonNull UserHandle user) {
@@ -1873,7 +1873,7 @@ public abstract class Context { 
     * @throws ActivityNotFoundException  

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL)

    @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS)

    @UnsupportedAppUsage

    public void startActivityAsUser(@RequiresPermission Intent intent, @Nullable Bundle options,

            UserHandle userId) {
@@ -1979,7 +1979,7 @@ public abstract class Context { 
     * @see #startActivities(Intent[])

     * @see PackageManager#resolveActivity

     */

    @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL)

    @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS)

    public int startActivitiesAsUser(Intent[] intents, Bundle options, UserHandle userHandle) {

        throw new RuntimeException("Not implemented. Must override in a subclass.");

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import static android.Manifest.permission.REMOVE_TASKS; 
import static android.Manifest.permission.START_TASKS_FROM_RECENTS;

import static android.Manifest.permission.STOP_APP_SWITCHES;

import static android.app.ActivityManager.LOCK_TASK_MODE_NONE;

import static android.app.ActivityManagerInternal.ALLOW_FULL_ONLY;

import static android.app.ActivityManagerInternal.ALLOW_NON_FULL;

import static android.app.ActivityTaskManager.INVALID_TASK_ID;

import static android.app.ActivityTaskManager.RESIZE_MODE_PRESERVE_WINDOW;

import static android.app.ActivityTaskManager.SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT;
@@ -1436,7 +1436,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 


    int handleIncomingUser(int callingPid, int callingUid, int userId, String name) {

        return mAmInternal.handleIncomingUser(callingPid, callingUid, userId, false /* allowAll */,

                ALLOW_FULL_ONLY, name, null /* callerPackage */);

                ALLOW_NON_FULL, name, null /* callerPackage */);

    }



    @Override