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

Commit e2f51cb6 authored by Nate(Qiang) Jiang's avatar Nate(Qiang) Jiang Committed by Automerger Merge Worker
Browse files

Merge "Add OVERRIDE_WIFI_CONFIG permission to Shell for CTS" am: dbe634a7... 

Merge "Add OVERRIDE_WIFI_CONFIG permission to Shell for CTS" am: dbe634a7 am: 93be545c am: 8a4f65b4

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

Change-Id: Ic8243b12ebed20e1e392acc2a5be52a09b857582
parents 556a84af 8a4f65b4

data/etc/privapp-permissions-platform.xml

+1 −0
Original line number Diff line number Diff line
@@ -461,6 +461,7 @@ applications that come with the platform 
        <!-- Permission needed for CTS test - WifiManagerTest -->

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

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

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

        <!-- Permission required for CTS test CarrierMessagingServiceWrapperTest -->

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

        <!-- Permission required for CTS test - MusicRecognitionManagerTest -->

packages/Shell/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -504,6 +504,7 @@ 
    <!-- Permission needed for CTS test - WifiManagerTest -->

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

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

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



    <!-- Permission required for CTS tests to enable/disable rate limiting toasts. -->

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