commit 0ca1c80f1ca60966a16169b109e96ac19fa69743
author Etan Cohen <etancohen@google.com> Mon Jul 07 15:35:48 2014 -0700
committer Etan Cohen <etancohen@google.com> Tue Jul 08 07:47:18 2014 -0700
tree 318587d9f2bf78190cc23aa71f38ffe126f73147
parent 48b1b84ed64d08adba0195fd8986fcb90c934ac6

Merge IMS changes from klp-wireless-dev to master

Change-Id: I247fa2b0e3aa159a27d96951edb0b04afd4d5ec6

src/com/android/phone/CallNotifier.java

diff --git a/src/com/android/phone/CallNotifier.java b/src/com/android/phone/CallNotifier.java
index bc19568..9ab2b5e 100644
--- a/src/com/android/phone/CallNotifier.java
+++ b/src/com/android/phone/CallNotifier.java
@@ -759,6 +759,7 @@
 
         if (fgPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_GSM
                 || fgPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_SIP
+                || fgPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_IMS
                 || fgPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_THIRD_PARTY) {
             Call.State callState = mCM.getActiveFgCallState();
             if (!callState.isDialing()) {
@@ -1249,6 +1250,7 @@
                         toneLengthMillis = 1000;
                     } else if (phoneType == PhoneConstants.PHONE_TYPE_GSM
                             || phoneType == PhoneConstants.PHONE_TYPE_SIP
+                            || phoneType == PhoneConstants.PHONE_TYPE_IMS
                             || phoneType == PhoneConstants.PHONE_TYPE_THIRD_PARTY) {
                         toneType = ToneGenerator.TONE_SUP_BUSY;
                         toneVolume = TONE_RELATIVE_VOLUME_HIPRI;