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

Merge "Properly fix revokePermissionsNoLongerImplicitLocked() for shared UIDs." am: adf939b3d3

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

Change-Id: I28921d53213efb23bed45f5e4fec4a4fbffd871f
This commit is contained in:
Treehugger Robot
2022-03-14 20:15:12 +00:00
committed by Automerger Merge Worker
parent 98a19b3c03 adf939b3d3
commit 45c3d99280
1 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2679,31 +2679,36 @@ public class PermissionManagerService extends IPermissionManager.Stub {
} }
} }
synchronized (mLock) {
for (final int userId : userIds) {
final UserPermissionState userState = mState.getOrCreateUserState(userId);
final UidPermissionState uidState = userState.getOrCreateUidState(ps.getAppId());
if (uidState.isMissing()) {
Collection<String> uidRequestedPermissions; Collection<String> uidRequestedPermissions;
int targetSdkVersion; Collection<String> uidImplicitPermissions;
int uidTargetSdkVersion;
if (!ps.isSharedUser()) { if (!ps.isSharedUser()) {
uidRequestedPermissions = pkg.getRequestedPermissions(); uidRequestedPermissions = pkg.getRequestedPermissions();
targetSdkVersion = pkg.getTargetSdkVersion(); uidImplicitPermissions = pkg.getImplicitPermissions();
uidTargetSdkVersion = pkg.getTargetSdkVersion();
} else { } else {
uidRequestedPermissions = new ArraySet<>(); uidRequestedPermissions = new ArraySet<>();
targetSdkVersion = Build.VERSION_CODES.CUR_DEVELOPMENT; uidImplicitPermissions = new ArraySet<>();
uidTargetSdkVersion = Build.VERSION_CODES.CUR_DEVELOPMENT;
List<AndroidPackage> packages = ps.getSharedUser().getPackages(); List<AndroidPackage> packages = ps.getSharedUser().getPackages();
int packagesSize = packages.size(); int packagesSize = packages.size();
for (int i = 0; i < packagesSize; i++) { for (int i = 0; i < packagesSize; i++) {
AndroidPackage sharedUserPackage = packages.get(i); AndroidPackage sharedUserPackage = packages.get(i);
uidRequestedPermissions.addAll( uidRequestedPermissions.addAll(
sharedUserPackage.getRequestedPermissions()); sharedUserPackage.getRequestedPermissions());
targetSdkVersion = Math.min(targetSdkVersion, uidImplicitPermissions.addAll(
sharedUserPackage.getImplicitPermissions());
uidTargetSdkVersion = Math.min(uidTargetSdkVersion,
sharedUserPackage.getTargetSdkVersion()); sharedUserPackage.getTargetSdkVersion());
} }
} }
synchronized (mLock) {
for (final int userId : userIds) {
final UserPermissionState userState = mState.getOrCreateUserState(userId);
final UidPermissionState uidState = userState.getOrCreateUidState(ps.getAppId());
if (uidState.isMissing()) {
for (String permissionName : uidRequestedPermissions) { for (String permissionName : uidRequestedPermissions) {
Permission permission = mRegistry.getPermission(permissionName); Permission permission = mRegistry.getPermission(permissionName);
if (permission == null) { if (permission == null) {
@@ -2717,7 +2722,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT, FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT,
FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT); FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT);
} }
if (targetSdkVersion < Build.VERSION_CODES.M) { if (uidTargetSdkVersion < Build.VERSION_CODES.M) {
uidState.updatePermissionFlags(permission, uidState.updatePermissionFlags(permission,
PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED
| PackageManager.FLAG_PERMISSION_REVOKED_COMPAT, | PackageManager.FLAG_PERMISSION_REVOKED_COMPAT,
@@ -3043,8 +3048,9 @@ public class PermissionManagerService extends IPermissionManager.Stub {
userState.setInstallPermissionsFixed(ps.name, true); userState.setInstallPermissionsFixed(ps.name, true);
} }
updatedUserIds = revokePermissionsNoLongerImplicitLocked(uidState, pkg, updatedUserIds = revokePermissionsNoLongerImplicitLocked(uidState,
userId, updatedUserIds); pkg.getPackageName(), uidImplicitPermissions, uidTargetSdkVersion, userId,
updatedUserIds);
updatedUserIds = setInitialGrantForNewImplicitPermissionsLocked(origState, updatedUserIds = setInitialGrantForNewImplicitPermissionsLocked(origState,
uidState, pkg, newImplicitPermissions, userId, updatedUserIds); uidState, pkg, newImplicitPermissions, userId, updatedUserIds);
} }
@@ -3081,7 +3087,9 @@ public class PermissionManagerService extends IPermissionManager.Stub {
* {@link PackageManager#FLAG_PERMISSION_REVOKE_WHEN_REQUESTED} set. * {@link PackageManager#FLAG_PERMISSION_REVOKE_WHEN_REQUESTED} set.
* *
* @param ps The state of the permissions of the package * @param ps The state of the permissions of the package
* @param pkg The package that is currently looked at * @param packageName The name of the package
* @param uidImplicitPermissions The implicit permissions of all packages in the UID
* @param uidTargetSdkVersion The lowest target SDK version of all packages in the UID
* @param userIds All user IDs in the system, must be passed in because this method is locked * @param userIds All user IDs in the system, must be passed in because this method is locked
* @param updatedUserIds a list of user ids that needs to be amended if the permission state * @param updatedUserIds a list of user ids that needs to be amended if the permission state
* for a user is changed. * for a user is changed.
@@ -3090,14 +3098,12 @@ public class PermissionManagerService extends IPermissionManager.Stub {
*/ */
@GuardedBy("mLock") @GuardedBy("mLock")
private @NonNull int[] revokePermissionsNoLongerImplicitLocked(@NonNull UidPermissionState ps, private @NonNull int[] revokePermissionsNoLongerImplicitLocked(@NonNull UidPermissionState ps,
@NonNull AndroidPackage pkg, int userId, @NonNull int[] updatedUserIds) { @NonNull String packageName, @NonNull Collection<String> uidImplicitPermissions,
String pkgName = pkg.getPackageName(); int uidTargetSdkVersion, int userId, @NonNull int[] updatedUserIds) {
boolean supportsRuntimePermissions = pkg.getTargetSdkVersion() boolean supportsRuntimePermissions = uidTargetSdkVersion >= Build.VERSION_CODES.M;
>= Build.VERSION_CODES.M;
for (String permission : ps.getGrantedPermissions()) { for (String permission : ps.getGrantedPermissions()) {
if (pkg.getRequestedPermissions().contains(permission) if (!uidImplicitPermissions.contains(permission)) {
&& !pkg.getImplicitPermissions().contains(permission)) {
Permission bp = mRegistry.getPermission(permission); Permission bp = mRegistry.getPermission(permission);
if (bp != null && bp.isRuntime()) { if (bp != null && bp.isRuntime()) {
int flags = ps.getPermissionFlags(permission); int flags = ps.getPermissionFlags(permission);
@@ -3124,7 +3130,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
if (ps.revokePermission(bp)) { if (ps.revokePermission(bp)) {
if (DEBUG_PERMISSIONS) { if (DEBUG_PERMISSIONS) {
Slog.i(TAG, "Revoking runtime permission " Slog.i(TAG, "Revoking runtime permission "
+ permission + " for " + pkgName + permission + " for " + packageName
+ " as it is now requested"); + " as it is now requested");
} }
} }