commit 1d3a487105b3f49b0d0407ff380d244c356aebae
author Youhan Wang <youhanw@google.com> Thu May 12 21:09:42 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 12 21:09:43 2016 +0000
tree 6dc31b4018ecc4b6408438dea46f9feaffdadcdc
parent 351248cef27eff871dc2220ed0253fe3fd4e47c7
parent 4001d255c5f6f78ab22b9bb01bcb30bb86b5be6e

Merge "Add getEsn()." into nyc-mr1-dev

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();
         }
     }