Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 917396bf authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

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

am: fa351527

Change-Id: I024c4bff8b733fdf2216cdd16164a2d880aaf91b
parents 516e178c fa351527

telephony/java/com/android/internal/telephony/gsm/GsmSmsCbMessage.java

+1 −1
Original line number Diff line number Diff line
@@ -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) {