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

Commit eceaa9b1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix --user parameter when setting app op for shell with shell command."... 

Merge "Fix --user parameter when setting app op for shell with shell command." into sc-dev am: 58f468f1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15150888

Change-Id: I4644c471b72af621f83a1f07a46bdda877821041
parents d5240d83 58f468f1

services/core/java/com/android/server/appop/AppOpsService.java

+7 −3
Original line number Diff line number Diff line
@@ -4523,10 +4523,15 @@ public class AppOpsService extends IAppOpsService.Stub { 
        int callingUid = Binder.getCallingUid();



        // Allow any attribution tag for resolvable uids

        int pkgUid = resolveUid(packageName);

        if (pkgUid != Process.INVALID_UID) {

        int pkgUid;

        if (Objects.equals(packageName, "com.android.shell")) {

            // Special case for the shell which is a package but should be able

            // to bypass app attribution tag restrictions.

            pkgUid = Process.SHELL_UID;

        } else {

            pkgUid = resolveUid(packageName);

        }

        if (pkgUid != Process.INVALID_UID) {

            if (pkgUid != UserHandle.getAppId(uid)) {

                String otherUidMessage = DEBUG ? " but it is really " + pkgUid : " but it is not";

                throw new SecurityException("Specified package " + packageName + " under uid "
@@ -6993,7 +6998,6 @@ public class AppOpsService extends IAppOpsService.Stub { 
                return Process.ROOT_UID;

            case "shell":

            case "dumpstate":

            case "com.android.shell":

                return Process.SHELL_UID;

            case "media":

                return Process.MEDIA_UID;