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

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

Browse Source 
am: 2c8d3c56f2

Change-Id: I62692e468732d1de5eba26ddc2a926bb7044e7f2
This commit is contained in:
Amit Mahajan
2019-08-28 13:41:21 -07:00
committed by android-build-merger
parent c898d8096a 2c8d3c56f2
commit c302ce55ab
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java
View File

@@ -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) ||