Merge "PandoraServer: remove scannning from `connectLe`" into main (b9c6ad99) · Commits · e / os / android_packages_modules_Bluetooth

android/pandora/server/src/Host.kt

+1 −34

Original line number	Original line	Diff line number	Diff line
	@@ -437,7 +437,7 @@ class Host(
	throw IllegalArgumentException("Request address field must be set")		throw IllegalArgumentException("Request address field must be set")
	}		}
	Log.i(TAG, "connectLE: $address")		Log.i(TAG, "connectLE: $address")
	val bluetoothDevice = scanLeDevice(address.decodeAsMacAddressToString(), type)!!		val bluetoothDevice = bluetoothAdapter.getRemoteLeDevice(address.decodeAsMacAddressToString(), type)
	initiatedConnection.add(bluetoothDevice)		initiatedConnection.add(bluetoothDevice)
	GattInstance(bluetoothDevice, TRANSPORT_LE, context)		GattInstance(bluetoothDevice, TRANSPORT_LE, context)
	.waitForState(BluetoothProfile.STATE_CONNECTED)		.waitForState(BluetoothProfile.STATE_CONNECTED)
	@@ -447,39 +447,6 @@ class Host(
	}		}
	}		}

	private fun scanLeDevice(address: String, addressType: Int): BluetoothDevice? {
	Log.d(TAG, "scanLeDevice")
	var bluetoothDevice: BluetoothDevice? = null
	runBlocking {
	val flow = callbackFlow {
	val leScanCallback =
	object : ScanCallback() {
	override fun onScanFailed(errorCode: Int) {
	super.onScanFailed(errorCode)
	Log.d(TAG, "onScanFailed: errorCode: $errorCode")
	trySendBlocking(null)
	}
	override fun onScanResult(callbackType: Int, result: ScanResult) {
	super.onScanResult(callbackType, result)
	val deviceAddress = result.device.address
	val deviceAddressType = result.device.addressType
	if (deviceAddress == address && deviceAddressType == addressType) {
	Log.d(TAG, "found device address: $deviceAddress")
	trySendBlocking(result.device)
	}
	}
	}
	val bluetoothLeScanner = bluetoothAdapter.bluetoothLeScanner
	val leScanFilters: List<ScanFilter> = listOf()
	val leScanSettings = ScanSettings.Builder().setLegacy(false).build()
	bluetoothLeScanner?.startScan(leScanFilters, leScanSettings, leScanCallback) ?: run { trySendBlocking(null) }
	awaitClose { bluetoothLeScanner?.stopScan(leScanCallback) }
	}
	bluetoothDevice = flow.first()
	}
	return bluetoothDevice
	}

	override fun advertise(		override fun advertise(
	request: AdvertiseRequest,		request: AdvertiseRequest,
	responseObserver: StreamObserver<AdvertiseResponse>		responseObserver: StreamObserver<AdvertiseResponse>