commit 532b02205e77ea6abf40b8d591640c0ed443cc03
author Hui Wang <huiwang@google.com> Tue Dec 03 20:31:39 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 03 20:31:39 2024 +0000
tree fc2d70be7e95dbf8745d74f1c0086b1e891156b4
parent 9586d387e2f629bf242a7f46754408565741e293
parent ace080f9230db07584c958b78b7fde741cdf7e2a

Merge "Clear the cache after the logs get pulled" into main

src/com/android/server/telecom/CallAudioRouteController.java

diff --git a/src/com/android/server/telecom/CallAudioRouteController.java b/src/com/android/server/telecom/CallAudioRouteController.java
index 727d300..04f1934 100644
--- a/src/com/android/server/telecom/CallAudioRouteController.java
+++ b/src/com/android/server/telecom/CallAudioRouteController.java
@@ -1050,7 +1050,8 @@
             mStatusBarNotifier.notifySpeakerphone(mCallsManager.hasAnyCalls());
         } else {
             if (mSpeakerDockRoute != null && getCallSupportedRoutes().contains(mSpeakerDockRoute)
-                    && mSpeakerDockRoute.getType() == AudioRoute.TYPE_SPEAKER) {
+                    && mSpeakerDockRoute.getType() == AudioRoute.TYPE_SPEAKER
+                    && mCurrentRoute.getType() != AudioRoute.TYPE_SPEAKER) {
                 routeTo(mIsActive, mSpeakerDockRoute);
                 // Since the route switching triggered by this message, we need to manually send it
                 // again so that we won't stuck in the pending route