Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab6a6822 authored by Hai Zhang's avatar Hai Zhang
Browse files

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

This reverts commit 18f22a4a.

Reason for revert: Submit again.

Bug: 136503238
Test: presubmit
Change-Id: Idc321ecf0aa1b7c1a89b2e7409c7bd3fd3c68a38
parent 0c123fac

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+1 −10
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.UserIdInt;

import android.app.ActivityManager;

import android.app.AppOpsManager;

import android.app.ApplicationPackageManager;

import android.app.IActivityManager;

import android.content.Context;
@@ -1542,7 +1541,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;
@@ -1608,16 +1606,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) {

services/core/java/com/android/server/policy/PermissionPolicyService.java

+2 −3
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ public final class PermissionPolicyService extends SystemService { 
            for (int i = 0; i < numDangerousPerms; i++) {

                PermissionInfo perm = dangerousPerms.get(i);



                if (perm.isRestricted() || perm.backgroundPermission != null) {

                if (perm.isRuntime()) {

                    appOpsService.startWatchingMode(getSwitchOp(perm.name), null, appOpsListener);

                }

                if (perm.isSoftRestricted()) {
@@ -511,8 +511,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;

            }