commit 5fbe88c436df86390dcdcaf82b3a0ccf385c11a5
author Hall Liu <hallliu@google.com> Mon Jun 26 17:48:49 2017 -0700
committer Hall Liu <hallliu@google.com> Thu Aug 10 14:21:56 2017 -0700
tree d8e669e82b5a3398777d5cab3044102254b89442
parent 27437d92a6178d1419f0a9c46a46cbee36dff0ef

Remove an old AudioManager hack

Remove the round-trip back to normal mode when switching from in-call to
ringtone mode. It is apparently no longer necessary and is causing
problems with Bluetooth.

Change-Id: Iabe2e03c791b47cf64530678e6be4a1cec8007bc
Fixes: 62476271
Test: manual

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

diff --git a/src/com/android/server/telecom/CallAudioModeStateMachine.java b/src/com/android/server/telecom/CallAudioModeStateMachine.java
index d8d1b89..b5c7e7a 100644
--- a/src/com/android/server/telecom/CallAudioModeStateMachine.java
+++ b/src/com/android/server/telecom/CallAudioModeStateMachine.java
@@ -208,12 +208,6 @@
             if (mCallAudioManager.startRinging()) {
                 mAudioManager.requestAudioFocusForCall(AudioManager.STREAM_RING,
                         AudioManager.AUDIOFOCUS_GAIN_TRANSIENT);
-                if (mMostRecentMode == AudioManager.MODE_IN_CALL) {
-                    // Preserving behavior from the old CallAudioManager.
-                    Log.i(LOG_TAG, "Transition from IN_CALL -> RINGTONE."
-                            + "  Resetting to NORMAL first.");
-                    mAudioManager.setMode(AudioManager.MODE_NORMAL);
-                }
                 mAudioManager.setMode(AudioManager.MODE_RINGTONE);
                 mCallAudioManager.setCallAudioRouteFocusState(CallAudioRouteStateMachine.RINGING_FOCUS);
             } else {