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

Commit 3ec38dc5 authored by Benedict Wong's avatar Benedict Wong
Browse files

Enable checks for MANAGE_TEST_NETWORKS in TestNetworkService 

This commit re-enables enforcement of the MANAGE_TEST_NETWORK
permission, which is only granted to the shell. CTS tests using this
permission should use UiAutomation.adoptShellPermissionIdentity() to
gain access.

Bug: 72950854
Test: IPsec CTS tests using this passing
Change-Id: I98573a5c68e45abbbaddef01f6ac74a6a18e26f9
parent 7df36ed9

services/core/java/com/android/server/TestNetworkService.java

+3 −7
Original line number Diff line number Diff line
@@ -325,14 +325,10 @@ class TestNetworkService extends ITestNetworkManager.Stub { 
        agent.teardown();

    }



    // STOPSHIP: Change this back to android.Manifest.permission.MANAGE_TEST_NETWORKS

    private static final String PERMISSION_NAME = "dummy";

    private static final String PERMISSION_NAME =

            android.Manifest.permission.MANAGE_TEST_NETWORKS;



    public static void enforceTestNetworkPermissions(@NonNull Context context) {

        // STOPSHIP: Re-enable these checks. Disabled until adoptShellPermissionIdentity() can be

        //           called from CTS test code.

        if (false) {

        context.enforceCallingOrSelfPermission(PERMISSION_NAME, "TestNetworkService");

    }

}
 
}