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

Commit 9927e509 authored by Svet Ganov's avatar Svet Ganov Committed by Android Git Automerger
Browse files

am e650fd95: Merge "Fix grant/revoke to act on owner by default and log... 

am e650fd95: Merge "Fix grant/revoke to act on owner by default and log invalid user id." into mnc-dev

* commit 'e650fd95':
  Fix grant/revoke to act on owner by default and log invalid user id.
parents 9c1c33b9 e650fd95

cmds/pm/src/com/android/commands/pm/Pm.java

+1 −1
Original line number Diff line number Diff line
@@ -1585,7 +1585,7 @@ public final class Pm { 
    }



    private int runGrantRevokePermission(boolean grant) {

        int userId = UserHandle.USER_CURRENT;

        int userId = UserHandle.USER_OWNER;



        String opt = null;

        while ((opt = nextOption()) != null) {

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

+2 −0
Original line number Diff line number Diff line
@@ -3146,6 +3146,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
    @Override

    public void grantRuntimePermission(String packageName, String name, int userId) {

        if (!sUserManager.exists(userId)) {

            Log.e(TAG, "No such user:" + userId);

            return;

        }










@@ -3203,6 +3204,7 @@ public class PackageManagerService extends IPackageManager.Stub {













    @Override















    public void revokeRuntimePermission(String packageName, String name, int userId) {















        if (!sUserManager.exists(userId)) {













            Log.e(TAG, "No such user:" + userId);















            return;















        }