From a10b74a7e283a18b84b98a4806ad36d60985fb63 Mon Sep 17 00:00:00 2001
From: Fahad Afroze <fafroze@google.com>
Date: Thu, 15 Dec 2022 12:57:10 +0000
Subject: [PATCH] [PTS-Bot]: Removed rebootBluetooth call from factoryReset
function in Host
Updated Host.kt file
bluetoothAdapter.clearBluetooth() performs bluetooth config clear and reset bluetooth. Hence no need to call rebootBluetooth().
Increased factoryReset timeout from 10 to 30.
Test: atest pts-bot:AVCTP -v
Change-Id: Id3dd6addd6f2e725d00401dd82406d7693149555
---
android/pandora/server/src/com/android/pandora/Host.kt | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/android/pandora/server/src/com/android/pandora/Host.kt b/android/pandora/server/src/com/android/pandora/Host.kt
index beddc70ad28..324f2b96ba1 100644
--- a/android/pandora/server/src/com/android/pandora/Host.kt
+++ b/android/pandora/server/src/com/android/pandora/Host.kt
@@ -127,13 +127,17 @@ class Host(
}
override fun factoryReset(request: Empty, responseObserver: StreamObserver<Empty>) {
- grpcUnary<Empty>(scope, responseObserver, 10) {
+ grpcUnary<Empty>(scope, responseObserver, 30) {
Log.i(TAG, "factoryReset")
- bluetoothAdapter.clearBluetooth()
+ val stateFlow =
+ flow
+ .filter { it.getAction() == BluetoothAdapter.ACTION_STATE_CHANGED }
+ .map { it.getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.ERROR) }
- rebootBluetooth()
+ bluetoothAdapter.clearBluetooth()
+ stateFlow.filter { it == BluetoothAdapter.STATE_ON }.first()
Log.i(TAG, "Shutdown the gRPC Server")
server.shutdown()
--
GitLab