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

Commit a3e32c8b authored by Ken Chen's avatar Ken Chen Committed by Automerger Merge Worker
Browse files

Merge "Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission to shell" am: 1b06ec25 am: a96493b7 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675632

Change-Id: I9a94931334fe162c5f05c6c3a1628a41468a2d82
parents 2b8dce1d a96493b7

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" />