diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2010-11-17 14:55:10 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-17 14:55:10 -0800 |
| commit | 6c97eba1b73dd6ddcb976b3ea9147b35a13b5afd (patch) | |
| tree | aceacc49437dd0c9117585de7688f59c6f6facbb /telephony | |
| parent | 751073ac2d3d8971b7fd3d48b1c0a7ef34ad740c (diff) | |
| parent | 42c5a5ed4f91705e39945d3c88c87a55b50f8302 (diff) | |
| download | frameworks_base-6c97eba1b73dd6ddcb976b3ea9147b35a13b5afd.zip frameworks_base-6c97eba1b73dd6ddcb976b3ea9147b35a13b5afd.tar.gz frameworks_base-6c97eba1b73dd6ddcb976b3ea9147b35a13b5afd.tar.bz2 | |
Merge "SIP calls should set the audio mode to MODE_IN_COMMUNICATION"
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/CallManager.java | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/telephony/java/com/android/internal/telephony/CallManager.java b/telephony/java/com/android/internal/telephony/CallManager.java index d74a547..5b49305 100644 --- a/telephony/java/com/android/internal/telephony/CallManager.java +++ b/telephony/java/com/android/internal/telephony/CallManager.java @@ -380,12 +380,17 @@ public final class CallManager { break; case OFFHOOK: Phone fgPhone = getFgPhone(); - // Enable IN_CALL mode while foreground call is in DIALING, - // ALERTING, ACTIVE and DISCONNECTING state and not from sipPhone + // While foreground call is in DIALING, + // ALERTING, ACTIVE and DISCONNECTING state if (getActiveFgCallState() != Call.State.IDLE - && getActiveFgCallState() != Call.State.DISCONNECTED - && !(fgPhone instanceof SipPhone)) { - mode = AudioManager.MODE_IN_CALL; + && getActiveFgCallState() != Call.State.DISCONNECTED) { + if (fgPhone instanceof SipPhone) { + // enable IN_COMMUNICATION audio mode for sipPhone + mode = AudioManager.MODE_IN_COMMUNICATION; + } else { + // enable IN_CALL audio mode for telephony + mode = AudioManager.MODE_IN_CALL; + } } break; } |