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

Commit 78d6a42e authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Clean up the permission control code in framework"

parents 480d18c4 05887f99

services/core/java/com/android/server/connectivity/PermissionMonitor.java

+2 −2
Original line number Diff line number Diff line
@@ -650,7 +650,7 @@ public class PermissionMonitor { 
                case INetd.PERMISSION_UPDATE_DEVICE_STATS:

                    updateStatsPermissionAppIds.add(netdPermissionsAppIds.keyAt(i));

                    break;

                case INetd.NO_PERMISSIONS:

                case INetd.PERMISSION_NONE:

                    noPermissionAppIds.add(netdPermissionsAppIds.keyAt(i));

                    break;

                case INetd.PERMISSION_UNINSTALLED:
@@ -676,7 +676,7 @@ public class PermissionMonitor { 
                        ArrayUtils.convertToIntArray(updateStatsPermissionAppIds));

            }

            if (noPermissionAppIds.size() != 0) {

                mNetd.trafficSetNetPermForUids(INetd.NO_PERMISSIONS,

                mNetd.trafficSetNetPermForUids(INetd.PERMISSION_NONE,

                        ArrayUtils.convertToIntArray(noPermissionAppIds));

            }

            if (uninstalledAppIds.size() != 0) {

tests/net/java/com/android/server/connectivity/PermissionMonitorTest.java

+4 −4
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ public class PermissionMonitorTest { 


        SparseIntArray netdPermissionsAppIds = new SparseIntArray();

        netdPermissionsAppIds.put(MOCK_UID1, INetd.PERMISSION_INTERNET);

        netdPermissionsAppIds.put(MOCK_UID2, INetd.NO_PERMISSIONS);

        netdPermissionsAppIds.put(MOCK_UID2, INetd.PERMISSION_NONE);

        netdPermissionsAppIds.put(SYSTEM_UID1, INetd.PERMISSION_INTERNET

                | INetd.PERMISSION_UPDATE_DEVICE_STATS);

        netdPermissionsAppIds.put(SYSTEM_UID2, INetd.PERMISSION_UPDATE_DEVICE_STATS);
@@ -534,7 +534,7 @@ public class PermissionMonitorTest { 


        mNetdServiceMonitor.expectPermission(INetd.PERMISSION_INTERNET,

                new int[]{MOCK_UID1});

        mNetdServiceMonitor.expectPermission(INetd.NO_PERMISSIONS, new int[]{MOCK_UID2});

        mNetdServiceMonitor.expectPermission(INetd.PERMISSION_NONE, new int[]{MOCK_UID2});

        mNetdServiceMonitor.expectPermission(INetd.PERMISSION_INTERNET

                | INetd.PERMISSION_UPDATE_DEVICE_STATS, new int[]{SYSTEM_UID1});

        mNetdServiceMonitor.expectPermission(INetd.PERMISSION_UPDATE_DEVICE_STATS,
@@ -553,8 +553,8 @@ public class PermissionMonitorTest { 
        mNetdServiceMonitor.expectPermission(INetd.PERMISSION_INTERNET, new int[]{SYSTEM_UID2});



        // Revoke permission from SYSTEM_UID1, expect no permission stored.

        mPermissionMonitor.sendPackagePermissionsForUid(SYSTEM_UID1, INetd.NO_PERMISSIONS);

        mNetdServiceMonitor.expectPermission(INetd.NO_PERMISSIONS, new int[]{SYSTEM_UID1});

        mPermissionMonitor.sendPackagePermissionsForUid(SYSTEM_UID1, INetd.PERMISSION_NONE);

        mNetdServiceMonitor.expectPermission(INetd.PERMISSION_NONE, new int[]{SYSTEM_UID1});

    }



    private PackageInfo addPackage(String packageName, int uid, String[] permissions)