Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 8620 into donut

Browse Source 
* changes:
  Fix swapped gsm/cdma function dispatch, and 7bit text fragmentation.
This commit is contained in:
Android (Google) Code Review
2009-07-27 19:46:35 -07:00
parent 79858fe2f5 5e5b8c45db
commit ecbbecf6c5
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
telephony/java/android/telephony/SmsMessage.java
View File

@@ -278,8 +278,8 @@ public class SmsMessage {
public static int[] calculateLength(CharSequence msgBody, boolean use7bitOnly) { public static int[] calculateLength(CharSequence msgBody, boolean use7bitOnly) {
int activePhone = TelephonyManager.getDefault().getPhoneType(); int activePhone = TelephonyManager.getDefault().getPhoneType();
TextEncodingDetails ted = (PHONE_TYPE_CDMA == activePhone) ? TextEncodingDetails ted = (PHONE_TYPE_CDMA == activePhone) ?
com.android.internal.telephony.gsm.SmsMessage.calculateLength(msgBody, use7bitOnly) : com.android.internal.telephony.cdma.SmsMessage.calculateLength(msgBody, use7bitOnly) :
com.android.internal.telephony.cdma.SmsMessage.calculateLength(msgBody, use7bitOnly); com.android.internal.telephony.gsm.SmsMessage.calculateLength(msgBody, use7bitOnly);
int ret[] = new int[4]; int ret[] = new int[4];
ret[0] = ted.msgCount; ret[0] = ted.msgCount;
ret[1] = ted.codeUnitCount; ret[1] = ted.codeUnitCount;
@@ -299,8 +299,8 @@ public class SmsMessage {
public static ArrayList<String> fragmentText(String text) { public static ArrayList<String> fragmentText(String text) {
int activePhone = TelephonyManager.getDefault().getPhoneType(); int activePhone = TelephonyManager.getDefault().getPhoneType();
TextEncodingDetails ted = (PHONE_TYPE_CDMA == activePhone) ? TextEncodingDetails ted = (PHONE_TYPE_CDMA == activePhone) ?
com.android.internal.telephony.gsm.SmsMessage.calculateLength(text, false) : com.android.internal.telephony.cdma.SmsMessage.calculateLength(text, false) :
com.android.internal.telephony.cdma.SmsMessage.calculateLength(text, false); com.android.internal.telephony.gsm.SmsMessage.calculateLength(text, false);
// TODO(cleanup): The code here could be rolled into the logic // TODO(cleanup): The code here could be rolled into the logic
// below cleanly if these MAX_* constants were defined more // below cleanly if these MAX_* constants were defined more
@@ -321,11 +321,8 @@ public class SmsMessage {
while (pos < textLen) { while (pos < textLen) {
int nextPos = 0; // Counts code units. int nextPos = 0; // Counts code units.
if (ted.codeUnitSize == ENCODING_7BIT) { if (ted.codeUnitSize == ENCODING_7BIT) {
if (PHONE_TYPE_CDMA == activePhone) { // For multi-segment messages, CDMA 7bit equals GSM 7bit encoding (EMS mode).
nextPos = pos + Math.min(limit, textLen - pos);
} else {
nextPos = GsmAlphabet.findGsmSeptetLimitIndex(text, pos, limit); nextPos = GsmAlphabet.findGsmSeptetLimitIndex(text, pos, limit);
}
} else { // Assume unicode. } else { // Assume unicode.
nextPos = pos + Math.min(limit / 2, textLen - pos); nextPos = pos + Math.min(limit / 2, textLen - pos);
} }