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

Commit 1037336f authored by Suprabh Shukla's avatar Suprabh Shukla Committed by android-build-merger
Browse files

Merge "Remove MANAGE_USERS from setPackagesSuspended" into pi-dev am: d0897f2b 

am: 485cdce1

Change-Id: I6f60f14a705e354fab5f08382a146be7f9dd9f2d
parents 085ef7dc 485cdce1

core/java/android/content/pm/PackageManager.java

+1 −2
Original line number Diff line number Diff line
@@ -5584,8 +5584,7 @@ public abstract class PackageManager { 
     * @hide

     */

    @SystemApi

    @RequiresPermission(anyOf = {Manifest.permission.SUSPEND_APPS,

            Manifest.permission.MANAGE_USERS})

    @RequiresPermission(Manifest.permission.SUSPEND_APPS)

    public String[] setPackagesSuspended(String[] packageNames, boolean suspended,

            @Nullable PersistableBundle appExtras, @Nullable PersistableBundle launcherExtras,

            String dialogMessage) {

services/core/java/com/android/server/pm/PackageManagerService.java

+3 −7
Original line number Diff line number Diff line
@@ -14126,13 +14126,9 @@ public class PackageManagerService extends IPackageManager.Stub 
    public String[] setPackagesSuspendedAsUser(String[] packageNames, boolean suspended,

            PersistableBundle appExtras, PersistableBundle launcherExtras, String dialogMessage,

            String callingPackage, int userId) {

        try {

            mContext.enforceCallingOrSelfPermission(android.Manifest.permission.SUSPEND_APPS, null);

        } catch (SecurityException e) {

            mContext.enforceCallingOrSelfPermission(Manifest.permission.MANAGE_USERS,

                    "Callers need to have either " + Manifest.permission.SUSPEND_APPS + " or "

                            + Manifest.permission.MANAGE_USERS);

        }

        mContext.enforceCallingOrSelfPermission(android.Manifest.permission.SUSPEND_APPS,

                "setPackagesSuspendedAsUser");















        final int callingUid = Binder.getCallingUid();















        if (callingUid != Process.ROOT_UID && callingUid != Process.SYSTEM_UID















                && getPackageUid(callingPackage, 0, userId) != callingUid) {