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

Commit 08155b3f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "p2p: add MANAGE_WIFI_AUTO_JOIN permission for CTS external approver... 

Merge "p2p: add MANAGE_WIFI_AUTO_JOIN permission for CTS external approver tests" am: 2a491d48 am: 7faee6e2 am: 3cf3a321

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

Change-Id: Iaec2d433251d6ea1a3c9ece2f73c1202e510fbb2
parents 6dc5edb1 3cf3a321

data/etc/privapp-permissions-platform.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -481,6 +481,9 @@ applications that come with the platform 
        <permission name="android.permission.WIFI_UPDATE_COEX_UNSAFE_CHANNELS" />

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

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

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

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

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

        <!-- Permission needed for CTS test - ConcurrencyTest#testP2pExternalApprover

             P2P external approver API sets require MANAGE_WIFI_AUTO_JOIN permission. -->

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

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

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

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

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

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

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

packages/Shell/AndroidManifest.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -536,6 +536,9 @@ 
    <uses-permission android:name="android.permission.WIFI_UPDATE_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.NEARBY_WIFI_DEVICES" />

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

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

    <!-- Permission needed for CTS test - ConcurrencyTest#testP2pExternalApprover

         P2P external approver API sets require MANAGE_WIFI_AUTO_JOIN permission. -->

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





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

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

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

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