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

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

Browse Source
This commit is contained in:
Hung-ying Tyan
2010-08-25 19:27:50 -07:00
committed by Android (Google) Code Review
parent ea52d35e56 0e05bd27be
commit 108a06c9fc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
telephony/java/com/android/internal/telephony/CallManager.java
View File

@@ -691,8 +691,8 @@ public final class CallManager {
* Stop the playing DTMF tone. Ignored if there is no playing DTMF * Stop the playing DTMF tone. Ignored if there is no playing DTMF
* tone or no active call. * tone or no active call.
*/ */
public void stopDtmf(Phone phone) { public void stopDtmf() {
phone.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 * @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()) { if (hasActiveFgCall()) {
getActiveFgCall().getPhone().sendBurstDtmf(dtmfString, on, off, onComplete); getActiveFgCall().getPhone().sendBurstDtmf(dtmfString, on, off, onComplete);
return true; return true;