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

Commit 00611b22 authored by Rahul Arya's avatar Rahul Arya
Browse files

[Pandora] Pair on transport corresponding to Connection 

Rather than always trying BR/EDR first (TRANSPORT_AUTO), we will respect
the Transport upon which the Connection was established.

Bug: 248814583
Test: GAP pts-bot

Change-Id: If0643b68be6f5b10b142d7a773dc7c8b60f362d2
parent 693cdf2c

android/pandora/server/src/com/android/pandora/Security.kt

+73 −54
Original line number Diff line number Diff line
@@ -18,9 +18,15 @@ package com.android.pandora 


import android.bluetooth.BluetoothAdapter

import android.bluetooth.BluetoothDevice

import android.bluetooth.BluetoothDevice.ACTION_PAIRING_REQUEST

import android.bluetooth.BluetoothDevice.BOND_BONDED

import android.bluetooth.BluetoothDevice.DEVICE_TYPE_CLASSIC

import android.bluetooth.BluetoothDevice.DEVICE_TYPE_DUAL

import android.bluetooth.BluetoothDevice.DEVICE_TYPE_LE

import android.bluetooth.BluetoothDevice.EXTRA_PAIRING_VARIANT

import android.bluetooth.BluetoothDevice.TRANSPORT_AUTO

import android.bluetooth.BluetoothDevice.TRANSPORT_BREDR

import android.bluetooth.BluetoothDevice.TRANSPORT_LE

import android.bluetooth.BluetoothManager

import android.content.Context

import android.content.Intent
@@ -31,6 +37,7 @@ import com.google.protobuf.Empty 
import io.grpc.stub.StreamObserver

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.Dispatchers

import kotlinx.coroutines.async

import kotlinx.coroutines.cancel

import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.SharingStarted
@@ -57,6 +64,7 @@ class Security(private val context: Context) : SecurityImplBase() { 
  init {

    val intentFilter = IntentFilter()

    intentFilter.addAction(BluetoothDevice.ACTION_PAIRING_REQUEST)

    intentFilter.addAction(BluetoothDevice.ACTION_BOND_STATE_CHANGED)



    flow = intentFlow(context, intentFilter).shareIn(globalScope, SharingStarted.Eagerly)

  }
@@ -68,8 +76,17 @@ class Security(private val context: Context) : SecurityImplBase() { 
  override fun pair(request: PairRequest, responseObserver: StreamObserver<Empty>) {

    grpcUnary(globalScope, responseObserver) {

      val bluetoothDevice = request.connection.toBluetoothDevice(bluetoothAdapter)

      Log.i(TAG, "pair: ${bluetoothDevice.address}")

      bluetoothDevice.createBond()

      Log.i(

        TAG,

        "pair: ${bluetoothDevice.address} (current bond state: ${bluetoothDevice.bondState})"

      )

      bluetoothDevice.createBond(

        when (request.connection.transport!!) {

          Transport.TRANSPORT_LE -> TRANSPORT_LE

          Transport.TRANSPORT_BREDR -> TRANSPORT_BREDR

          Transport.UNRECOGNIZED -> TRANSPORT_AUTO

        }

      )

      Empty.getDefaultInstance()

    }

  }
@@ -78,26 +95,28 @@ class Security(private val context: Context) : SecurityImplBase() { 
    request: DeletePairingRequest,

    responseObserver: StreamObserver<DeletePairingResponse>

  ) {

    grpcUnary<DeletePairingResponse>(globalScope, responseObserver) {

    grpcUnary(globalScope, responseObserver) {

      val bluetoothDevice = request.address.toBluetoothDevice(bluetoothAdapter)

      Log.i(TAG, "DeletePairing: device=$bluetoothDevice")



      if (bluetoothDevice.removeBond()) {

        Log.i(TAG, "DeletePairing: device=$bluetoothDevice - wait BOND_NONE intent")

      val unbonded =

        globalScope.async {

          flow

          .filter { it.getAction() == BluetoothDevice.ACTION_BOND_STATE_CHANGED }

            .filter { it.action == BluetoothDevice.ACTION_BOND_STATE_CHANGED }

            .filter { it.getBluetoothDeviceExtra() == bluetoothDevice }

            .filter {

              it.getIntExtra(BluetoothDevice.EXTRA_BOND_STATE, BluetoothAdapter.ERROR) ==

                BluetoothDevice.BOND_NONE

            }

          .filter {

            it.getIntExtra(BluetoothDevice.EXTRA_REASON, BluetoothAdapter.ERROR) ==

              BluetoothDevice.BOND_SUCCESS

          }

            .first()

        }



      if (bluetoothDevice.removeBond()) {

        Log.i(TAG, "DeletePairing: device=$bluetoothDevice - wait BOND_NONE intent")

        unbonded.await()

      } else {

        Log.i(TAG, "DeletePairing: device=$bluetoothDevice - Already unpaired")

        unbonded.cancel()

      }

      DeletePairingResponse.getDefaultInstance()

    }
@@ -156,14 +175,14 @@ class Security(private val context: Context) : SecurityImplBase() { 
            BluetoothDevice.PAIRING_VARIANT_PIN ->

              when (device.type) {

                DEVICE_TYPE_CLASSIC -> eventBuilder.pinCodeRequest = Empty.getDefaultInstance()

              DEVICE_TYPE_LE ->

                eventBuilder.passkeyEntryRequest = Empty.getDefaultInstance()

                DEVICE_TYPE_LE -> eventBuilder.passkeyEntryRequest = Empty.getDefaultInstance()

                else -> error("cannot determine pairing variant, since transport is unknown")

              }

            BluetoothDevice.PAIRING_VARIANT_PIN_16_DIGITS ->

              eventBuilder.pinCodeRequest = Empty.getDefaultInstance()



          // Legacy PIN entry or LE legacy passkey entry, except we just generate the PIN in the

            // Legacy PIN entry or LE legacy passkey entry, except we just generate the PIN in

            // the

            // stack and display it to the user for convenience

            BluetoothDevice.PAIRING_VARIANT_DISPLAY_PIN -> {

              val passkey =