Ensure storage permission revoke happens for all users am: 387182eb49

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

Change-Id: Icf0e785e3ee908301240ca5c2eb63a8d21ac7b07
This commit is contained in:
Nate Myren
2021-05-12 17:36:11 +00:00
committed by Automerger Merge Worker

View File

@@ -618,7 +618,8 @@ public class PermissionManagerService {
} }
final int callingUid = Binder.getCallingUid(); final int callingUid = Binder.getCallingUid();
final int userId = UserHandle.getUserId(newPackage.applicationInfo.uid);
for (int userId: mUserManagerInt.getUserIds()) {
int numRequestedPermissions = newPackage.requestedPermissions.size(); int numRequestedPermissions = newPackage.requestedPermissions.size();
for (int i = 0; i < numRequestedPermissions; i++) { for (int i = 0; i < numRequestedPermissions; i++) {
PermissionInfo permInfo = getPermissionInfo(newPackage.requestedPermissions.get(i), PermissionInfo permInfo = getPermissionInfo(newPackage.requestedPermissions.get(i),
@@ -633,8 +634,14 @@ public class PermissionManagerService {
+ downgradedSdk + " or newly requested legacy full storage " + downgradedSdk + " or newly requested legacy full storage "
+ newlyRequestsLegacy); + newlyRequestsLegacy);
try {
revokeRuntimePermission(permInfo.name, newPackage.packageName, revokeRuntimePermission(permInfo.name, newPackage.packageName,
false, userId, permissionCallback); false, userId, permissionCallback);
} catch (IllegalStateException | SecurityException e) {
Log.e(TAG, "unable to revoke " + permInfo.name + " for "
+ newPackage.packageName + " user " + userId, e);
}
}
} }
} }