diff options
| author | Matthew Xie <mattx@google.com> | 2014-08-06 19:50:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-06 19:50:00 +0000 |
| commit | e9183898ce40d4d5967b1433a915651bcdfbcbd7 (patch) | |
| tree | 53b5b6bb97288182f448ff42942216e13a134398 | |
| parent | 6c22cc836ca3669a1394802c0254581decb7f1fb (diff) | |
| parent | ea45942d46b2efd2000723254785a137eaf25fdc (diff) | |
| download | frameworks_base-e9183898ce40d4d5967b1433a915651bcdfbcbd7.zip frameworks_base-e9183898ce40d4d5967b1433a915651bcdfbcbd7.tar.gz frameworks_base-e9183898ce40d4d5967b1433a915651bcdfbcbd7.tar.bz2 | |
am d7f5d55e: am 26446217: Merge "Add BLUETOOTH_MAP permission to give Bluetooth app exclusive access to email access" into lmp-dev
* commit 'd7f5d55ef656a21304d9d1708a8be7de3eaafe9a':
Add BLUETOOTH_MAP permission to give Bluetooth app exclusive access to email access
| -rw-r--r-- | core/res/AndroidManifest.xml | 9 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 7 |
2 files changed, 16 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index e3504fa..d57a8b8 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -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. --> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 21f4843..4761f1a 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -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 |