Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Matthew Xie
2014-08-06 18:37:20 +00:00
committed by Android (Google) Code Review
parent d1c89b1dd6 6b93229a21
commit 4565ded1a2
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/res/AndroidManifest.xml
View File

@@ -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.
-->

7
core/res/res/values/strings.xml
View File

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