PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Skips the bluetooth consent pairing dialog if the device has recently been associated with the companion app that requested the bond through CDM" into sc-dev am: 9b6ce3e0db

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13534591

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id363825d60941640c5f9622881c93e7f963034af
This commit is contained in:
Rahul Sabnis
2021-02-16 23:57:03 +00:00
committed by Automerger Merge Worker
parent 27d9cebc5e 9b6ce3e0db
commit 23399efec6
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/bluetooth/BluetoothPairingRequest.java
View File

@@ -37,15 +37,21 @@ public final class BluetoothPairingRequest extends BroadcastReceiver {
if (action == null || !action.equals(BluetoothDevice.ACTION_PAIRING_REQUEST)) {
return;
}
PowerManager powerManager =
(PowerManager)context.getSystemService(Context.POWER_SERVICE);
PowerManager powerManager = context.getSystemService(PowerManager.class);
BluetoothDevice device =
intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
int pairingVariant = intent.getIntExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT,
BluetoothDevice.ERROR);
String deviceAddress = device != null ? device.getAddress() : null;
String deviceName = device != null ? device.getName() : null;
boolean shouldShowDialog = LocalBluetoothPreferences.shouldShowDialogInForeground(
context, deviceAddress, deviceName);
if (powerManager.isInteractive() && shouldShowDialog) {
// Skips consent pairing dialog if the device was recently associated with CDM
if (pairingVariant == BluetoothDevice.PAIRING_VARIANT_CONSENT
&& device.canBondWithoutDialog()) {
device.setPairingConfirmation(true);
} else if (powerManager.isInteractive() && shouldShowDialog) {
// Since the screen is on and the BT-related activity is in the foreground,
// just open the dialog
// convert broadcast intent into activity intent (same action string)