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

Commit 7c4ba468 authored by Hai Zhang's avatar Hai Zhang Committed by Automerger Merge Worker
Browse files

Merge "Don't enforce declaration of app op permissions without public API."... 

Merge "Don't enforce declaration of app op permissions without public API." into rvc-dev am: 16f0eb1e

Change-Id: I9ef634744e34d82f27a915851f4c89fa4b1937ca
parents 83bcd393 16f0eb1e

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

+15 −9
Original line number Diff line number Diff line
@@ -208,10 +208,15 @@ public final class PermissionPolicyService extends SystemService { 
        for (int i = 0; i < appOpPermissionInfosSize; i++) {

            final PermissionInfo appOpPermissionInfo = appOpPermissionInfos.get(i);



            final int appOpCode = AppOpsManager.permissionToOpCode(appOpPermissionInfo.name);

            switch (appOpPermissionInfo.name) {

                case android.Manifest.permission.ACCESS_NOTIFICATIONS:

                case android.Manifest.permission.MANAGE_IPSEC_TUNNELS:

                    continue;

                default:

                    final int appOpCode = AppOpsManager.permissionToOpCode(

                            appOpPermissionInfo.name);

                    if (appOpCode != OP_NONE) {

                        mAppOpPermissions.add(appOpPermissionInfo.name);



                        try {

                            appOpsService.startWatchingMode(appOpCode, null, mAppOpsCallback);

                        } catch (RemoteException e) {
@@ -219,6 +224,7 @@ public final class PermissionPolicyService extends SystemService { 
                        }

                    }

            }

        }



        IntentFilter intentFilter = new IntentFilter();

        intentFilter.addAction(Intent.ACTION_PACKAGE_ADDED);