Merge "Improve logging of time zone detection (2/2)" (3992e651) · Commits · e / os / android_frameworks_opt_telephony

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

+17 −1

Original line number	Diff line number	Diff line
		@@ -69,6 +69,14 @@ public final class NitzStateMachineImpl implements NitzStateMachine {
		*/
		private String mSavedTimeZoneId;

		/**
		* The last time zone ID that was set. It is used for log entry filtering. This is different
		* from {@link #mSavedTimeZoneId} in that this records the last zone ID this class actually
		* suggested should be set as the device zone ID; i.e. it is only set if automatic time zone
		* detection is enabled.
		*/
		private String mLastSetTimeZoneId;

		/**
		* Boolean is {@code true} if NITZ has been used to determine a time zone (which may not
		* ultimately have been used due to user settings). Cleared by {@link #handleNetworkAvailable()}
		@@ -396,9 +404,17 @@ public final class NitzStateMachineImpl implements NitzStateMachine {
		if (DBG) {
		Rlog.d(LOG_TAG, logMessage);
		}

		// Filter mTimeZoneLog entries to only store "interesting" ones. NITZ signals can be
		// quite frequent (e.g. every few minutes) and logging each one soon obliterates useful
		// entries from bug reports. http://b/138187241
		if (!zoneId.equals(mLastSetTimeZoneId)) {
		mTimeZoneLog.log(logMessage);
		mLastSetTimeZoneId = zoneId;
		}

		mTimeServiceHelper.setDeviceTimeZone(zoneId);

		if (DBG) {
		Rlog.d(LOG_TAG,
		"setAndBroadcastNetworkSetTimeZone: called setDeviceTimeZone()"