diff options
| author | Eric Laurent <elaurent@google.com> | 2010-10-26 08:14:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-26 08:14:48 -0700 |
| commit | ecae8a43b71a59ef2a4dcd2b3e5ffa248c37d53e (patch) | |
| tree | 9d78796a81d12944a808f4889a6202174ca37714 /telephony | |
| parent | 6a49bff5694439b3f892cfcfd90b814884f8d44f (diff) | |
| parent | 1a58d9c398b7c584fed50f922a638f76bf0c94a0 (diff) | |
| download | frameworks_base-ecae8a43b71a59ef2a4dcd2b3e5ffa248c37d53e.zip frameworks_base-ecae8a43b71a59ef2a4dcd2b3e5ffa248c37d53e.tar.gz frameworks_base-ecae8a43b71a59ef2a4dcd2b3e5ffa248c37d53e.tar.bz2 | |
am 1a58d9c3: Merge "Partial fix for issue 3124895." into gingerbread
Diffstat (limited to 'telephony')
| -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; |