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

Merge "RESTRICT AUTOMERGE Revoke dev perm if app is upgrading to post 23 and perm has pre23 flag" into rvc-dev

Browse Source
This commit is contained in:
Nate Myren
2022-12-06 20:49:04 +00:00
committed by Android (Google) Code Review
parent a5b0e8c2e7 2f30a63b11
commit 9b00dd413d
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2347,7 +2347,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
final PackageSetting ps = (PackageSetting) final PackageSetting ps = (PackageSetting)
mPackageManagerInt.getPackageSetting(newPackage.getPackageName()); mPackageManagerInt.getPackageSetting(newPackage.getPackageName());
if (grantSignaturePermission(Manifest.permission.SYSTEM_ALERT_WINDOW, newPackage, ps, saw, if (grantSignaturePermission(Manifest.permission.SYSTEM_ALERT_WINDOW, newPackage, ps, saw,
ps.getPermissionsState())) { ps.getPermissionsState(), true)) {
return; return;
} }
for (int userId : mUserManagerInt.getUserIds()) { for (int userId : mUserManagerInt.getUserIds()) {
@@ -3588,6 +3588,13 @@ public class PermissionManagerService extends IPermissionManager.Stub {
private boolean grantSignaturePermission(String perm, AndroidPackage pkg, private boolean grantSignaturePermission(String perm, AndroidPackage pkg,
PackageSetting pkgSetting, BasePermission bp, PermissionsState origPermissions) { PackageSetting pkgSetting, BasePermission bp, PermissionsState origPermissions) {
return grantSignaturePermission(perm, pkg, pkgSetting, bp, origPermissions, false);
}
private boolean grantSignaturePermission(String perm, AndroidPackage pkg,
PackageSetting pkgSetting, BasePermission bp, PermissionsState origPermissions,
boolean isApi23Upgrade) {
boolean oemPermission = bp.isOEM(); boolean oemPermission = bp.isOEM();
boolean vendorPrivilegedPermission = bp.isVendorPrivileged(); boolean vendorPrivilegedPermission = bp.isVendorPrivileged();
boolean privilegedPermission = bp.isPrivileged() || bp.isVendorPrivileged(); boolean privilegedPermission = bp.isPrivileged() || bp.isVendorPrivileged();
@@ -3762,7 +3769,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
// Any pre-installed system app is allowed to get this permission. // Any pre-installed system app is allowed to get this permission.
allowed = true; allowed = true;
} }
if (!allowed && bp.isDevelopment()) { if (!allowed && bp.isDevelopment() && !(bp.isPre23() && isApi23Upgrade)) {
// For development permissions, a development permission // For development permissions, a development permission
// is granted only if it was already granted. // is granted only if it was already granted.
allowed = origPermissions.hasInstallPermission(perm); allowed = origPermissions.hasInstallPermission(perm);