Merge "Telephony: Add 7bit Ascii support for long message"

diff --cc telephony/java/com/android/internal/telephony/cdma/SmsMessage.java
index 9080e23,4aa6f71..1da5eac
--- 1/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java
--- 2/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java
+++ b/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java
@@@ -863,9 -862,11 +863,10 @@@ public class SmsMessage extends SmsMess
              Rlog.d(LOG_TAG, "MO (encoded) BearerData = " + bearerData);
              Rlog.d(LOG_TAG, "MO raw BearerData = '" + HexDump.toHexString(encodedBearerData) + "'");
          }
 -        if (encodedBearerData == null) return null;
  
-         int teleservice = bearerData.hasUserDataHeader ?
-                 SmsEnvelope.TELESERVICE_WEMT : SmsEnvelope.TELESERVICE_WMT;
+         int teleservice = (bearerData.hasUserDataHeader
+                 && userData.msgEncoding != UserData.ENCODING_7BIT_ASCII)
+                 ? SmsEnvelope.TELESERVICE_WEMT : SmsEnvelope.TELESERVICE_WMT;
  
          SmsEnvelope envelope = new SmsEnvelope();
          envelope.messageType = SmsEnvelope.MESSAGE_TYPE_POINT_TO_POINT;