Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the audio mode glitch during hangup." into gingerbread

Browse Source
This commit is contained in:
John Wang
2010-11-10 19:11:20 -08:00
committed by Android (Google) Code Review
parent 34594e75e4 d19f44f3e3
commit fac4a689f8
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
telephony/java/com/android/internal/telephony/CallManager.java
View File

@@ -380,7 +380,11 @@ public final class CallManager {
break; break;
case OFFHOOK: case OFFHOOK:
Phone fgPhone = getFgPhone(); 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; mode = AudioManager.MODE_IN_CALL;
} }
break; break;