diff options
author | John Wang <johnwang@google.com> | 2010-11-10 19:11:20 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-10 19:11:20 -0800 |
commit | fac4a689f86b0d46a2c76cec0a6ce2f4bac2a22a (patch) | |
tree | b17eca5f0996b383195a4140538e8abc366e6d85 | |
parent | 34594e75e4a7962840f34c0b57116ecf1497f118 (diff) | |
parent | d19f44f3e384114a16df2facb3aeec392cd39a60 (diff) | |
download | base-fac4a689f86b0d46a2c76cec0a6ce2f4bac2a22a.tar.gz |
Merge "Fix the audio mode glitch during hangup." into gingerbread
-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 5f9a3e7dac2b..d74a5472fd6f 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; |