diff options
| author | Jake Hamby <jhamby@google.com> | 2010-08-16 14:42:01 -0700 |
|---|---|---|
| committer | Jake Hamby <jhamby@google.com> | 2010-08-16 14:42:01 -0700 |
| commit | a774f5817b5a24f5ccbb15c97fc4d5038310245b (patch) | |
| tree | b7ad7c71080ec587a58c54a425e1990e79682890 /telephony/java/android | |
| parent | 43c31421b4ce1cdff7c26c988bfe5e1bff64ce23 (diff) | |
| parent | 31202b1a40e7daccf69e284492494f9ff739f324 (diff) | |
| download | frameworks_base-a774f5817b5a24f5ccbb15c97fc4d5038310245b.zip frameworks_base-a774f5817b5a24f5ccbb15c97fc4d5038310245b.tar.gz frameworks_base-a774f5817b5a24f5ccbb15c97fc4d5038310245b.tar.bz2 | |
resolved conflicts for merge of 31202b1a to master
Change-Id: Ia8ae32c5ebcd13843ed9cc82c80bf551b38e586f
Diffstat (limited to 'telephony/java/android')
| -rw-r--r-- | telephony/java/android/telephony/gsm/SmsMessage.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/telephony/java/android/telephony/gsm/SmsMessage.java b/telephony/java/android/telephony/gsm/SmsMessage.java index 37ef912..0c63c37 100644 --- a/telephony/java/android/telephony/gsm/SmsMessage.java +++ b/telephony/java/android/telephony/gsm/SmsMessage.java @@ -304,9 +304,9 @@ public class SmsMessage { int septets = GsmAlphabet.countGsmSeptets(messageBody, !use7bitOnly); ret[1] = septets; if (septets > MAX_USER_DATA_SEPTETS) { - ret[0] = (septets / MAX_USER_DATA_SEPTETS_WITH_HEADER) + 1; - ret[2] = MAX_USER_DATA_SEPTETS_WITH_HEADER - - (septets % MAX_USER_DATA_SEPTETS_WITH_HEADER); + ret[0] = (septets + (MAX_USER_DATA_SEPTETS_WITH_HEADER - 1)) / + MAX_USER_DATA_SEPTETS_WITH_HEADER; + ret[2] = (ret[0] * MAX_USER_DATA_SEPTETS_WITH_HEADER) - septets; } else { ret[0] = 1; ret[2] = MAX_USER_DATA_SEPTETS - septets; @@ -318,9 +318,9 @@ public class SmsMessage { ret[1] = messageBody.length(); if (octets > MAX_USER_DATA_BYTES) { // 6 is the size of the user data header - ret[0] = (octets / MAX_USER_DATA_BYTES_WITH_HEADER) + 1; - ret[2] = (MAX_USER_DATA_BYTES_WITH_HEADER - - (octets % MAX_USER_DATA_BYTES_WITH_HEADER))/2; + ret[0] = (octets + (MAX_USER_DATA_BYTES_WITH_HEADER - 1)) / + MAX_USER_DATA_BYTES_WITH_HEADER; + ret[2] = ((ret[0] * MAX_USER_DATA_BYTES_WITH_HEADER) - octets) / 2; } else { ret[0] = 1; ret[2] = (MAX_USER_DATA_BYTES - octets)/2; |