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

Merge "Fix an issue where a custom permission is revoked"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-07-02 22:49:41 +00:00
committed by Android (Google) Code Review
parent f84cde126f c5d0555fed
commit c5537211c3
1 changed files with 43 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4220,33 +4220,35 @@ public class PermissionManagerService extends IPermissionManager.Stub {
// If the target package is being uninstalled, we need to revoke this permission
// From all other packages
if (pkg == null || !hasPermission(pkg, bp.getName())) {
Slog.i(TAG, "Removing permission " + bp.getName()
+ " that used to be declared by " + bp.getPackageName());
if (bp.isRuntime()) {
final int[] userIds = mUserManagerInt.getUserIds();
final int numUserIds = userIds.length;
for (int userIdNum = 0; userIdNum < numUserIds; userIdNum++) {
final int userId = userIds[userIdNum];
mPackageManagerInt.forEachPackage((AndroidPackage p) ->
revokePermissionFromPackageForUser(p.getPackageName(),
bp.getName(), true, userId, callback));
}
} else {
mPackageManagerInt.forEachPackage(p -> {
if (!isPermissionDeclaredByDisabledSystemPkg(bp)) {
Slog.i(TAG, "Removing permission " + bp.getName()
+ " that used to be declared by " + bp.getPackageName());
if (bp.isRuntime()) {
final int[] userIds = mUserManagerInt.getUserIds();
synchronized (mLock) {
for (final int userId : userIds) {
final UidPermissionState uidState = getUidStateLocked(p,
userId);
if (uidState == null) {
Slog.e(TAG, "Missing permissions state for "
+ p.getPackageName() + " and user " + userId);
continue;
}
uidState.removePermissionState(bp.getName());
}
final int numUserIds = userIds.length;
for (int userIdNum = 0; userIdNum < numUserIds; userIdNum++) {
final int userId = userIds[userIdNum];
mPackageManagerInt.forEachPackage((AndroidPackage p) ->
revokePermissionFromPackageForUser(p.getPackageName(),
bp.getName(), true, userId, callback));
}
});
} else {
mPackageManagerInt.forEachPackage(p -> {
final int[] userIds = mUserManagerInt.getUserIds();
synchronized (mLock) {
for (final int userId : userIds) {
final UidPermissionState uidState = getUidStateLocked(p,
userId);
if (uidState == null) {
Slog.e(TAG, "Missing permissions state for "
+ p.getPackageName() + " and user " + userId);
continue;
}
uidState.removePermissionState(bp.getName());
}
}
});
}
}
synchronized (mLock) {
mRegistry.removePermission(bp.getName());
@@ -4271,6 +4273,22 @@ public class PermissionManagerService extends IPermissionManager.Stub {
return changed;
}
private boolean isPermissionDeclaredByDisabledSystemPkg(@NonNull Permission permission) {
final PackageSetting disabledSourcePs = mPackageManagerInt.getDisabledSystemPackage(
permission.getPackageName());
if (disabledSourcePs != null && disabledSourcePs.getPkg() != null) {
final String permissionName = permission.getName();
final List<ParsedPermission> sourcePerms = disabledSourcePs.getPkg().getPermissions();
for (ParsedPermission sourcePerm : sourcePerms) {
if (TextUtils.equals(permissionName, sourcePerm.getName())
&& permission.getProtectionLevel() == sourcePerm.getProtectionLevel()) {
return true;
}
}
}
return false;
}
/**
* Revoke a runtime permission from a package for a given user ID.
*/