| commit | dad4baf879caa023329107c1eaffe5e770bbb6f6 | [log] [tgz] |
|---|---|---|
| author | Robert Luo <robertluo@google.com> | Tue Jun 09 13:42:04 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 09 13:42:04 2020 +0000 |
| tree | 2cd37706f1bc830b1586734365bcba916aa72678 | |
| parent | f38093956a17d197bfb4e840a14332cac4683d32 [diff] | |
| parent | 2cdf49c4d5de1800e215f4b408975694c726fc20 [diff] |
Merge "Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity" into rvc-dev am: 21ac98e2f1 am: 2cdf49c4d5 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11489511 Change-Id: Ie93d5805043f70fb28855bed88369554414b3d7e
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" />