More tidy up / test refactoring (95ef0552) · Commits · e / os / android_frameworks_opt_telephony

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

+7 −3

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,8 @@

	package com.android.internal.telephony;		package com.android.internal.telephony;

			import android.annotation.NonNull;
			import android.annotation.Nullable;
	import android.content.ContentResolver;		import android.content.ContentResolver;
	import android.content.Context;		import android.content.Context;
	import android.os.SystemClock;		import android.os.SystemClock;
	@@ -60,7 +62,7 @@ public interface NitzStateMachine {
	/**		/**
	* Handle a new NITZ signal being received.		* Handle a new NITZ signal being received.
	*/		*/
	void handleNitzReceived(TimestampedValue<NitzData> nitzSignal);		void handleNitzReceived(@NonNull TimestampedValue<NitzData> nitzSignal);

	/**		/**
	* Handle the user putting the device into or out of airplane mode		* Handle the user putting the device into or out of airplane mode
	@@ -81,6 +83,7 @@ public interface NitzStateMachine {
	/**		/**
	* Returns the last NITZ data that was cached.		* Returns the last NITZ data that was cached.
	*/		*/
			@Nullable
	NitzData getCachedNitzData();		NitzData getCachedNitzData();

	/**		/**
	@@ -106,7 +109,7 @@ public interface NitzStateMachine {
	*/		*/
	boolean getIgnoreNitz();		boolean getIgnoreNitz();

	String getNetworkCountryIsoForPhone();		@Nullable String getNetworkCountryIsoForPhone();

	/**		/**
	* Returns the same value as {@link SystemClock#elapsedRealtime()}.		* Returns the same value as {@link SystemClock#elapsedRealtime()}.
	@@ -135,7 +138,7 @@ public interface NitzStateMachine {
	private final TelephonyManager mTelephonyManager;		private final TelephonyManager mTelephonyManager;
	private final ContentResolver mCr;		private final ContentResolver mCr;

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

	Context context = phone.getContext();		Context context = phone.getContext();
	@@ -166,6 +169,7 @@ public interface NitzStateMachine {
	}		}

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

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -204,8 +204,8 @@ public final class NitzStateMachineImpl implements NitzStateMachine {

	zoneId = null;		zoneId = null;
	} else {		} else {
	OffsetResult lookupResult = mTimeZoneLookupHelper.lookupByNitzCountry(		OffsetResult lookupResult =
	nitzData, isoCountryCode);		mTimeZoneLookupHelper.lookupByNitzCountry(nitzData, isoCountryCode);
	if (DBG) {		if (DBG) {
	Rlog.d(LOG_TAG, "updateTimeZoneFromCountryAndNitz: using"		Rlog.d(LOG_TAG, "updateTimeZoneFromCountryAndNitz: using"
	+ " lookupByNitzCountry(nitzData, isoCountryCode),"		+ " lookupByNitzCountry(nitzData, isoCountryCode),"

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

+0 −17

Original line number	Original line	Diff line number	Diff line
	@@ -165,8 +165,6 @@ public class TimeZoneLookupHelper {
	}		}
	}		}

	private static final int MS_PER_HOUR = 60 * 60 * 1000;

	/** The last CountryTimeZones object retrieved. */		/** The last CountryTimeZones object retrieved. */
	private CountryTimeZones mLastCountryTimeZones;		private CountryTimeZones mLastCountryTimeZones;

	@@ -296,21 +294,6 @@ public class TimeZoneLookupHelper {
	return countryTimeZones == null ? null : countryTimeZones.getDefaultTimeZoneId();		return countryTimeZones == null ? null : countryTimeZones.getDefaultTimeZoneId();
	}		}

	/**
	* Finds a time zone using only information present in the supplied {@link NitzData} object.
	* This is a static method for use by {@link ServiceStateTracker}.
	*
	* <p><em>Note:</em> Because multiple time zones can have the same offset / DST state at a given
	* time this process is error prone; an arbitrary match is returned when there are multiple
	* candidates. The algorithm can also return a non-exact match by assuming that the DST
	* information provided by NITZ is incorrect. This method can return {@code null} if no matching
	* time zones are found.
	*/
	static TimeZone guessZoneByNitzStatic(NitzData nitzData) {
	OffsetResult result = lookupByNitzStatic(nitzData);
	return result != null ? result.getTimeZone() : null;
	}

	private static OffsetResult lookupByNitzStatic(NitzData nitzData) {		private static OffsetResult lookupByNitzStatic(NitzData nitzData) {
	int utcOffsetMillis = nitzData.getLocalOffsetMillis();		int utcOffsetMillis = nitzData.getLocalOffsetMillis();
	long timeMillis = nitzData.getCurrentTimeInMillis();		long timeMillis = nitzData.getCurrentTimeInMillis();

tests/telephonytests/src/com/android/internal/telephony/NitzStateMachineImplTest.java

+74 −155

File changed.

Preview size limit exceeded, changes collapsed.

tests/telephonytests/src/com/android/internal/telephony/NitzStateMachineTestSupport.java

+82 −42

Original line number	Original line	Diff line number	Diff line
	@@ -28,78 +28,110 @@ import com.android.internal.telephony.NitzStateMachine.DeviceState;
	/**		/**
	* An assortment of methods and classes for testing {@link NitzStateMachine} implementations.		* An assortment of methods and classes for testing {@link NitzStateMachine} implementations.
	*/		*/
	final class NitzStateMachineTestSupport {		public final class NitzStateMachineTestSupport {

			// Values used to when initializing device state but where the value isn't important.
			public static final long ARBITRARY_SYSTEM_CLOCK_TIME = createUtcTime(1977, 1, 1, 12, 0, 0);
			public static final long ARBITRARY_REALTIME_MILLIS = 123456789L;
			public static final String ARBITRARY_TIME_ZONE_ID = "Europe/Paris";

			// A country with a single zone : the zone can be guessed from the country.
			// The UK uses UTC for part of the year so it is not good for detecting bogus NITZ signals.
			public static final Scenario UNITED_KINGDOM_SCENARIO = new Scenario.Builder()
			.setTimeZone("Europe/London")
			.setActualTimeUtc(2018, 1, 1, 12, 0, 0)
			.setCountryIso("gb")
			.buildFrozen();
			public static final String UNITED_KINGDOM_COUNTRY_DEFAULT_ZONE_ID = "Europe/London";

			// A country that has multiple zones, but there is only one matching time zone at the time :
			// the zone cannot be guessed from the country alone, but can be guessed from the country +
			// NITZ. The US never uses UTC so it can be used for testing bogus NITZ signal handling.
			public static final Scenario UNIQUE_US_ZONE_SCENARIO = new Scenario.Builder()
			.setTimeZone("America/Los_Angeles")
			.setActualTimeUtc(2018, 1, 1, 12, 0, 0)
			.setCountryIso("us")
			.buildFrozen();
			public static final String US_COUNTRY_DEFAULT_ZONE_ID = "America/New_York";

			// A country with a single zone: the zone can be guessed from the country alone. CZ never uses
			// UTC so it can be used for testing bogus NITZ signal handling.
			public static final Scenario CZECHIA_SCENARIO = new Scenario.Builder()
			.setTimeZone("Europe/Prague")
			.setActualTimeUtc(2018, 1, 1, 12, 0, 0)
			.setCountryIso("cz")
			.buildFrozen();
			public static final String CZECHIA_COUNTRY_DEFAULT_ZONE_ID = "Europe/Prague";

	/**		/**
	* A scenario used during tests. Describes a fictional reality.		* A scenario used during tests. Describes a fictional reality.
	*/		*/
	static class Scenario {		public static class Scenario {

	private final boolean mFrozen;		private final boolean mFrozen;
	private TimeZone mZone;		private TimeZone mZone;
	private String mNetworkCountryIsoCode;		private String mNetworkCountryIsoCode;
	private long mElapsedRealtimeMillis;
	private long mActualTimeMillis;		private long mActualTimeMillis;

	Scenario(boolean frozen, long elapsedRealtimeMillis, long timeMillis, String zoneId,		public Scenario(boolean frozen, long timeMillis, String zoneId, String countryIsoCode) {
	String countryIsoCode) {
	mFrozen = frozen;		mFrozen = frozen;
	mActualTimeMillis = timeMillis;		mActualTimeMillis = timeMillis;
	mElapsedRealtimeMillis = elapsedRealtimeMillis;
	mZone = zone(zoneId);		mZone = zone(zoneId);
	mNetworkCountryIsoCode = countryIsoCode;		mNetworkCountryIsoCode = countryIsoCode;
	}		}

	/** Creates an NITZ signal to match the scenario. */		/** Creates an NITZ signal to match the scenario. */
	TimestampedValue<NitzData> createNitzSignal() {		public TimestampedValue<NitzData> createNitzSignal(long elapsedRealtimeClock) {
			return new TimestampedValue<>(elapsedRealtimeClock, createNitzData());
			}

			/** Creates an NITZ signal to match the scenario. */
			public NitzData createNitzData() {
	int[] offsets = new int[2];		int[] offsets = new int[2];
	mZone.getOffset(mActualTimeMillis, false /* local */, offsets);		mZone.getOffset(mActualTimeMillis, false /* local */, offsets);
	int zoneOffsetMillis = offsets[0] + offsets[1];		int zoneOffsetMillis = offsets[0] + offsets[1];
	NitzData nitzData = NitzData.createForTests(		return NitzData.createForTests(
	zoneOffsetMillis, offsets[1], mActualTimeMillis,		zoneOffsetMillis, offsets[1], mActualTimeMillis,
	null /* emulatorHostTimeZone */);		null /* emulatorHostTimeZone */);
	return new TimestampedValue<>(mElapsedRealtimeMillis, nitzData);
	}		}

	/** Creates a time signal to match the scenario. */		/** Creates a time signal to match the scenario. */
	TimestampedValue<Long> createTimeSignal() {		public TimestampedValue<Long> createTimeSignal(long elapsedRealtimeClock) {
	return new TimestampedValue<>(mElapsedRealtimeMillis, mActualTimeMillis);		return new TimestampedValue<>(elapsedRealtimeClock, mActualTimeMillis);
	}

	long getDeviceRealTimeMillis() {
	return mElapsedRealtimeMillis;
	}		}

	String getNetworkCountryIsoCode() {		public String getNetworkCountryIsoCode() {
	return mNetworkCountryIsoCode;		return mNetworkCountryIsoCode;
	}		}

	String getTimeZoneId() {		public String getTimeZoneId() {
	return mZone.getID();		return mZone.getID();
	}		}

	long getActualTimeMillis() {		public TimeZone getTimeZone() {
			return mZone;
			}

			public long getActualTimeMillis() {
	return mActualTimeMillis;		return mActualTimeMillis;
	}		}

	Scenario incrementTime(long timeIncrementMillis) {		public Scenario incrementTime(long timeIncrementMillis) {
	checkFrozen();		checkFrozen();
	mElapsedRealtimeMillis += timeIncrementMillis;
	mActualTimeMillis += timeIncrementMillis;		mActualTimeMillis += timeIncrementMillis;
	return this;		return this;
	}		}

	Scenario changeCountry(String timeZoneId, String networkCountryIsoCode) {		public Scenario changeCountry(String timeZoneId, String networkCountryIsoCode) {
	checkFrozen();		checkFrozen();
	mZone = zone(timeZoneId);		mZone = zone(timeZoneId);
	mNetworkCountryIsoCode = networkCountryIsoCode;		mNetworkCountryIsoCode = networkCountryIsoCode;
	return this;		return this;
	}		}

	Scenario mutableCopy() {		public Scenario mutableCopy() {
	return new Scenario(		return new Scenario(
	false /* frozen */, mElapsedRealtimeMillis, mActualTimeMillis, mZone.getID(),		false /* frozen */, mActualTimeMillis, mZone.getID(), mNetworkCountryIsoCode);
	mNetworkCountryIsoCode);
	}		}

	private void checkFrozen() {		private void checkFrozen() {
	@@ -108,45 +140,37 @@ final class NitzStateMachineTestSupport {
	}		}
	}		}

	static class Builder {		public static class Builder {

	private long mInitialDeviceRealtimeMillis;
	private long mActualTimeMillis;		private long mActualTimeMillis;
	private String mZoneId;		private String mZoneId;
	private String mCountryIsoCode;		private String mCountryIsoCode;

	Builder setDeviceRealtimeMillis(long realtimeMillis) {		public Builder setActualTimeUtc(int year, int monthInYear, int day, int hourOfDay,
	mInitialDeviceRealtimeMillis = realtimeMillis;
	return this;
	}

	Builder setActualTimeUtc(int year, int monthInYear, int day, int hourOfDay,
	int minute, int second) {		int minute, int second) {
	mActualTimeMillis = createUtcTime(year, monthInYear, day, hourOfDay, minute,		mActualTimeMillis = createUtcTime(year, monthInYear, day, hourOfDay, minute,
	second);		second);
	return this;		return this;
	}		}

	Builder setTimeZone(String zoneId) {		public Builder setTimeZone(String zoneId) {
	mZoneId = zoneId;		mZoneId = zoneId;
	return this;		return this;
	}		}

	Builder setCountryIso(String isoCode) {		public Builder setCountryIso(String isoCode) {
	mCountryIsoCode = isoCode;		mCountryIsoCode = isoCode;
	return this;		return this;
	}		}

	Scenario buildFrozen() {		public Scenario buildFrozen() {
	return new Scenario(		return new Scenario(true /* frozen */, mActualTimeMillis, mZoneId, mCountryIsoCode);
	true /* frozen */, mInitialDeviceRealtimeMillis, mActualTimeMillis, mZoneId,
	mCountryIsoCode);
	}		}
	}		}
	}		}

	/** A fake implementation of {@link DeviceState}. */		/** A fake implementation of {@link DeviceState}. */
	static class FakeDeviceState implements DeviceState {		public static class FakeDeviceState implements DeviceState {

	public boolean ignoreNitz;		public boolean ignoreNitz;
	public int nitzUpdateDiffMillis;		public int nitzUpdateDiffMillis;
	@@ -155,6 +179,14 @@ final class NitzStateMachineTestSupport {
	public long elapsedRealtime;		public long elapsedRealtime;
	public long currentTimeMillis;		public long currentTimeMillis;

			public FakeDeviceState() {
			// Set sensible defaults fake device state.
			ignoreNitz = false;
			nitzUpdateDiffMillis = 2000;
			nitzUpdateSpacingMillis = 1000 * 60 * 10;
			elapsedRealtime = ARBITRARY_REALTIME_MILLIS;
			}

	@Override		@Override
	public int getNitzUpdateSpacingMillis() {		public int getNitzUpdateSpacingMillis() {
	return nitzUpdateSpacingMillis;		return nitzUpdateSpacingMillis;
	@@ -185,11 +217,19 @@ final class NitzStateMachineTestSupport {
	return currentTimeMillis;		return currentTimeMillis;
	}		}

			public void simulateTimeIncrement(int timeIncrementMillis) {
			if (timeIncrementMillis <= 0) {
			fail("elapsedRealtime clock must go forwards");
			}
			elapsedRealtime += timeIncrementMillis;
			currentTimeMillis += timeIncrementMillis;
			}

	}		}

	private NitzStateMachineTestSupport() {}		private NitzStateMachineTestSupport() {}

	static long createUtcTime(int year, int monthInYear, int day, int hourOfDay, int minute,		public static long createUtcTime(int year, int monthInYear, int day, int hourOfDay, int minute,
	int second) {		int second) {
	Calendar cal = new GregorianCalendar(zone("Etc/UTC"));		Calendar cal = new GregorianCalendar(zone("Etc/UTC"));
	cal.clear();		cal.clear();
	@@ -197,14 +237,14 @@ final class NitzStateMachineTestSupport {
	return cal.getTimeInMillis();		return cal.getTimeInMillis();
	}		}

	static TimestampedValue<Long> createTimeSignalFromNitzSignal(		public static TimestampedValue<Long> createTimeSignalFromNitzSignal(
	TimestampedValue<NitzData> nitzSignal) {		TimestampedValue<NitzData> nitzSignal) {
	return new TimestampedValue<>(		return new TimestampedValue<>(
	nitzSignal.getReferenceTimeMillis(),		nitzSignal.getReferenceTimeMillis(),
	nitzSignal.getValue().getCurrentTimeInMillis());		nitzSignal.getValue().getCurrentTimeInMillis());
	}		}

	static TimeZone zone(String zoneId) {		public static TimeZone zone(String zoneId) {
	TimeZone timeZone = TimeZone.getFrozenTimeZone(zoneId);		TimeZone timeZone = TimeZone.getFrozenTimeZone(zoneId);
	if (timeZone.getID().equals(TimeZone.UNKNOWN_ZONE_ID)) {		if (timeZone.getID().equals(TimeZone.UNKNOWN_ZONE_ID)) {
	fail(zoneId + " is not a valid zone");		fail(zoneId + " is not a valid zone");