summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Wang <johnwang@google.com>2010-10-11 10:42:37 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-11 10:42:37 -0700
commit2b4b3bd4b45255a21ff296271c02167a800a3958 (patch)
tree0a032ebdab1a6f754aaba3468571e0960f4b77d1
parent2493c164b01ad3ecec65151e898796e6d91eaff8 (diff)
parent5a41b3f8aa788f164af495bac6dc2666568f4cb6 (diff)
downloadframeworks_base-2b4b3bd4b45255a21ff296271c02167a800a3958.zip
frameworks_base-2b4b3bd4b45255a21ff296271c02167a800a3958.tar.gz
frameworks_base-2b4b3bd4b45255a21ff296271c02167a800a3958.tar.bz2
am 5a41b3f8: am df512214: Merge "Fix startDtmf." into gingerbread
Merge commit '5a41b3f8aa788f164af495bac6dc2666568f4cb6' * commit '5a41b3f8aa788f164af495bac6dc2666568f4cb6': Fix startDtmf.
-rw-r--r--telephony/java/com/android/internal/telephony/CallManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/com/android/internal/telephony/CallManager.java b/telephony/java/com/android/internal/telephony/CallManager.java
index 7a026fa..b09df82 100644
--- a/telephony/java/com/android/internal/telephony/CallManager.java
+++ b/telephony/java/com/android/internal/telephony/CallManager.java
@@ -925,7 +925,7 @@ public final class CallManager {
}
if (hasActiveFgCall()) {
- getActiveFgCall().getPhone().sendDtmf(c);
+ getActiveFgCall().getPhone().startDtmf(c);
result = true;
}