commit 536cae75031e11ee30da0a0b4d4a0752e5526e96
author Amit Mahajan <amitmahajan@google.com> Wed Oct 08 00:27:19 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 08 00:27:20 2014 +0000
tree 267e3fd9844dfad0a09960eab928e969be060b6f
parent a88daac223c9644b9bf2eb17f37d053194c4da3e
parent 4eb8e4c8dc684e2109276ea2ec4ce25d3b188568

Merge "Send SMS over 1x when on eHRPD/LTE and active voice call" into lmp-dev

src/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java

diff --git a/src/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java b/src/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
index 0e1a30f..cf5ad10 100755
--- a/src/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
+++ b/src/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
@@ -41,6 +41,8 @@
 import com.android.internal.telephony.SmsUsageMonitor;
 import com.android.internal.telephony.TelephonyProperties;
 import com.android.internal.telephony.cdma.sms.UserData;
+import com.android.internal.telephony.PhoneConstants;
+import android.telephony.TelephonyManager;
 
 import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -260,11 +262,19 @@
         Message reply = obtainMessage(EVENT_SEND_SMS_COMPLETE, tracker);
         byte[] pdu = (byte[]) tracker.mData.get("pdu");
 
+        int currentDataNetwork = mPhone.getServiceState().getDataNetworkType();
+        boolean imsSmsDisabled = (currentDataNetwork == TelephonyManager.NETWORK_TYPE_EHRPD
+                    || (currentDataNetwork == TelephonyManager.NETWORK_TYPE_LTE
+                    && !mPhone.getServiceStateTracker().isConcurrentVoiceAndDataAllowed()))
+                    && mPhone.getServiceState().getVoiceNetworkType()
+                    == TelephonyManager.NETWORK_TYPE_1xRTT
+                    && mPhone.getState() != PhoneConstants.State.IDLE;
+
         // sms over cdma is used:
         //   if sms over IMS is not supported AND
         //   this is not a retry case after sms over IMS failed
         //     indicated by mImsRetry > 0
-        if (0 == tracker.mImsRetry && !isIms()) {
+        if (0 == tracker.mImsRetry && !isIms() || imsSmsDisabled) {
             mCi.sendCdmaSms(pdu, reply);
         } else {
             mCi.sendImsCdmaSms(pdu, tracker.mImsRetry, tracker.mMessageRef, reply);