Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd75788e authored by Hung-ying Tyan's avatar Hung-ying Tyan Committed by Android Git Automerger
Browse files

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

* commit 'cc019c0c':
  Get mute state from active call.
parents 7b2ca232 cc019c0c

telephony/java/com/android/internal/telephony/CallManager.java

+2 −0
Original line number Diff line number Diff line
@@ -895,6 +895,8 @@ public final class CallManager { 
    public boolean getMute() {

        if (hasActiveFgCall()) {

            return getActiveFgCall().getPhone().getMute();

        } else if (hasActiveBgCall()) {

            return getFirstActiveBgCall().getPhone().getMute();

        }

        return false;

    }

telephony/java/com/android/internal/telephony/sip/SipPhone.java

+3 −1
Original line number Diff line number Diff line
@@ -309,7 +309,9 @@ public class SipPhone extends SipPhoneBase { 
    }



    public boolean getMute() {

        return foregroundCall.getMute();

        return (foregroundCall.getState().isAlive()

                ? foregroundCall.getMute()

                : backgroundCall.getMute());

    }



    public Call getForegroundCall() {