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

Commit f1223c17 authored by Jimmy Chen's avatar Jimmy Chen Committed by Automerger Merge Worker
Browse files

Merge "p2p: add CONFIGURE_WIFI_DISPLAY permssion for P2P test" am: 1bf4072c... 

Merge "p2p: add CONFIGURE_WIFI_DISPLAY permssion for P2P test" am: 1bf4072c am: a29505af am: a6b28ca5

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



Change-Id: I3fbd9149f85c6c800079cab5c7a1187bb891d210
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b9c60c92 a6b28ca5

data/etc/privapp-permissions-platform.xml

+2 −0
Original line number Diff line number Diff line
@@ -427,6 +427,8 @@ applications that come with the platform 
        <!-- Permission needed for CTS test - ConcurrencyTest#testP2pExternalApprover

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

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

        <!-- Permission needed for CTS test - ConcurrencyTest#testP2pSetWfdInfo -->

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

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

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

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

packages/Shell/AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -552,6 +552,8 @@ 
    <!-- Permission needed for CTS test - ConcurrencyTest#testP2pExternalApprover

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

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

    <!-- Permission needed for CTS test - ConcurrencyTest#testP2pSetWfdInfo -->

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



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

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