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

Commit 81b55fbe authored by Ken Chen's avatar Ken Chen
Browse files

Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission to shell 

The shell *already had* the privileges granted by this permission due to
specific code in netd, and it lost those privileges when it gained the
CHANGE_NETWORK_STATE permission. Explicitly add
CONNECTIVITY_USE_RESTRICTED_NETWORKS so that it can obtain sufficient
permission in netd no matter CHANGE_NETWORK_STATE is set or not.

Remove a duplicate row by the way.

Bug: 185071689
Test: atest NetdClientTest#protectFromVpnTcp6
Change-Id: I64bc321de2c83378ce7bc8d9eb3044ae7772faca
parent 51e5e808

data/etc/privapp-permissions-platform.xml

+1 −1
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ applications that come with the platform 
        <permission name="android.permission.CONFIGURE_DISPLAY_BRIGHTNESS" />

        <permission name="android.permission.SET_VOLUME_KEY_LONG_PRESS_LISTENER" />

        <permission name="android.permission.SET_MEDIA_KEY_LISTENER" />

        <permission name="android.permission.SET_VOLUME_KEY_LONG_PRESS_LISTENER" />

        <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS" />

    </privapp-permissions>



    <privapp-permissions package="com.android.statementservice">

packages/Shell/AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -391,6 +391,9 @@ 
    <!-- Permission required for testing system audio effect APIs. -->

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



    <!-- Permission required for running networking unit tests -->

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



    <!-- Permissions required for CTS test - TunerTest -->

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

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