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/CallNotifier.java

diff --git a/src/com/android/phone/CallNotifier.java b/src/com/android/phone/CallNotifier.java
index 80807a2..6094467 100644
--- a/src/com/android/phone/CallNotifier.java
+++ b/src/com/android/phone/CallNotifier.java
@@ -763,11 +763,12 @@
             }
         }
 
-        if ((fgPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_GSM)
-                || (fgPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_SIP)) {
+        if (fgPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_GSM
+                || fgPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_SIP
+                || fgPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_THIRD_PARTY) {
             Call.State callState = mCM.getActiveFgCallState();
             if (!callState.isDialing()) {
-                // If call get activated or disconnected before the ringback
+                // If call gets activated or disconnected before the ringback
                 // tone stops, we have to stop it to prevent disturbing.
                 if (mInCallRingbackTonePlayer != null) {
                     mInCallRingbackTonePlayer.stopTone();
@@ -1274,8 +1275,9 @@
                         toneType = ToneGenerator.TONE_CDMA_NETWORK_BUSY_ONE_SHOT;
                         toneVolume = TONE_RELATIVE_VOLUME_LOPRI;
                         toneLengthMillis = 1000;
-                    } else if ((phoneType == PhoneConstants.PHONE_TYPE_GSM)
-                            || (phoneType == PhoneConstants.PHONE_TYPE_SIP)) {
+                    } else if (phoneType == PhoneConstants.PHONE_TYPE_GSM
+                            || phoneType == PhoneConstants.PHONE_TYPE_SIP
+                            || phoneType == PhoneConstants.PHONE_TYPE_THIRD_PARTY) {
                         toneType = ToneGenerator.TONE_SUP_BUSY;
                         toneVolume = TONE_RELATIVE_VOLUME_HIPRI;
                         toneLengthMillis = 4000;