summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Wang <weiwa@google.com>2014-02-28 14:45:31 -0800
committerWei Wang <weiwa@google.com>2014-03-08 02:01:27 +0000
commit3f77ee6ab5af60c92a5672e612ecf3ac51b98600 (patch)
tree34d0c476c5b9b75fdda6f16501e00f81394f3496
parentb9703de9f4892341e2a1f5ea1908aed19018569f (diff)
downloadandroid_packages_apps_Bluetooth-3f77ee6ab5af60c92a5672e612ecf3ac51b98600.tar.gz
android_packages_apps_Bluetooth-3f77ee6ab5af60c92a5672e612ecf3ac51b98600.tar.bz2
android_packages_apps_Bluetooth-3f77ee6ab5af60c92a5672e612ecf3ac51b98600.zip
DO NOT MERGE Add Bluetooth privileged permission to bluetooth app. fix b/13226130.
Cherry picking ble advertising changes from master to KLP MR2. b/13137996 Change-Id: Iba48f4757a6b54911277900b875d83eaa81488b7
-rw-r--r--AndroidManifest.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 55c40a773..205b8dc98 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -28,6 +28,7 @@
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+ <uses-permission android:name="android.permission.BLUETOOTH_PRIVILEGED" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_CONTACTS" />