summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hung-ying Tyan <tyanh@google.com> 2010-08-25 19:27:50 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2010-08-25 19:27:50 -0700
commit108a06c9fc0e4ac8c713fa38c490475d30a3cdcf (patch)
treeda6ee8942575b6ef5e20a6ce964cd2b06cabe934
parentea52d35e5685094f4d2cca5012239bde66f2c4fe (diff)
parent0e05bd27be817c8d78260c69d2156a6560d3d414 (diff)
Merge "CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()" into gingerbread
-rw-r--r--telephony/java/com/android/internal/telephony/CallManager.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/telephony/java/com/android/internal/telephony/CallManager.java b/telephony/java/com/android/internal/telephony/CallManager.java
index 980affa75cf4..12df44e19380 100644
--- a/telephony/java/com/android/internal/telephony/CallManager.java
+++ b/telephony/java/com/android/internal/telephony/CallManager.java
@@ -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;