commit a6689ddbba5d7d5e9ad7a07ae84a187497f18121
author John Wang <johnwang@google.com> Wed Nov 10 19:32:42 2010 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 10 19:32:42 2010 -0800
tree e1b3538476059f81d707f11697a1fcb0adf9591d
parent 6ae689201f23643bcffc8ca95872a905ff2f8d32
parent 1ed7d65b5d781d10de91a199fbd94d6d445d1def

am 1ed7d65b: am fac4a689: Merge "Fix the audio mode glitch during hangup." into gingerbread

* commit '1ed7d65b5d781d10de91a199fbd94d6d445d1def':
  Fix the audio mode glitch during hangup.

telephony/java/com/android/internal/telephony/CallManager.java

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 @@
                 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;