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

Commit 9adfabc7 authored by Chalard Jean's avatar Chalard Jean Committed by android-build-merger
Browse files

Merge "Let the system server have CONNECTIVITY_USE_RESTRICTED_NETWORKS." into qt-dev 

am: d0ee2548

Change-Id: I49bc8ba2f63bb987eebba7445613b27ffd382431
parents 59636213 d0ee2548

core/res/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -1697,6 +1697,7 @@ 
         @hide -->

    <permission android:name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"

        android:protectionLevel="signature|privileged" />

    <uses-permission android:name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>



    <!-- @SystemApi Allows an internal user to set signal strength in NetworkRequest. This kind of

         request will wake up device when signal strength meets the given value.

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

+18 −2
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ import android.os.UserHandle; 
import android.os.UserManager;

import android.util.SparseIntArray;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;
@@ -96,6 +97,7 @@ public class PermissionMonitorTest { 
    private static final int SYSTEM_UID1 = 1000;

    private static final int SYSTEM_UID2 = 1008;

    private static final int VPN_UID = 10002;

    private static final String REAL_SYSTEM_PACKAGE_NAME = "android";

    private static final String MOCK_PACKAGE1 = "appName1";

    private static final String MOCK_PACKAGE2 = "appName2";

    private static final String SYSTEM_PACKAGE1 = "sysName1";
@@ -188,8 +190,10 @@ public class PermissionMonitorTest { 
    private static PackageInfo buildPackageInfo(boolean hasSystemPermission, int uid, int userId) {

        final PackageInfo pkgInfo;

        if (hasSystemPermission) {

            pkgInfo = packageInfoWithPermissions(new String[] {CHANGE_NETWORK_STATE, NETWORK_STACK},

                    PARTITION_SYSTEM);

            final String[] systemPermissions = new String[]{

                    CHANGE_NETWORK_STATE, NETWORK_STACK, CONNECTIVITY_USE_RESTRICTED_NETWORKS

            };

            pkgInfo = packageInfoWithPermissions(systemPermissions, PARTITION_SYSTEM);

        } else {

            pkgInfo = packageInfoWithPermissions(new String[] {}, "");

        }
@@ -646,4 +650,16 @@ public class PermissionMonitorTest { 
        mObserver.onPackageRemoved(MOCK_PACKAGE1, MOCK_UID1);

        mNetdServiceMonitor.expectPermission(INetd.PERMISSION_INTERNET, new int[]{MOCK_UID1});

    }



    @Test

    public void testRealSystemPermission() throws Exception {

        // Use the real context as this test must ensure the *real* system package holds the

        // necessary permission.

        final Context realContext = InstrumentationRegistry.getContext();

        final PermissionMonitor monitor = new PermissionMonitor(realContext, mNetdService);

        final PackageManager manager = realContext.getPackageManager();

        final PackageInfo systemInfo = manager.getPackageInfo(REAL_SYSTEM_PACKAGE_NAME,

                GET_PERMISSIONS | MATCH_ANY_USER);

        assertTrue(monitor.hasPermission(systemInfo, CONNECTIVITY_USE_RESTRICTED_NETWORKS));

    }

}