am 1a58d9c3: Merge "Partial fix for issue 3124895." into gingerbread

2010-10-26 08:14:48 -07:00
parent 6a49bff569 1a58d9c398
commit ecae8a43b7
1 changed files with 1 additions and 1 deletions
--- a/telephony/java/com/android/internal/telephony/CallManager.java
+++ b/telephony/java/com/android/internal/telephony/CallManager.java
@ -380,7 +380,7 @@ public final class CallManager {
                break;
            case OFFHOOK:
                Phone fgPhone = getFgPhone();
-                if (!(fgPhone instanceof SipPhone)) {
+                if (hasActiveFgCall() && !(fgPhone instanceof SipPhone)) {
                    mode = AudioManager.MODE_IN_CALL;
                }
                break;