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

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

Merge "Send correct UID on perm flag update"

parents b1ed00b3 3fb13a1f

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+6 −2
Original line number Diff line number Diff line
@@ -321,7 +321,10 @@ public class PermissionManagerService extends IPermissionManager.Stub { 
        public void onPermissionUpdatedNotifyListener(@UserIdInt int[] updatedUserIds, boolean sync,

                int uid) {

            onPermissionUpdated(updatedUserIds, sync);

            mOnPermissionChangeListeners.onPermissionsChanged(uid);

            for (int i = 0; i < updatedUserIds.length; i++) {

                int userUid = UserHandle.getUid(updatedUserIds[i], UserHandle.getAppId(uid));

                mOnPermissionChangeListeners.onPermissionsChanged(userUid);

            }

        }

        public void onInstallPermissionUpdatedNotifyListener(int uid) {

            onInstallPermissionUpdated();
@@ -733,7 +736,8 @@ public class PermissionManagerService extends IPermissionManager.Stub { 
            // Install and runtime permissions are stored in different places,

            // so figure out what permission changed and persist the change.

            if (permissionsState.getInstallPermissionState(permName) != null) {

                callback.onInstallPermissionUpdatedNotifyListener(pkg.getUid());

                int userUid = UserHandle.getUid(userId, UserHandle.getAppId(pkg.getUid()));

                callback.onInstallPermissionUpdatedNotifyListener(userUid);

            } else if (permissionsState.getRuntimePermissionState(permName, userId) != null

                    || hadState) {

                callback.onPermissionUpdatedNotifyListener(new int[]{userId}, false,