diff options
| author | Hall Liu <hallliu@google.com> | 2017-06-26 17:48:49 -0700 |
|---|---|---|
| committer | Hall Liu <hallliu@google.com> | 2017-06-27 00:52:31 +0000 |
| commit | 8c1374d3c80d9a4fbe9dd075a958cc2cb22b70c2 (patch) | |
| tree | f4cad40e68e42d01a30be9acc9353da609c56de2 | |
| parent | 845a677cc7ee462e7f8cb02b150c64edb3fcc528 (diff) | |
| download | android_packages_services_Telecomm-8c1374d3c80d9a4fbe9dd075a958cc2cb22b70c2.tar.gz android_packages_services_Telecomm-8c1374d3c80d9a4fbe9dd075a958cc2cb22b70c2.tar.bz2 android_packages_services_Telecomm-8c1374d3c80d9a4fbe9dd075a958cc2cb22b70c2.zip | |
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
| -rw-r--r-- | src/com/android/server/telecom/CallAudioModeStateMachine.java | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/com/android/server/telecom/CallAudioModeStateMachine.java b/src/com/android/server/telecom/CallAudioModeStateMachine.java index 3d778f2a..df912ed6 100644 --- a/src/com/android/server/telecom/CallAudioModeStateMachine.java +++ b/src/com/android/server/telecom/CallAudioModeStateMachine.java @@ -208,12 +208,6 @@ public class CallAudioModeStateMachine extends StateMachine { 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 { |