summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Mahajan2015-02-18 18:39:40 -0800
committerThe Android Automerger2015-02-18 20:57:24 -0800
commit2ab3133a5c3a70fe1184ba8ff63ac3365f648a4e (patch)
tree297179ddf395842a2fdf1621a34868328c3f1d7b
parente58c2e4176acbd35d81a5cd40cd4860f8a237a9c (diff)
Adding a new param to calculateLength for SMS to indicate if called for a
segment of multipart msg. Encoding type is calculated separately for entire msg vs individual segments. Change is to avoid overwriting the calculated value for individual segment based. Bug: 19399335 Change-Id: I8e89b7596e9c7440ace0486eceb1252094c373fa
-rw-r--r--src/com/android/bluetooth/map/BluetoothMapSmsPdu.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/bluetooth/map/BluetoothMapSmsPdu.java b/src/com/android/bluetooth/map/BluetoothMapSmsPdu.java
index 5b7b8db..4428874 100644
--- a/src/com/android/bluetooth/map/BluetoothMapSmsPdu.java
+++ b/src/com/android/bluetooth/map/BluetoothMapSmsPdu.java
@@ -482,7 +482,7 @@ public class BluetoothMapSmsPdu {
int activePhone = TelephonyManager.getDefault().getCurrentPhoneType(); // TODO: Change to use: ((TelephonyManager)myContext.getSystemService(Context.TELEPHONY_SERVICE))
int phoneType;
GsmAlphabet.TextEncodingDetails ted = (PHONE_TYPE_CDMA == activePhone) ?
- com.android.internal.telephony.cdma.SmsMessage.calculateLength((CharSequence)messageText, false) :
+ com.android.internal.telephony.cdma.SmsMessage.calculateLength((CharSequence)messageText, false, true) :
com.android.internal.telephony.gsm.SmsMessage.calculateLength((CharSequence)messageText, false);
SmsPdu newPdu;