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

Commit ca8681a9 authored by yifan.bai's avatar yifan.bai Committed by Yifan Bai
Browse files

Fix Automatic time zone not working when no NITZ received. 

When there is no NITZ time zone received from NW. Device will use unique
time zone by NW MCC Country ISO. In fixTimeZone method, if no NITZ time
zone received, saveNitzTimeZone method should not be called. Otherwise,
time zone will be fixed to system default time zone and cannot update by
Country ISO.

Test: Build pass.
Test: No NITZ received, time zone can be updated by NW MCC Country ISO.

Change-Id: I3e29f6c262825ea7a17915c988afec6d596d4570
parent 538289b3

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

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

                + mNeedFixZoneAfterNitz + " zone=" + (zone != null ? zone.getID() : "NULL");

        mTimeZoneLog.log(tmpLog);

        mTimeZoneLog.log(tmpLog);





        mNeedFixZoneAfterNitz = false;



        if (zone != null) {

        if (zone != null) {

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

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

            if (getAutoTimeZone()) {

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

            } else {

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

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

            }

            }

            if (mNeedFixZoneAfterNitz) {

                saveNitzTimeZone(zone.getID());

                saveNitzTimeZone(zone.getID());

            }

        } else {

        } else {

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

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

        }

        }

        mNeedFixZoneAfterNitz = false;

    }

    }





    /**

    /**