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

Commit cf363eb1 authored by Sang Tae Park's avatar Sang Tae Park
Browse files

LGEStarRIL: fix DST handling exception (ported from GB) 

current implementation of NITZ assumes that it is in the form of OFFSET,"DATE,TIME,DST"
and split it into OFFSET and "DATE,TIME" and "DST" and assign DST to parcelextra.
some carriers send NITZ without DST flag, string parsing splits DATE and TIME
and assign TIME for DST, which leads to throwing integer parsing exception,
and then possibly RIL crash
this commit utilize String.split(",") to split NITZ and reconstruct it correctly,
and handle DST as optional.
(also moved offset evaluation to inside only where it is needed.)

Change-Id: I50a8462bf1e2ea6820da4a006fd12ced8d224446
parent 824fd90c

telephony/java/com/android/internal/telephony/LGEStarRIL.java

+5 −6
Original line number Diff line number Diff line
@@ -1018,14 +1018,12 @@ public class LGEStarRIL extends RIL implements CommandsInterface { 


        /* Infineon modems need some additional hax... */

        if (isIfx) {

            /* Store DST before cropping */

            parcelextra = parceldata.substring(parceldata.lastIndexOf(",")+1);

            if (parcelextra != null) dst = Integer.parseInt(parcelextra);

            parceldata = parceldata.substring(0,(parceldata.lastIndexOf(",")));

            String [] parcelarray = parceldata.split(",");

            parceldata = parcelarray[0] + "," + parcelarray[1]; // assuming there is always one comma at least

            parcelextra = (parcelarray.length > 2 ? parcelarray[2] : "0");

            dst = Integer.parseInt(parcelextra);

        }



        int offset = num*15*60*1000;	// DST corrected



        /* WTH... Date may come with 4 digits in the year, reduce to 2 */

        try {

            dateFormatter = new SimpleDateFormat("yy/MM/dd,HH:mm:ss");
@@ -1034,6 +1032,7 @@ public class LGEStarRIL extends RIL implements CommandsInterface { 
            /* Ifx delivers localtime, convert to UTC */

            if (isIfx) {

                /* Directly calculate UTC time using DST Offset */

                int offset = num*15*60*1000;	// DST corrected

                long when = dateParser.parse(parceldata).getTime() - offset;

                Date d = new Date(when);

                response = dateFormatter.format(d);