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

am df1cc4ef: am cc019c0c: Merge "Get mute state from active call." into gingerbread

Browse Source 
* commit 'df1cc4ef9205239701bbe73f903e89a9dfd2623a':
  Get mute state from active call.
This commit is contained in:
Hung-ying Tyan
2011-01-25 10:58:42 -08:00
committed by Android Git Automerger
parent 2b6d07a51a df1cc4ef92
commit b30392d288
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

@@ -895,6 +895,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

@@ -309,7 +309,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() {