commit dd249770348c7535a23125540261d5a7970a9a5f
author Hall Liu <hallliu@google.com> Thu Aug 10 22:34:49 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 10 22:34:49 2017 +0000
tree cba310782519d238af18fd8c2b1f37158ad7f14c
parent f16bec4c572f0fc93f7fbd79d46727a41239d06a
parent 5fbe88c436df86390dcdcaf82b3a0ccf385c11a5

Remove an old AudioManager hack
am: 5fbe88c436

Change-Id: I91542154698de12571f96440f8f1f90c94fc012d

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 {