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

Merge "Fixed incorrect WAC decoding" into qt-qpr1-dev

Browse Source 
am: fa35152703

Change-Id: I024c4bff8b733fdf2216cdd16164a2d880aaf91b
This commit is contained in:
Jack Yu
2019-11-07 14:01:06 -08:00
committed by android-build-merger
parent 516e178c05 fa35152703
commit 917396bf71
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/com/android/internal/telephony/gsm/GsmSmsCbMessage.java
View File

@@ -215,7 +215,7 @@ public class GsmSmsCbMessage {
private static Pair<Integer, List<Geometry>> parseWarningAreaCoordinates(
byte[] pdu, int wacOffset) {
// little-endian
int wacDataLength = (pdu[wacOffset + 1] << 8) | pdu[wacOffset];
int wacDataLength = ((pdu[wacOffset + 1] & 0xff) << 8) | (pdu[wacOffset] & 0xff);
int offset = wacOffset + 2;
if (offset + wacDataLength > pdu.length) {