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

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

Browse Source 
* commit 'cc019c0caa0dd984404dea4d6623ae9d7b8474f1':
  Get mute state from active call.
This commit is contained in:
Hung-ying Tyan
2011-01-24 21:46:23 -08:00
committed by Android Git Automerger
parent 8a424af1d9 cc019c0caa
commit df1cc4ef92
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() {