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

Commit fe7f0dc4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix Automatic time zone not working when no NITZ received."

parents ee1d6fd1 ca8681a9

src/java/com/android/internal/telephony/ServiceStateTracker.java

+4 −3
Original line number Diff line number Diff line
@@ -3147,8 +3147,6 @@ public class ServiceStateTracker extends Handler { 
                + mNeedFixZoneAfterNitz + " zone=" + (zone != null ? zone.getID() : "NULL");

        mTimeZoneLog.log(tmpLog);



        mNeedFixZoneAfterNitz = false;



        if (zone != null) {

            log("fixTimeZone: zone != null zone.getID=" + zone.getID());

            if (getAutoTimeZone()) {
@@ -3156,10 +3154,13 @@ public class ServiceStateTracker extends Handler { 
            } else {

                log("fixTimeZone: skip changing zone as getAutoTimeZone was false");

            }

            if (mNeedFixZoneAfterNitz) {

                saveNitzTimeZone(zone.getID());

            }

        } else {

            log("fixTimeZone: zone == null, do nothing for zone");

        }

        mNeedFixZoneAfterNitz = false;

    }



    /**