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

Commit 4565ded1 authored by Matthew Xie's avatar Matthew Xie Committed by Android (Google) Code Review
Browse files

Merge "Add BLUETOOTH_MAP permission to give Bluetooth app exclusive access to... 

Merge "Add BLUETOOTH_MAP permission to give Bluetooth app exclusive access to email access" into lmp-dev
parents d1c89b1d 6b93229a

core/res/AndroidManifest.xml

+9 −0
Original line number Diff line number Diff line
@@ -880,6 +880,15 @@ 
        android:description="@string/permdesc_bluetoothPriv"

        android:label="@string/permlab_bluetoothPriv" />



    <!-- Control access to email providers exclusively for Bluetooth

         @hide

    -->

    <permission android:name="android.permission.BLUETOOTH_MAP"

        android:permissionGroup="android.permission-group.BLUETOOTH_NETWORK"

        android:protectionLevel="signature"

        android:description="@string/permdesc_bluetoothMap"

        android:label="@string/permlab_bluetoothMap" />



    <!-- Allows bluetooth stack to access files

         @hide This should only be used by Bluetooth apk.

    -->

core/res/res/values/strings.xml

+7 −0
Original line number Diff line number Diff line
@@ -1974,6 +1974,13 @@ 
    <string name="permdesc_bluetoothPriv" product="default">Allows the app to

      pair with remote devices without user interaction.</string>



    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permlab_bluetoothMap">access Bluetooth MAP data</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permdesc_bluetoothMap" product="tablet">Allows the app to access Bluetooth MAP data.</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permdesc_bluetoothMap" product="default">Allows the app to access Bluetooth MAP data.</string>



    <string name="permlab_accessWimaxState">connect and disconnect from WiMAX</string>

    <string name="permdesc_accessWimaxState">Allows the app to determine whether

     WiMAX is enabled and information about any WiMAX networks that are