diff options
| author | 2019-08-28 15:13:51 -0700 | |
|---|---|---|
| committer | 2019-08-28 15:13:51 -0700 | |
| commit | 66460139d216e78826bf2964b75c5e71bafd34f1 (patch) | |
| tree | d72dc1ff819e239b8584f286078f811eaf24c180 | |
| parent | 82ab503f6cee274090299986d0e15169142229d3 (diff) | |
| parent | 1a9034d44ed7b407564958de3a5e6788766ab783 (diff) | |
Merge "Fix invalid padding bits for 7-bit ASCII encoding" am: 2c8d3c56f2 am: c302ce55ab
am: 1a9034d44e
Change-Id: I84b71a73a4ad89185732dfb05582c549aab0ba3c
| -rw-r--r-- | telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java b/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java index 9e6f19f9243d..dab14369d79c 100644 --- a/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java +++ b/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java @@ -764,13 +764,13 @@ public final class BearerData { " > " + SmsConstants.MAX_USER_DATA_BYTES + " bytes)"); } - /* - * TODO(cleanup): figure out what the right answer is WRT paddingBits field - * - * userData.paddingBits = (userData.payload.length * 8) - (userData.numFields * 7); - * userData.paddingBits = 0; // XXX this seems better, but why? - * - */ + if (bData.userData.msgEncoding == UserData.ENCODING_7BIT_ASCII) { + bData.userData.paddingBits = + (bData.userData.payload.length * 8) - (bData.userData.numFields * 7); + } else { + bData.userData.paddingBits = 0; + } + int dataBits = (bData.userData.payload.length * 8) - bData.userData.paddingBits; int paramBits = dataBits + 13; if ((bData.userData.msgEncoding == UserData.ENCODING_IS91_EXTENDED_PROTOCOL) || |