summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@google.com>2014-10-13 18:45:53 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-13 18:45:53 +0000
commit0a233fb7572af818d1de51e5788724e0342e4af0 (patch)
tree63766e41e460fc575ca7a4f79a29581e7026e6ec /core/res
parentfab45b1314725c2839591d4295210ee61eaf5763 (diff)
parent317f9ce85a492a213b8f1dac477b1aefad55f621 (diff)
downloadframeworks_base-0a233fb7572af818d1de51e5788724e0342e4af0.zip
frameworks_base-0a233fb7572af818d1de51e5788724e0342e4af0.tar.gz
frameworks_base-0a233fb7572af818d1de51e5788724e0342e4af0.tar.bz2
am 317f9ce8: Merge "Change RECEIVE_BLUETOOTH_MAP permission to signature or system" into lmp-dev
* commit '317f9ce85a492a213b8f1dac477b1aefad55f621': Change RECEIVE_BLUETOOTH_MAP permission to signature or system
Diffstat (limited to 'core/res')
-rw-r--r--core/res/AndroidManifest.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 937f83a..d7720a2 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -405,7 +405,7 @@
<!-- @hide -->
<permission android:name="android.permission.RECEIVE_BLUETOOTH_MAP"
android:permissionGroup="android.permission-group.MESSAGES"
- android:protectionLevel="dangerous"
+ android:protectionLevel="signature|system"
android:label="@string/permlab_receiveBluetoothMap"
android:description="@string/permdesc_receiveBluetoothMap" />