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" am: 2c8d3c56f2 am: c302ce55ab am: 1a9034d44e am: 66460139d2

Browse Source 
am: c0f522c3ec

Change-Id: If71c72840bcf7176fbceca91fcab9bcd81955d6b
This commit is contained in:
Amit Mahajan
2019-08-28 17:51:22 -07:00
committed by android-build-merger
parent 2292c5d7d3 c0f522c3ec
commit 13b0504c4b
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

@@ -781,13 +781,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) ||