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

Commit 17ae9548 authored by Hai Zhang's avatar Hai Zhang
Browse files

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

Fixes: 155936071
Test: atest IpSecManagerTunnelTest
Change-Id: If817b995b1d15c98b3923292df382b8c71891f63
parent 1255a2d2

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);