| commit | 9e1fdc3ef29ad711bd18a1a87dcadf8f0ff6c0ba | [log] [tgz] |
|---|---|---|
| author | Robert Luo <robertluo@google.com> | Tue Jun 09 13:55:24 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 09 13:55:24 2020 +0000 |
| tree | 5eeff283efff5c0a1068bac28832cd240febc703 | |
| parent | 04a1ebd4d57ed0e98cc3cc811a3fe71d5e26d834 [diff] | |
| parent | dad4baf879caa023329107c1eaffe5e770bbb6f6 [diff] |
Merge "Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity" into rvc-dev am: 21ac98e2f1 am: 2cdf49c4d5 am: dad4baf879 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11489511 Change-Id: I2fdb58e481e95546a8933e52dc82687c27a6c5f7
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6e0771c..4f3caed 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml
@@ -3181,7 +3181,7 @@ <activity android:name="Settings$BluetoothDeviceDetailActivity" android:label="@string/device_details_title" - android:permission="android.permission.BLUETOOTH_PRIVILEGED"> + android:permission="android.permission.BLUETOOTH_ADMIN"> <intent-filter android:priority="1"> <action android:name="com.android.settings.BLUETOOTH_DEVICE_DETAIL_SETTINGS" /> <category android:name="android.intent.category.DEFAULT" />