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

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

am d06e641d: am 108a06c9: Merge "CallManager: remove unused Phone argument... 

am d06e641d: am 108a06c9: Merge "CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()" into gingerbread

Merge commit 'd06e641d'

* commit 'd06e641d':
  CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()
parents 6d92e3c9 d06e641d

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

+3 −3
Original line number Diff line number Diff line
@@ -691,8 +691,8 @@ public final class CallManager { 
     * Stop the playing DTMF tone. Ignored if there is no playing DTMF

     * tone or no active call.

     */

    public void stopDtmf(Phone phone) {

        phone.stopDtmf();

    public void stopDtmf() {

        if (hasActiveFgCall()) getFgPhone().stopDtmf();

    }



    /**
@@ -709,7 +709,7 @@ public final class CallManager { 
     * @param onComplete is the callback message when the action is processed by BP

     *

     */

    public boolean sendBurstDtmf(Phone phone, String dtmfString, int on, int off, Message onComplete) {

    public boolean sendBurstDtmf(String dtmfString, int on, int off, Message onComplete) {

        if (hasActiveFgCall()) {

            getActiveFgCall().getPhone().sendBurstDtmf(dtmfString, on, off, onComplete);

            return true;