diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2011-01-24 21:13:08 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-24 21:13:08 -0800 |
| commit | cc019c0caa0dd984404dea4d6623ae9d7b8474f1 (patch) | |
| tree | 3655ccc441a5be91ea47cca2714e78b804c0a8f5 /telephony/java | |
| parent | 14b6d0620b42d1bb3a55778ba452d838a0d89223 (diff) | |
| parent | 65a7f147deb02f728959eb05913a2d6ce53dea1c (diff) | |
| download | frameworks_base-cc019c0caa0dd984404dea4d6623ae9d7b8474f1.zip frameworks_base-cc019c0caa0dd984404dea4d6623ae9d7b8474f1.tar.gz frameworks_base-cc019c0caa0dd984404dea4d6623ae9d7b8474f1.tar.bz2 | |
Merge "Get mute state from active call." into gingerbread
Diffstat (limited to 'telephony/java')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/CallManager.java | 2 | ||||
| -rwxr-xr-x | telephony/java/com/android/internal/telephony/sip/SipPhone.java | 4 |
2 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 a8dd9c2..0335ca2 100644 --- a/telephony/java/com/android/internal/telephony/CallManager.java +++ b/telephony/java/com/android/internal/telephony/CallManager.java @@ -890,6 +890,8 @@ public final class CallManager { public boolean getMute() { if (hasActiveFgCall()) { return getActiveFgCall().getPhone().getMute(); + } else if (hasActiveBgCall()) { + return getFirstActiveBgCall().getPhone().getMute(); } return false; } diff --git a/telephony/java/com/android/internal/telephony/sip/SipPhone.java b/telephony/java/com/android/internal/telephony/sip/SipPhone.java index 72f3831..461e4fb 100755 --- a/telephony/java/com/android/internal/telephony/sip/SipPhone.java +++ b/telephony/java/com/android/internal/telephony/sip/SipPhone.java @@ -306,7 +306,9 @@ public class SipPhone extends SipPhoneBase { } public boolean getMute() { - return foregroundCall.getMute(); + return (foregroundCall.getState().isAlive() + ? foregroundCall.getMute() + : backgroundCall.getMute()); } public Call getForegroundCall() { |