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

Merge "Get mute state from active call." into gingerbread

Browse Source
This commit is contained in:
Hung-ying Tyan
2011-01-24 21:13:08 -08:00
committed by Android (Google) Code Review
parent 14b6d0620b 65a7f147de
commit cc019c0caa
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -890,6 +890,8 @@ public final class CallManager {
public boolean getMute() { public boolean getMute() {
if (hasActiveFgCall()) { if (hasActiveFgCall()) {
return getActiveFgCall().getPhone().getMute(); return getActiveFgCall().getPhone().getMute();
} else if (hasActiveBgCall()) {
return getFirstActiveBgCall().getPhone().getMute();
} }
return false; return false;
} }

4
telephony/java/com/android/internal/telephony/sip/SipPhone.java
View File

@@ -306,7 +306,9 @@ public class SipPhone extends SipPhoneBase {
} }
public boolean getMute() { public boolean getMute() {
return foregroundCall.getMute(); return (foregroundCall.getState().isAlive()
? foregroundCall.getMute()
: backgroundCall.getMute());
} }
public Call getForegroundCall() { public Call getForegroundCall() {