commit cc0375f8f26f868a55c36616921f4c572347062b
author Sailesh Nepal <sail@google.com> Wed Nov 13 09:15:18 2013 -0800
committer Sailesh Nepal <sail@google.com> Wed Nov 13 09:23:17 2013 -0800
tree b3c766be2ddffbc2906a90e1eee24e74282ecd1a
parent 0fbe19e4653c06bf8ec3282f6e3fe689f388dd7e

ThirdPartyPhone: DTMF & callerDisplayName plumbing DO NOT MERGE

Plumbing for callerDisplayName argument from TelephonyManager to
ThirdPartyPhone.

Also fixes issues with DTMF.

Change-Id: If1484a5196485cbcd098f863765bf579d0a3d6bf

src/com/android/phone/DTMFTonePlayer.java

diff --git a/src/com/android/phone/DTMFTonePlayer.java b/src/com/android/phone/DTMFTonePlayer.java
index b8adaf1..2b04415 100644
--- a/src/com/android/phone/DTMFTonePlayer.java
+++ b/src/com/android/phone/DTMFTonePlayer.java
@@ -365,7 +365,9 @@
      */
     private static boolean useShortDtmfTones(Phone phone, Context context) {
         int phoneType = phone.getPhoneType();
-        if (phoneType == PhoneConstants.PHONE_TYPE_GSM) {
+        if (phoneType == PhoneConstants.PHONE_TYPE_GSM
+                || phoneType == PhoneConstants.PHONE_TYPE_SIP
+                || phoneType == PhoneConstants.PHONE_TYPE_THIRD_PARTY) {
             return false;
         } else if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {
             int toneType = android.provider.Settings.System.getInt(
@@ -377,8 +379,6 @@
             } else {
                 return false;
             }
-        } else if (phoneType == PhoneConstants.PHONE_TYPE_SIP) {
-            return false;
         } else {
             throw new IllegalStateException("Unexpected phone type: " + phoneType);
         }