diff options
| author | Eric Laurent <elaurent@google.com> | 2010-10-26 08:13:32 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-26 08:13:32 -0700 |
| commit | 1a58d9c398b7c584fed50f922a638f76bf0c94a0 (patch) | |
| tree | b82df60560e88bb18252bd046ecd37b071523ac9 | |
| parent | 79fb6449a10d37837702c695a53eeec7d428c240 (diff) | |
| parent | 164a8f86c7e48992691368c4895709c3bdb835a4 (diff) | |
| download | frameworks_base-1a58d9c398b7c584fed50f922a638f76bf0c94a0.zip frameworks_base-1a58d9c398b7c584fed50f922a638f76bf0c94a0.tar.gz frameworks_base-1a58d9c398b7c584fed50f922a638f76bf0c94a0.tar.bz2 | |
Merge "Partial fix for issue 3124895." into gingerbread
| -rw-r--r-- | telephony/java/com/android/internal/telephony/CallManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/com/android/internal/telephony/CallManager.java b/telephony/java/com/android/internal/telephony/CallManager.java index ab7b601..5f9a3e7 100644 --- 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; |