Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure storage permission revoke happens for all users am: 37acd7ee52

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

Change-Id: I1ddc2e08a24de09963fbda968363e06639a840d8
This commit is contained in:
Nate Myren
2021-05-06 22:59:56 +00:00
committed by Automerger Merge Worker
parent f357945196 37acd7ee52
commit 9fd3879e6e
1 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/pm/permission/PermissionManagerService.java
View File

@@ -2293,10 +2293,11 @@ public class PermissionManagerService extends IPermissionManager.Stub {
} }
final int callingUid = Binder.getCallingUid(); final int callingUid = Binder.getCallingUid();
final int userId = UserHandle.getUserId(newPackage.getUid()); for (int userId: mUserManagerInt.getUserIds()) {
int numRequestedPermissions = newPackage.getRequestedPermissions().size(); int numRequestedPermissions = newPackage.getRequestedPermissions().size();
for (int i = 0; i < numRequestedPermissions; i++) { for (int i = 0; i < numRequestedPermissions; i++) {
PermissionInfo permInfo = getPermissionInfo(newPackage.getRequestedPermissions().get(i), PermissionInfo permInfo = getPermissionInfo(
newPackage.getRequestedPermissions().get(i),
newPackage.getPackageName(), 0); newPackage.getPackageName(), 0);
if (permInfo == null || !STORAGE_PERMISSIONS.contains(permInfo.name)) { if (permInfo == null || !STORAGE_PERMISSIONS.contains(permInfo.name)) {
continue; continue;
@@ -2308,8 +2309,14 @@ public class PermissionManagerService extends IPermissionManager.Stub {
+ downgradedSdk + " or newly requested legacy full storage " + downgradedSdk + " or newly requested legacy full storage "
+ newlyRequestsLegacy); + newlyRequestsLegacy);
try {
revokeRuntimePermissionInternal(permInfo.name, newPackage.getPackageName(), revokeRuntimePermissionInternal(permInfo.name, newPackage.getPackageName(),
false, callingUid, userId, null, permissionCallback); false, callingUid, userId, null, permissionCallback);
} catch (IllegalStateException | SecurityException e) {
Log.e(TAG, "unable to revoke " + permInfo.name + " for "
+ newPackage.getPackageName() + " user " + userId, e);
}
}
} }
} }