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

Commit 95ee0cd7 authored by Felipe Leme's avatar Felipe Leme
Browse files

Fixed permission on AM.startUserInBackgroundOnSecondaryDisplay() 

Test: m update-api
Bug: 239982558

Change-Id: I112df4acabc120ff95b0da26bd71e90c9d691fb8
parent bb5f51b1

core/api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ package android.app { 
    method public static void resumeAppSwitches() throws android.os.RemoteException;

    method @RequiresPermission(android.Manifest.permission.CHANGE_CONFIGURATION) public void scheduleApplicationInfoChanged(java.util.List<java.lang.String>, int);

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}) public void setStopUserOnSwitch(int);

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public boolean startUserInBackgroundOnSecondaryDisplay(int, int);

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}) public boolean startUserInBackgroundOnSecondaryDisplay(int, int);

    method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public boolean stopUser(int, boolean);

    method @RequiresPermission(android.Manifest.permission.CHANGE_CONFIGURATION) public boolean updateMccMncConfiguration(@NonNull String, @NonNull String);

    method @RequiresPermission(android.Manifest.permission.DUMP) public void waitForBroadcastIdle();

core/java/android/app/ActivityManager.java

+1 −1
Original line number Diff line number Diff line
@@ -4401,7 +4401,7 @@ public class ActivityManager { 
     */

    @TestApi

    @RequiresPermission(anyOf = {android.Manifest.permission.MANAGE_USERS,

            android.Manifest.permission.CREATE_USERS})

            android.Manifest.permission.INTERACT_ACROSS_USERS})

    public boolean startUserInBackgroundOnSecondaryDisplay(@UserIdInt int userId,

            int displayId) {

        if (!UserManager.isUsersOnSecondaryDisplaysEnabled()) {

services/core/java/com/android/server/am/UserController.java

+1 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.server.am;



import static android.Manifest.permission.CREATE_USERS;

import static android.Manifest.permission.INTERACT_ACROSS_PROFILES;

import static android.Manifest.permission.INTERACT_ACROSS_USERS;

import static android.Manifest.permission.INTERACT_ACROSS_USERS_FULL;
@@ -1484,7 +1483,7 @@ class UserController implements Handler.Callback { 
    // defined

    boolean startUserOnSecondaryDisplay(@UserIdInt int userId, int displayId) {

        checkCallingHasOneOfThosePermissions("startUserOnSecondaryDisplay",

                MANAGE_USERS, CREATE_USERS);

                MANAGE_USERS, INTERACT_ACROSS_USERS);



        // DEFAULT_DISPLAY is used for the current foreground user only

        Preconditions.checkArgument(displayId != Display.DEFAULT_DISPLAY,