From fcb631555b7ed326bf89584cd8c5bdbd6262b2bd Mon Sep 17 00:00:00 2001 From: Tyler Gunn Date: Wed, 29 Nov 2023 19:16:45 +0000 Subject: Revert "Fallback to QuiescentBluetoothRoute when abandon focus from" This reverts commit f20a256bdce0550491fb3a40f55a7fd3bfed1d98. Reason for revert: Caused regression in mute (b/311313250) clearing at end of call. Bug: 311313250 Bug: 282069439 Change-Id: I6b563eeb44b34751116cb48baa80a9384c33011b --- .../android/server/telecom/CallAudioRouteStateMachine.java | 2 +- .../telecom/tests/CallAudioRouteStateMachineTest.java | 14 +++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/com/android/server/telecom/CallAudioRouteStateMachine.java b/src/com/android/server/telecom/CallAudioRouteStateMachine.java index bfb76d8b5..27971b20d 100644 --- a/src/com/android/server/telecom/CallAudioRouteStateMachine.java +++ b/src/com/android/server/telecom/CallAudioRouteStateMachine.java @@ -947,7 +947,7 @@ public class CallAudioRouteStateMachine extends StateMachine implements CallAudi mBluetoothRouteManager.disconnectAudio(); } else { mBluetoothRouteManager.disconnectAudio(); - transitionTo(mQuiescentBluetoothRoute); + reinitialize(); } mCallAudioManager.notifyAudioOperationsComplete(); } else if (msg.arg1 == RINGING_FOCUS diff --git a/tests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java b/tests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java index 45aeffa69..1fa14a559 100644 --- a/tests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java +++ b/tests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java @@ -883,16 +883,6 @@ public class CallAudioRouteStateMachineTest extends TelecomTestCase { verify(mockBluetoothRouteManager, atLeastOnce()) .connectBluetoothAudio(eq(bluetoothDevice1.getAddress())); assertTrue(stateMachine.isInActiveState()); - - // Switch to inactive, pretending that the call disconnected. - stateMachine.sendMessageWithSessionInfo(CallAudioRouteStateMachine.SWITCH_FOCUS, - CallAudioRouteStateMachine.NO_FOCUS); - waitForHandlerAction(stateMachine.getAdapterHandler(), TEST_TIMEOUT); - - // Make sure that we've successfully switched to the quiescent BT route - assertEquals(CallAudioState.ROUTE_BLUETOOTH, - stateMachine.getCurrentCallAudioState().getRoute()); - assertFalse(stateMachine.isInActiveState()); } @SmallTest @@ -1282,7 +1272,9 @@ public class CallAudioRouteStateMachineTest extends TelecomTestCase { expectedState = new CallAudioState(false, CallAudioState.ROUTE_BLUETOOTH, CallAudioState.ROUTE_SPEAKER | CallAudioState.ROUTE_EARPIECE | CallAudioState.ROUTE_BLUETOOTH); - assertEquals(expectedState, stateMachine.getCurrentCallAudioState()); + // TODO: Re-enable this part of the test; this is now failing because we have to + // revert ag/23783145. + // assertEquals(expectedState, stateMachine.getCurrentCallAudioState()); } @SmallTest -- cgit v1.2.3