diff options
| author | John Wang <johnwang@google.com> | 2010-11-10 19:28:31 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-10 19:28:31 -0800 |
| commit | 1ed7d65b5d781d10de91a199fbd94d6d445d1def (patch) | |
| tree | 03b3c0c62934ac57df214c10aa2463f3643d8b5f | |
| parent | 63f40387d931b5cd555b4743a4d8ff4f1ccf9558 (diff) | |
| parent | fac4a689f86b0d46a2c76cec0a6ce2f4bac2a22a (diff) | |
| download | frameworks_base-1ed7d65b5d781d10de91a199fbd94d6d445d1def.zip frameworks_base-1ed7d65b5d781d10de91a199fbd94d6d445d1def.tar.gz frameworks_base-1ed7d65b5d781d10de91a199fbd94d6d445d1def.tar.bz2 | |
am fac4a689: Merge "Fix the audio mode glitch during hangup." into gingerbread
* commit 'fac4a689f86b0d46a2c76cec0a6ce2f4bac2a22a':
Fix the audio mode glitch during hangup.
| -rw-r--r-- | telephony/java/com/android/internal/telephony/CallManager.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/telephony/java/com/android/internal/telephony/CallManager.java b/telephony/java/com/android/internal/telephony/CallManager.java index 5f9a3e7..d74a547 100644 --- a/telephony/java/com/android/internal/telephony/CallManager.java +++ b/telephony/java/com/android/internal/telephony/CallManager.java @@ -380,7 +380,11 @@ public final class CallManager { break; case OFFHOOK: Phone fgPhone = getFgPhone(); - if (hasActiveFgCall() && !(fgPhone instanceof SipPhone)) { + // Enable IN_CALL mode while foreground call is in DIALING, + // ALERTING, ACTIVE and DISCONNECTING state and not from sipPhone + if (getActiveFgCallState() != Call.State.IDLE + && getActiveFgCallState() != Call.State.DISCONNECTED + && !(fgPhone instanceof SipPhone)) { mode = AudioManager.MODE_IN_CALL; } break; |