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

Persist permission state for updated apps synchronously.

Browse Source 
Because if we lose the changes, an updated app won't be reconsidered for
new install permissions.

Bug: 221899913
Test: presubmit
Change-Id: Ib82189b07cf4dfd132be37fb19843d770e871f8c
This commit is contained in:
Hai Zhang
2022-05-17 13:55:08 -07:00
parent 591aa05f60
commit 821203f5fe
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
View File

@@ -2516,6 +2516,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
final int[] userIds = filterUserId == UserHandle.USER_ALL ? getAllUserIds() final int[] userIds = filterUserId == UserHandle.USER_ALL ? getAllUserIds()
: new int[] { filterUserId }; : new int[] { filterUserId };
boolean installPermissionsChanged = false;
boolean runtimePermissionsRevoked = false; boolean runtimePermissionsRevoked = false;
int[] updatedUserIds = EMPTY_INT_ARRAY; int[] updatedUserIds = EMPTY_INT_ARRAY;
@@ -2634,7 +2635,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
UidPermissionState origState = uidState; UidPermissionState origState = uidState;
boolean changedInstallPermission = false; boolean installPermissionsChangedForUser = false;
if (replace) { if (replace) {
userState.setInstallPermissionsFixed(ps.getPackageName(), false); userState.setInstallPermissionsFixed(ps.getPackageName(), false);
@@ -2800,7 +2801,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
&& origState.isPermissionGranted(permName))))) { && origState.isPermissionGranted(permName))))) {
// Grant an install permission. // Grant an install permission.
if (uidState.grantPermission(bp)) { if (uidState.grantPermission(bp)) {
changedInstallPermission = true; installPermissionsChangedForUser = true;
} }
} else if (bp.isRuntime()) { } else if (bp.isRuntime()) {
boolean hardRestricted = bp.isHardRestricted(); boolean hardRestricted = bp.isHardRestricted();
@@ -2940,12 +2941,12 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
} }
} }
if (uidState.removePermissionState(bp.getName())) { if (uidState.removePermissionState(bp.getName())) {
changedInstallPermission = true; installPermissionsChangedForUser = true;
} }
} }
} }
if ((changedInstallPermission || replace) if ((installPermissionsChangedForUser || replace)
&& !userState.areInstallPermissionsFixed(ps.getPackageName()) && !userState.areInstallPermissionsFixed(ps.getPackageName())
&& !ps.isSystem() || ps.getTransientState().isUpdatedSystemApp()) { && !ps.isSystem() || ps.getTransientState().isUpdatedSystemApp()) {
// This is the first that we have heard about this package, so the // This is the first that we have heard about this package, so the
@@ -2954,6 +2955,12 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
userState.setInstallPermissionsFixed(ps.getPackageName(), true); userState.setInstallPermissionsFixed(ps.getPackageName(), true);
} }
if (installPermissionsChangedForUser) {
installPermissionsChanged = true;
if (replace) {
updatedUserIds = ArrayUtils.appendInt(updatedUserIds, userId);
}
}
updatedUserIds = revokePermissionsNoLongerImplicitLocked(uidState, updatedUserIds = revokePermissionsNoLongerImplicitLocked(uidState,
pkg.getPackageName(), uidImplicitPermissions, uidTargetSdkVersion, userId, pkg.getPackageName(), uidImplicitPermissions, uidTargetSdkVersion, userId,
updatedUserIds); updatedUserIds);
@@ -2970,8 +2977,12 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
// Persist the runtime permissions state for users with changes. If permissions // Persist the runtime permissions state for users with changes. If permissions
// were revoked because no app in the shared user declares them we have to // were revoked because no app in the shared user declares them we have to
// write synchronously to avoid losing runtime permissions state. // write synchronously to avoid losing runtime permissions state.
// Also write synchronously if we changed any install permission for an updated app, because
// the install permission state is likely already fixed before update, and if we lose the
// changes here the app won't be reconsidered for newly-added install permissions.
if (callback != null) { if (callback != null) {
callback.onPermissionUpdated(updatedUserIds, runtimePermissionsRevoked); callback.onPermissionUpdated(updatedUserIds,
(replace && installPermissionsChanged) || runtimePermissionsRevoked);
} }
for (int userId : updatedUserIds) { for (int userId : updatedUserIds) {