Snap for 6157377 from be8186cc5af5b6f47d483cd7ecfe43df0e39b861 to qt-qpr3-release (369cf190) · Commits · e / os / android_frameworks_opt_telephony

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

+6 −17

Original line number	Diff line number	Diff line
		@@ -360,25 +360,14 @@ public final class MccTable {
		private static void setTimezoneFromMccIfNeeded(Context context, int mcc) {
		// Switch to use the time service helper associated with the NitzStateMachine impl
		// being used. This logic will be removed once the old implementation is removed.
		if (TelephonyComponentFactory.USE_NEW_NITZ_STATE_MACHINE) {
		if (!NewTimeServiceHelper.isTimeZoneSettingInitializedStatic()) {
		if (!TimeServiceHelperImpl.isTimeZoneSettingInitializedStatic()) {
		String zoneId = defaultTimeZoneForMcc(mcc);
		if (zoneId != null && zoneId.length() > 0) {
		// Set time zone based on MCC
		NewTimeServiceHelper.setDeviceTimeZoneStatic(context, zoneId);
		TimeServiceHelperImpl.setDeviceTimeZoneStatic(context, zoneId);
		Slog.d(LOG_TAG, "timezone set to " + zoneId);
		}
		}
		} else {
		if (!OldTimeServiceHelper.isTimeZoneSettingInitializedStatic()) {
		String zoneId = defaultTimeZoneForMcc(mcc);
		if (zoneId != null && zoneId.length() > 0) {
		// Set time zone based on MCC
		OldTimeServiceHelper.setDeviceTimeZoneStatic(context, zoneId);
		Slog.d(LOG_TAG, "timezone set to " + zoneId);
		}
		}
		}
		}

		/**

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

+33 −14

Original line number	Diff line number	Diff line
		@@ -83,8 +83,34 @@ public interface NitzStateMachine {
		* A proxy over device state that allows things like system properties, system clock
		* to be faked for tests.
		*/
		// Non-final to allow mocking.
		class DeviceState {
		interface DeviceState {

		/**
		* If time between NITZ updates is less than {@link #getNitzUpdateSpacingMillis()} the
		* update may be ignored.
		*/
		int getNitzUpdateSpacingMillis();

		/**
		* If {@link #getNitzUpdateSpacingMillis()} hasn't been exceeded but update is >
		* {@link #getNitzUpdateDiffMillis()} do the update
		*/
		int getNitzUpdateDiffMillis();

		/**
		* Returns true if the {@code gsm.ignore-nitz} system property is set to "yes".
		*/
		boolean getIgnoreNitz();

		String getNetworkCountryIsoForPhone();
		}

		/**
		* The real implementation of {@link DeviceState}.
		*
		* {@hide}
		*/
		class DeviceStateImpl implements DeviceState {
		private static final int NITZ_UPDATE_SPACING_DEFAULT = 1000 * 60 * 10;
		private final int mNitzUpdateSpacing;

		@@ -95,7 +121,7 @@ public interface NitzStateMachine {
		private final TelephonyManager mTelephonyManager;
		private final ContentResolver mCr;

		public DeviceState(GsmCdmaPhone phone) {
		public DeviceStateImpl(GsmCdmaPhone phone) {
		mPhone = phone;

		Context context = phone.getContext();
		@@ -108,31 +134,24 @@ public interface NitzStateMachine {
		SystemProperties.getInt("ro.nitz_update_diff", NITZ_UPDATE_DIFF_DEFAULT);
		}

		/**
		* If time between NITZ updates is less than {@link #getNitzUpdateSpacingMillis()} the
		* update may be ignored.
		*/
		@Override
		public int getNitzUpdateSpacingMillis() {
		return Settings.Global.getInt(mCr, Settings.Global.NITZ_UPDATE_SPACING,
		mNitzUpdateSpacing);
		}

		/**
		* If {@link #getNitzUpdateSpacingMillis()} hasn't been exceeded but update is >
		* {@link #getNitzUpdateDiffMillis()} do the update
		*/
		@Override
		public int getNitzUpdateDiffMillis() {
		return Settings.Global.getInt(mCr, Settings.Global.NITZ_UPDATE_DIFF, mNitzUpdateDiff);
		}

		/**
		* Returns true if the {@code gsm.ignore-nitz} system property is set to "yes".
		*/
		@Override
		public boolean getIgnoreNitz() {
		String ignoreNitz = SystemProperties.get("gsm.ignore-nitz");
		return ignoreNitz != null && ignoreNitz.equals("yes");
		}

		@Override
		public String getNetworkCountryIsoForPhone() {
		return mTelephonyManager.getNetworkCountryIsoForPhone(mPhone.getPhoneId());
		}

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

+7 −7

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ import java.io.PrintWriter;
		/**
		* {@hide}
		*/
		public final class NewNitzStateMachine implements NitzStateMachine {
		public final class NitzStateMachineImpl implements NitzStateMachine {

		private static final String LOG_TAG = ServiceStateTracker.LOG_TAG;
		private static final boolean DBG = ServiceStateTracker.DBG;
		@@ -84,21 +84,21 @@ public final class NewNitzStateMachine implements NitzStateMachine {
		private final LocalLog mTimeZoneLog = new LocalLog(15);
		private final GsmCdmaPhone mPhone;
		private final DeviceState mDeviceState;
		private final NewTimeServiceHelper mTimeServiceHelper;
		private final TimeServiceHelper mTimeServiceHelper;
		private final TimeZoneLookupHelper mTimeZoneLookupHelper;
		/** Wake lock used while setting time of day. */
		private final PowerManager.WakeLock mWakeLock;
		private static final String WAKELOCK_TAG = "NitzStateMachine";

		public NewNitzStateMachine(GsmCdmaPhone phone) {
		public NitzStateMachineImpl(GsmCdmaPhone phone) {
		this(phone,
		new NewTimeServiceHelper(phone.getContext()),
		new DeviceState(phone),
		new TimeServiceHelperImpl(phone.getContext()),
		new DeviceStateImpl(phone),
		new TimeZoneLookupHelper());
		}

		@VisibleForTesting
		public NewNitzStateMachine(GsmCdmaPhone phone, NewTimeServiceHelper timeServiceHelper,
		public NitzStateMachineImpl(GsmCdmaPhone phone, TimeServiceHelper timeServiceHelper,
		DeviceState deviceState, TimeZoneLookupHelper timeZoneLookupHelper) {
		mPhone = phone;

		@@ -110,7 +110,7 @@ public final class NewNitzStateMachine implements NitzStateMachine {
		mDeviceState = deviceState;
		mTimeZoneLookupHelper = timeZoneLookupHelper;
		mTimeServiceHelper = timeServiceHelper;
		mTimeServiceHelper.setListener(new NewTimeServiceHelper.Listener() {
		mTimeServiceHelper.setListener(new TimeServiceHelper.Listener() {
		@Override
		public void onTimeZoneDetectionChange(boolean enabled) {
		if (enabled) {