summaryrefslogtreecommitdiff
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2021-03-22 15:33:01 -0600
committerJeff Sharkey <jsharkey@google.com>2021-03-23 12:35:36 +0000
commit9e07eab08f1d7049cf674c692b72216c5306a373 (patch)
treef72a63a60a3aaca34c86f18d78ec39ec5d0b7f49 /AndroidManifest.xml
parent3a52e335be12b14d7cb62846697a764168e37978 (diff)
downloadSettings-9e07eab08f1d7049cf674c692b72216c5306a373.tar.gz
Request new Bluetooth runtime permissions.
An upcoming platform change is introducing a new "Nearby devices" runtime permission which contains the new BLUETOOTH_CONNECT and BLUETOOTH_SCAN permissions. We have logic in place to use <split-permission> to translate the older BLUETOOTH and BLUETOOTH_ADMIN permissions into these new runtime permissions, but modern apps will need to pivot to requesting them directly as part of targeting Android S. This change requests both the old and new permissions to avoid breakage while the new permission enforcement is being phased in. Bug: 181813006 Test: atest CtsPermission2TestCases Test: atest CtsPermission3TestCases Test: atest CtsStatsdAtomHostTestCases Change-Id: I0a6ff040520deaa7c7a6fecd83e8608a9bf28c4a
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index eeb969464b5..6a4b8d56aa5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,6 +19,8 @@
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+ <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+ <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
<uses-permission android:name="android.permission.BLUETOOTH_PRIVILEGED" />
<uses-permission android:name="android.permission.NFC" />
<uses-permission android:name="android.permission.HARDWARE_TEST" />