Merge "Fix Automatic time zone not working when no NITZ received." (56725dd7) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

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;
		}

		/**