Resolve fallback audio routing for SCO disconnect
When SCO audio disconnects and there aren't any pending audio route
changes in the new audio path, ensure that audio is routed out of the
SCO audio path to an available route. On cf instances, the audio routing
was stuck on BT because normally the route is changed once BT stack
notifies Telecom that the connection state for the HFP device has
changed but this was not occurring on cf. Instead, ensure that when BT
stack notifies that SCO audio is disconnected that the audio routing is
updated in the UI to reflect the new audio state. This resolves a PTS
test failure found in cf instances.
Bug: 357023397
Test: atest TelecomUnitTests
Test: Manual test to ensure that audio routing is updated on SCO audio
disconnect.
Flag:
com.android.server.telecom.flags.use_refactored_audio_route_switching
Change-Id: I96c34e31f14921f22dd557dd11a3a09bdc2039a7
diff --git a/src/com/android/server/telecom/CallAudioRouteController.java b/src/com/android/server/telecom/CallAudioRouteController.java
index 9c593f4..9446746 100644
--- a/src/com/android/server/telecom/CallAudioRouteController.java
+++ b/src/com/android/server/telecom/CallAudioRouteController.java
@@ -533,14 +533,6 @@
mIsScoAudioConnected);
mIsActive = active;
mPendingAudioRoute.evaluatePendingState();
- postTimeoutMessage();
- }
-
- private void postTimeoutMessage() {
- // reset timeout handler
- mHandler.removeMessages(PENDING_ROUTE_TIMEOUT);
- mHandler.postDelayed(() -> mHandler.sendMessage(
- Message.obtain(mHandler, PENDING_ROUTE_TIMEOUT)), TIMEOUT_LIMIT);
}
private void handleWiredHeadsetConnected() {
@@ -657,9 +649,6 @@
mPendingAudioRoute.onMessageReceived(new Pair<>(BT_AUDIO_CONNECTED,
bluetoothDevice.getAddress()), null);
}
- } else {
- // ignore, not triggered by telecom
- Log.i(this, "handleBtAudioActive: ignoring handling bt audio active.");
}
}
@@ -679,9 +668,6 @@
mPendingAudioRoute.onMessageReceived(new Pair<>(BT_AUDIO_DISCONNECTED,
bluetoothDevice.getAddress()), null);
}
- } else {
- // ignore, not triggered by telecom
- Log.i(this, "handleBtAudioInactive: ignoring handling bt audio inactive.");
}
}
@@ -1227,7 +1213,8 @@
public AudioRoute getBaseRoute(boolean includeBluetooth, String btAddressToExclude) {
AudioRoute destRoute = getPreferredAudioRouteFromStrategy();
- if (destRoute == null || (destRoute.getBluetoothAddress() != null && !includeBluetooth)) {
+ if (destRoute == null || (destRoute.getBluetoothAddress() != null && (!includeBluetooth
+ || destRoute.getBluetoothAddress().equals(btAddressToExclude)))) {
destRoute = getPreferredAudioRouteFromDefault(includeBluetooth, btAddressToExclude);
}
if (destRoute != null && !getCallSupportedRoutes().contains(destRoute)) {
diff --git a/src/com/android/server/telecom/bluetooth/BluetoothStateReceiver.java b/src/com/android/server/telecom/bluetooth/BluetoothStateReceiver.java
index b4c3d8d..cd52889 100644
--- a/src/com/android/server/telecom/bluetooth/BluetoothStateReceiver.java
+++ b/src/com/android/server/telecom/bluetooth/BluetoothStateReceiver.java
@@ -23,6 +23,8 @@
import static com.android.server.telecom.CallAudioRouteAdapter.BT_DEVICE_ADDED;
import static com.android.server.telecom.CallAudioRouteAdapter.BT_DEVICE_REMOVED;
import static com.android.server.telecom.CallAudioRouteAdapter.PENDING_ROUTE_FAILED;
+import static com.android.server.telecom.CallAudioRouteAdapter.SWITCH_BASELINE_ROUTE;
+import static com.android.server.telecom.CallAudioRouteController.INCLUDE_BLUETOOTH_IN_BASELINE;
import static com.android.server.telecom.bluetooth.BluetoothRouteManager.BT_AUDIO_IS_ON;
import static com.android.server.telecom.bluetooth.BluetoothRouteManager.BT_AUDIO_LOST;
@@ -153,8 +155,19 @@
CallAudioRouteController audioRouteController =
(CallAudioRouteController) mCallAudioRouteAdapter;
audioRouteController.setIsScoAudioConnected(false);
- mCallAudioRouteAdapter.sendMessageWithSessionInfo(BT_AUDIO_DISCONNECTED, 0,
- device);
+ if (audioRouteController.isPending()) {
+ mCallAudioRouteAdapter.sendMessageWithSessionInfo(BT_AUDIO_DISCONNECTED, 0,
+ device);
+ } else {
+ // Handle case where BT stack signals SCO disconnected but Telecom isn't
+ // processing any pending routes. This explicitly addresses cf instances
+ // where a remote device disconnects SCO. Telecom should ensure that audio
+ // is properly routed in the UI.
+ audioRouteController.getPendingAudioRoute()
+ .setCommunicationDeviceType(AudioRoute.TYPE_INVALID);
+ mCallAudioRouteAdapter.sendMessageWithSessionInfo(SWITCH_BASELINE_ROUTE,
+ INCLUDE_BLUETOOTH_IN_BASELINE, device.getAddress());
+ }
} else {
mBluetoothRouteManager.sendMessage(BT_AUDIO_LOST, args);
}