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

Commit d8208c31 authored by Jessica Wagantall's avatar Jessica Wagantall
Browse files

Merge tag 'android-6.0.1_r61' into HEAD 

Android 6.0.1 Release 61 (MOB30Z)

Change-Id: I1579189596cf269ec8c80b7efb006711ae2236a9
parents 4b479deb f47bc301

src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java

+6 −0
Original line number Diff line number Diff line
@@ -102,6 +102,8 @@ public class CdmaServiceStateTracker extends ServiceStateTracker { 
    private static final int NITZ_UPDATE_DIFF_DEFAULT = 2000;

    private int mNitzUpdateDiff = SystemProperties.getInt("ro.nitz_update_diff",

            NITZ_UPDATE_DIFF_DEFAULT);

    /** Time stamp after 19 January 2038 is not supported under 32 bit */

    private static final int MAX_NITZ_YEAR = 2037;



    private int mRoamingIndicator;

    private boolean mIsInPrl;
@@ -1639,6 +1641,10 @@ public class CdmaServiceStateTracker extends ServiceStateTracker { 
            String[] nitzSubs = nitz.split("[/:,+-]");



            int year = 2000 + Integer.parseInt(nitzSubs[0]);

            if (year > MAX_NITZ_YEAR) {

              if (DBG) loge("NITZ year: " + year + " exceeds limit, skip NITZ time update");

              return;

            }

            c.set(Calendar.YEAR, year);



            // month is 0 based!

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

+6 −0
Original line number Diff line number Diff line
@@ -141,6 +141,8 @@ public class GsmServiceStateTracker extends ServiceStateTracker { 


    /** Boolean is true is setTimeFromNITZString was called */

    private boolean mNitzUpdatedTime = false;

    /** Time stamp after 19 January 2038 is not supported under 32 bit */

    private static final int MAX_NITZ_YEAR = 2037;



    String mSavedTimeZone;

    long mSavedTime;
@@ -1826,6 +1828,10 @@ public class GsmServiceStateTracker extends ServiceStateTracker { 
            String[] nitzSubs = nitz.split("[/:,+-]");



            int year = 2000 + Integer.parseInt(nitzSubs[0]);

            if (year > MAX_NITZ_YEAR) {

              if (DBG) loge("NITZ year: " + year + " exceeds limit, skip NITZ time update");

              return;

            }

            c.set(Calendar.YEAR, year);



            // month is 0 based!