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

Commit 38f35381 authored by Etan Cohen's avatar Etan Cohen Committed by Automerger Merge Worker
Browse files

Merge "Add MANAGE_WIFI_INTERFACES to the shell permission" am: dc2f8bfa am:... 

Merge "Add MANAGE_WIFI_INTERFACES to the shell permission" am: dc2f8bfa am: 8dcf52fd am: ab6b6abf am: 19b2879e

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

Change-Id: Idc2ccd849b5a96648cb915e9d7ed9dcae8e53cfa
parents 6e089030 19b2879e

data/etc/privapp-permissions-platform.xml

+1 −0
Original line number Diff line number Diff line
@@ -452,6 +452,7 @@ applications that come with the platform 
        <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.MANAGE_WIFI_INTERFACES" />

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

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

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

packages/Shell/AndroidManifest.xml

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

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

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

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