| commit | 074f18fd8b0552aa9ca4fc0e2466e1b47c50f721 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Oct 06 20:54:24 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 06 20:54:24 2021 +0000 |
| tree | 5f9d91445357646f924410aa7fefe47047d6c13e | |
| parent | 0dc4560066dc028ef584ddbab11aa204b8be721e [diff] | |
| parent | 1a049e065e83bc024d0a3c5a0a94323d1cbd77cd [diff] |
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev am: 1a049e065e Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994986 Change-Id: I1b73519801db7ccb9689ecc46de604607619745b
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f7ca87c..80b525e 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml
@@ -2014,6 +2014,7 @@ </activity> <activity android:name=".bluetooth.BluetoothPairingDialog" + android:permission="android.permission.BLUETOOTH_PRIVILEGED" android:excludeFromRecents="true" android:windowSoftInputMode="stateVisible|adjustResize" android:theme="@style/Theme.AlertDialog"