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

Commit b90dee72 authored by Jing Zhao's avatar Jing Zhao Committed by Amit Mahajan
Browse files

Take care of invalid mcc first when updating time based on nitz. 

[ADR] PTCRB: 26.7.6.1.1 test from 3GPP TS 51.010-1

Bug: 17425395
Change-Id: I44cb366f4a0b5595f31c30a60dac52618431a109
parent a85da71e

src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java

+6 −5
Original line number Diff line number Diff line
@@ -1094,6 +1094,12 @@ final class GsmServiceStateTracker extends ServiceStateTracker { 
                            "' iso-cc-idx=" + Arrays.binarySearch(GMT_COUNTRY_CODES, iso));

                    }



                    if ("".equals(iso) && mNeedFixZoneAfterNitz) {

                        // Country code not found.  This is likely a test network.

                        // Get a TimeZone based only on the NITZ parameters (best guess).

                        zone = getNitzTimeZone(mZoneOffset, mZoneDst, mZoneTime);

                        if (DBG) log("pollStateDone: using NITZ TimeZone");

                    } else

                    // "(mZoneOffset == 0) && (mZoneDst == false) &&

                    //  (Arrays.binarySearch(GMT_COUNTRY_CODES, iso) < 0)"

                    // means that we received a NITZ string telling
@@ -1124,11 +1130,6 @@ final class GsmServiceStateTracker extends ServiceStateTracker { 
                            }

                        }

                        if (DBG) log("pollStateDone: using default TimeZone");

                    } else if (iso.equals("")){

                        // Country code not found.  This is likely a test network.

                        // Get a TimeZone based only on the NITZ parameters (best guess).

                        zone = getNitzTimeZone(mZoneOffset, mZoneDst, mZoneTime);

                        if (DBG) log("pollStateDone: using NITZ TimeZone");

                    } else {

                        zone = TimeUtils.getTimeZone(mZoneOffset, mZoneDst, mZoneTime, iso);

                        if (DBG) log("pollStateDone: using getTimeZone(off, dst, time, iso)");