Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b6ce3e0 authored by Rahul Sabnis's avatar Rahul Sabnis Committed by Android (Google) Code Review
Browse files

Merge "Skips the bluetooth consent pairing dialog if the device has recently... 

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
parents 5a2a19de faa36472

src/com/android/settings/bluetooth/BluetoothPairingRequest.java

+10 −4
Original line number Diff line number Diff line
@@ -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)