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

Commit 174e83c8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixed permisssions on setStopBackgroundUsersOnSwitch()." into sc-v2-dev

parents cdae0787 1f37c4f7

core/api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ package android.app { 
    method @RequiresPermission(android.Manifest.permission.RESET_APP_ERRORS) public void resetAppErrors();

    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_FULL}) public void setStopUserOnSwitch(int);

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}) public void setStopUserOnSwitch(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
@@ -4117,7 +4117,7 @@ public class ActivityManager { 
     */

    @TestApi

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

            android.Manifest.permission.INTERACT_ACROSS_USERS_FULL})

            android.Manifest.permission.INTERACT_ACROSS_USERS})

    public void setStopUserOnSwitch(@StopUserOnSwitch int value) {

        try {

            getService().setStopUserOnSwitch(value);

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

+2 −2
Original line number Diff line number Diff line
@@ -421,10 +421,10 @@ class UserController implements Handler.Callback { 
    void setStopUserOnSwitch(@StopUserOnSwitch int value) {

        if (mInjector.checkCallingPermission(android.Manifest.permission.MANAGE_USERS)

                == PackageManager.PERMISSION_DENIED && mInjector.checkCallingPermission(

                android.Manifest.permission.INTERACT_ACROSS_USERS_FULL)

                android.Manifest.permission.INTERACT_ACROSS_USERS)

                == PackageManager.PERMISSION_DENIED) {

            throw new SecurityException(

                    "You either need MANAGE_USERS or INTERACT_ACROSS_USERS_FULL permission to "

                    "You either need MANAGE_USERS or INTERACT_ACROSS_USERS permission to "

                            + "call setStopUserOnSwitch()");

        }