| commit | 61d84da99f12a3a5270cfe8a4838869a54a5ccde | [log] [tgz] |
|---|---|---|
| author | Hui Wang <huiwang@google.com> | Mon Apr 07 23:27:24 2025 +0000 |
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Thu Apr 10 16:14:20 2025 -0700 |
| tree | 38543b3b36f7bc0a74a02950e8033d4fd4e8bd68 | |
| parent | 550686bdc853eac152079bb45a604491c95cb8e6 [diff] |
Do not check whetehr sco is connected for the route deactivation Flag: EXEMPT bugfix Bug: 409122502 Bug: 406836000 Test: manual (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:41c3d51fd5a2b02a34a8c768979f3976c117ed1b) Merged-In: I59165cacf781b338d0e93f793c92a269c8067941 Change-Id: I59165cacf781b338d0e93f793c92a269c8067941
diff --git a/src/com/android/server/telecom/CallAudioRouteController.java b/src/com/android/server/telecom/CallAudioRouteController.java index c9e0ab3..aa0976f 100644 --- a/src/com/android/server/telecom/CallAudioRouteController.java +++ b/src/com/android/server/telecom/CallAudioRouteController.java
@@ -587,7 +587,8 @@ // It's possible that there are multiple HFP devices connected and if we receive SCO audio // connected for the destination route's BT device, then we shouldn't disconnect SCO when // clearing the communication device for the original route if it was also a HFP device. - boolean isScoDeviceAlreadyConnected = mScoAudioConnectedDevice != null + // This does not apply to the route deactivation scenario. + boolean isScoDeviceAlreadyConnected = mScoAudioConnectedDevice != null && isDestRouteActive && Objects.equals(mScoAudioConnectedDevice, mBluetoothRoutes.get(destRoute)); if (mIsPending) { if (destRoute.equals(mPendingAudioRoute.getDestRoute())