commit faa1ed26356d75382d512e76244493851e8dcb24
author Omkar Kolangade <omkark@codeaurora.org> Tue May 03 11:12:20 2016 -0700
committer Tyler Gunn <tgunn@google.com> Tue May 03 11:13:07 2016 -0700
tree 3adce8ef7038a659f6dea1a89702824d50ae8264
parent 5e62c24b8f11cf8b8ddb42134b75cc55248f4926

IMS Bug Fixes

Note: This change was already in MNC-VT-DEV, but it somehow got lost when
things merged over to master.

1. Since IMS waiting call end indication can be received
   from lower layers, there is no need for call reject
   timer in case of IMS call. Also IMS calls need to
   distinguish between call reject and call ignore.

Bug: 21800429
Change-Id: I8dce655a0f8aab83af47db71ccf4d74445d800f9

src/com/android/services/telephony/CdmaConnection.java

diff --git a/src/com/android/services/telephony/CdmaConnection.java b/src/com/android/services/telephony/CdmaConnection.java
index bfb0d23..8020996 100644
--- a/src/com/android/services/telephony/CdmaConnection.java
+++ b/src/com/android/services/telephony/CdmaConnection.java
@@ -26,6 +26,7 @@
 import com.android.internal.telephony.Call;
 import com.android.internal.telephony.CallStateException;
 import com.android.internal.telephony.Connection;
+import com.android.internal.telephony.imsphone.ImsPhoneConnection;
 import com.android.internal.telephony.Phone;
 import com.android.phone.settings.SettingsConstants;
 
@@ -84,7 +85,9 @@
         mAllowMute = allowMute;
         mIsOutgoing = isOutgoing;
         mIsCallWaiting = connection != null && connection.getState() == Call.State.WAITING;
-        if (mIsCallWaiting) {
+        boolean isImsCall = getOriginalConnection() instanceof ImsPhoneConnection;
+        // Start call waiting timer for CDMA waiting call.
+        if (mIsCallWaiting && !isImsCall) {
             startCallWaitingTimer();
         }
     }