summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Wang <johnwang@google.com>2010-10-10 11:42:10 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-10 11:42:10 -0700
commit5a41b3f8aa788f164af495bac6dc2666568f4cb6 (patch)
treeef0f9ecb93b63a7fa78137d12f9fd2dbf39b17a2
parent2da9338cb7a403fef5b6a6c0a52c468ae7c104d9 (diff)
parentdf5122147c6e1c988c6a8504e71501cbbece5298 (diff)
downloadframeworks_base-5a41b3f8aa788f164af495bac6dc2666568f4cb6.zip
frameworks_base-5a41b3f8aa788f164af495bac6dc2666568f4cb6.tar.gz
frameworks_base-5a41b3f8aa788f164af495bac6dc2666568f4cb6.tar.bz2
am df512214: Merge "Fix startDtmf." into gingerbread
Merge commit 'df5122147c6e1c988c6a8504e71501cbbece5298' into gingerbread-plus-aosp * commit 'df5122147c6e1c988c6a8504e71501cbbece5298': 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;
}