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

Merge "Support revoke-when-requested with pre-M apps"

Browse Source
This commit is contained in:
Philip P. Moltmann
2019-02-19 10:34:09 +00:00
committed by Android (Google) Code Review
parent 3deb23fead d030ce24c1
commit 753f4ce468
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1181,11 +1181,9 @@ public class PermissionManagerService {
@NonNull int[] updatedUserIds) {
AppOpsManager appOpsManager = mContext.getSystemService(AppOpsManager.class);
if (pkg.applicationInfo.targetSdkVersion < Build.VERSION_CODES.M) {
return updatedUserIds;
}
String pkgName = pkg.packageName;
boolean supportsRuntimePermissions = pkg.applicationInfo.targetSdkVersion
>= Build.VERSION_CODES.M;
int[] users = UserManagerService.getInstance().getUserIds();
int numUsers = users.length;
@@ -1210,15 +1208,17 @@ public class PermissionManagerService {
if ((flags & (FLAG_PERMISSION_GRANTED_BY_DEFAULT
| FLAG_PERMISSION_POLICY_FIXED | FLAG_PERMISSION_SYSTEM_FIXED))
== 0) {
int revokeResult = ps.revokeRuntimePermission(bp, userId);
if (revokeResult
!= PERMISSION_OPERATION_FAILURE) {
if (DEBUG_PERMISSIONS) {
Slog.i(TAG, "Revoking runtime permission " + permission
+ " for " + pkgName
+ " as it is now requested");
if (supportsRuntimePermissions) {
int revokeResult = ps.revokeRuntimePermission(bp, userId);
if (revokeResult != PERMISSION_OPERATION_FAILURE) {
if (DEBUG_PERMISSIONS) {
Slog.i(TAG, "Revoking runtime permission "
+ permission + " for " + pkgName
+ " as it is now requested");
}
}
} else {
setAppOpMode(permission, pkg, userId, MODE_IGNORED);
}
List<String> fgPerms = mBackgroundPermissions.get(permission);