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

Commit c917ab08 authored by Oscar Shu's avatar Oscar Shu Committed by Automerger Merge Worker
Browse files

Merge "Rename MANAGE_WIFI_AUTO_JOIN to MANAGE_WIFI_NETWORK_SELECTION" am: 2349f6f6 am: 64c4227b 

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

Change-Id: I532f058cee7aaa0142fdcbb1bc1108e5e05daa88
parents 70c5b554 64c4227b

data/etc/privapp-permissions-platform.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -459,8 +459,8 @@ applications that come with the platform 
        <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

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

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

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

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

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

        <!-- 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

+2 −2
Original line number Original line Diff line number Diff line
@@ -510,8 +510,8 @@ 
    <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

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

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

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

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

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





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