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

Merge "Ensure storage permission revoke happens for all users" into sc-dev

Browse Source
This commit is contained in:
Nate Myren
2021-05-06 15:21:11 +00:00
committed by Android (Google) Code Review
parent 6570ee5f7b 1a3709073f
commit 6c1ae930f3
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

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