commit 2c8d3c56f2e4520154c01893d45766407df113db
author Amit Mahajan <amitmahajan@google.com> Wed Aug 28 19:45:52 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 28 19:45:52 2019 +0000
tree ea854f5fd0c308181282f64a6cb40ba8ab1d78a3
parent 1953ea490f4428532eb1e795c729e3875fac9d14
parent dc77d5a9ac786c717c0a58ec926361839ace26bf

Merge "Fix invalid padding bits for 7-bit ASCII encoding"

telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java

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 9e6f19f..dab1436 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 @@
                                       " > " + 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) ||