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: 387182eb49

Browse Source 
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
parent 80b1e85c12 387182eb49
commit 2f2fa37a18
1 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -618,23 +618,30 @@ public class PermissionManagerService {
}
final int callingUid = Binder.getCallingUid();
final int userId = UserHandle.getUserId(newPackage.applicationInfo.uid);
int numRequestedPermissions = newPackage.requestedPermissions.size();
for (int i = 0; i < numRequestedPermissions; i++) {
PermissionInfo permInfo = getPermissionInfo(newPackage.requestedPermissions.get(i),
newPackage.packageName, 0, callingUid);
if (permInfo == null || !STORAGE_PERMISSIONS.contains(permInfo.name)) {
continue;
for (int userId: mUserManagerInt.getUserIds()) {
int numRequestedPermissions = newPackage.requestedPermissions.size();
for (int i = 0; i < numRequestedPermissions; i++) {
PermissionInfo permInfo = getPermissionInfo(newPackage.requestedPermissions.get(i),
newPackage.packageName, 0, callingUid);
if (permInfo == null || !STORAGE_PERMISSIONS.contains(permInfo.name)) {
continue;
}
EventLog.writeEvent(0x534e4554, "171430330", newPackage.applicationInfo.uid,
"Revoking permission " + permInfo.name + " from package "
+ newPackage.packageName + " as either the sdk downgraded "
+ downgradedSdk + " or newly requested legacy full storage "
+ newlyRequestsLegacy);
try {
revokeRuntimePermission(permInfo.name, newPackage.packageName,
false, userId, permissionCallback);
} catch (IllegalStateException | SecurityException e) {
Log.e(TAG, "unable to revoke " + permInfo.name + " for "
+ newPackage.packageName + " user " + userId, e);
}
}
EventLog.writeEvent(0x534e4554, "171430330", newPackage.applicationInfo.uid,
"Revoking permission " + permInfo.name + " from package "
+ newPackage.packageName + " as either the sdk downgraded "
+ downgradedSdk + " or newly requested legacy full storage "
+ newlyRequestsLegacy);
revokeRuntimePermission(permInfo.name, newPackage.packageName,
false, userId, permissionCallback);
}
}