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

Commit 698279f7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add NEARBY_WIFI_DEVICES to shell permissions for CTS" am: 5d4effbd... 

Merge "Add NEARBY_WIFI_DEVICES to shell permissions for CTS" am: 5d4effbd am: e4ee7f0e am: c144be7e am: 0ff22a28

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

Change-Id: Iefec7643bc26a244a107eaadda7b55667258dd8e
parents b0a5255e 0ff22a28

data/etc/privapp-permissions-platform.xml

+1 −0
Original line number Diff line number Diff line
@@ -474,6 +474,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.NEARBY_WIFI_DEVICES" />

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

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

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

packages/Shell/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -533,6 +533,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.NEARBY_WIFI_DEVICES" />

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



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