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

Merge "Sync app ops for all runtime permissions in PermissionPolicyService."

Browse Source
This commit is contained in:
TreeHugger Robot
2019-10-03 19:17:23 +00:00
committed by Android (Google) Code Review
parent 5422be2fc2 4bf9a32c6b
commit 2998a810e6
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1558,7 +1558,6 @@ public class PermissionManagerService extends IPermissionManager.Stub {
}
};
final AppOpsManager appOpsManager = mContext.getSystemService(AppOpsManager.class);
for (int i = 0; i < permissionCount; i++) {
final String permName = pkg.requestedPermissions.get(i);
final BasePermission bp;
@@ -1624,16 +1623,9 @@ public class PermissionManagerService extends IPermissionManager.Stub {
// If this permission was granted by default, make sure it is.
if ((oldFlags & FLAG_PERMISSION_GRANTED_BY_DEFAULT) != 0) {
// PermissionPolicyService will handle the app op for runtime permissions later.
grantRuntimePermissionInternal(permName, packageName, false,
Process.SYSTEM_UID, userId, delayingPermCallback);
// Allow app op later as we are holding mPackages
// PermissionPolicyService will handle the app op for foreground/background
// permissions.
String appOp = AppOpsManager.permissionToOp(permName);
if (appOp != null) {
mHandler.post(() -> appOpsManager.setUidMode(appOp, uid,
AppOpsManager.MODE_ALLOWED));
}
// If permission review is enabled the permissions for a legacy apps
// are represented as constantly granted runtime ones, so don't revoke.
} else if ((flags & FLAG_PERMISSION_REVIEW_REQUIRED) == 0) {

3
services/core/java/com/android/server/policy/PermissionPolicyService.java
View File

@@ -499,8 +499,7 @@ public final class PermissionPolicyService extends SystemService {
private void addPermissionAppOp(@NonNull PackageInfo packageInfo,
@NonNull PermissionInfo permissionInfo) {
// TODO: Sync all permissions in the future.
if (!permissionInfo.isRestricted() && permissionInfo.backgroundPermission == null) {
if (!permissionInfo.isRuntime()) {
return;
}