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

Hung-ying Tyan · Android (Google) Code Review · commit cc019c0caa0d · 2011-01-24T21:13:08.000-08:00
diff --git a/telephony/java/com/android/internal/telephony/CallManager.java b/telephony/java/com/android/internal/telephony/CallManager.java
@@ -890,6 +890,8 @@ public void setMute(boolean muted) {
     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
@@ -306,7 +306,9 @@ public void setMute(boolean muted) {
     }
 
     public boolean getMute() {
-        return foregroundCall.getMute();
+        return (foregroundCall.getState().isAlive()
+                ? foregroundCall.getMute()
+                : backgroundCall.getMute());
     }
 
     public Call getForegroundCall() {

Original file line number	Diff line number	Diff line change
`@@ -890,6 +890,8 @@ public void setMute(boolean muted) {`
`890`	`890`	`public boolean getMute() {`
`891`	`891`	`if (hasActiveFgCall()) {`
`892`	`892`	`return getActiveFgCall().getPhone().getMute();`
	`893`	`+ } else if (hasActiveBgCall()) {`
	`894`	`+ return getFirstActiveBgCall().getPhone().getMute();`
`893`	`895`	`}`
`894`	`896`	`return false;`
`895`	`897`	`}`
Original file line number	Diff line number	Diff line change
`@@ -306,7 +306,9 @@ public void setMute(boolean muted) {`
`306`	`306`	`}`
`307`	`307`
`308`	`308`	`public boolean getMute() {`
`309`		`- return foregroundCall.getMute();`
	`309`	`+ return (foregroundCall.getState().isAlive()`
	`310`	`+ ? foregroundCall.getMute()`
	`311`	`+ : backgroundCall.getMute());`
`310`	`312`	`}`
`311`	`313`
`312`	`314`	`public Call getForegroundCall() {`