Merge changes from topic "telephony_aosp_cp" am: a91a4aa087 (d30e90cf) · Commits · e / os / android_frameworks_opt_telephony

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

+7 −32

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.internal.telephony;

		import android.app.ActivityManager;
		import android.app.AlarmManager;
		import android.content.Context;
		import android.content.res.Configuration;
		import android.net.wifi.WifiManager;
		@@ -32,7 +31,7 @@ import com.android.internal.app.LocaleStore;
		import com.android.internal.app.LocaleStore.LocaleInfo;

		import libcore.icu.ICU;
		import libcore.icu.TimeZoneNames;
		import libcore.util.TimeZoneFinder;

		import java.util.ArrayList;
		import java.util.Arrays;
		@@ -94,24 +93,8 @@ public final class MccTable {
		if (entry == null) {
		return null;
		}
		Locale locale = new Locale("", entry.mIso);
		String[] tz = TimeZoneNames.forLocale(locale);
		if (tz.length == 0) return null;

		String zoneName = tz[0];

		/* Use Australia/Sydney instead of Australia/Lord_Howe for Australia.
		* http://b/33228250
		* Todo: remove the code, see b/62418027
		*/
		if (mcc == 505 /* Australia / Norfolk Island */) {
		for (String zone : tz) {
		if (zone.contains("Sydney")) {
		zoneName = zone;
		}
		}
		}
		return zoneName;
		final String lowerCaseCountryCode = entry.mIso;
		return TimeZoneFinder.getInstance().lookupDefaultTimeZoneIdByCountry(lowerCaseCountryCode);
		}

		/**
		@@ -375,21 +358,13 @@ public final class MccTable {
		* @param mcc Mobile Country Code of the SIM or SIM-like entity (build prop on CDMA)
		*/
		private static void setTimezoneFromMccIfNeeded(Context context, int mcc) {
		String timezone = SystemProperties.get(ServiceStateTracker.TIMEZONE_PROPERTY);
		// timezone.equals("GMT") will be true and only true if the timezone was
		// set to a default value by the system server (when starting, system server.
		// sets the persist.sys.timezone to "GMT" if it's not set)."GMT" is not used by
		// any code that sets it explicitly (in case where something sets GMT explicitly,
		// "Etc/GMT" Olsen ID would be used).
		// TODO(b/64056758): Remove "timezone.equals("GMT")" hack when there's a
		// better way of telling if the value has been defaulted.
		if (timezone == null \|\| timezone.length() == 0 \|\| timezone.equals("GMT")) {
		TimeServiceHelper timeServiceHelper =
		TelephonyComponentFactory.getInstance().makeTimeServiceHelper(context);
		if (!timeServiceHelper.isTimeZoneSettingInitialized()) {
		String zoneId = defaultTimeZoneForMcc(mcc);
		if (zoneId != null && zoneId.length() > 0) {
		// Set time zone based on MCC
		AlarmManager alarm =
		(AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
		alarm.setTimeZone(zoneId);
		timeServiceHelper.setDeviceTimeZone(zoneId);
		Slog.d(LOG_TAG, "timezone set to " + zoneId);
		}
		}

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

0 → 100644

+277 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.internal.telephony;

		import static com.android.internal.annotations.VisibleForTesting.Visibility.PACKAGE;

		import android.telephony.Rlog;

		import com.android.internal.annotations.VisibleForTesting;

		import java.util.Calendar;
		import java.util.Date;
		import java.util.TimeZone;

		/**
		* Represents NITZ data. Various static methods are provided to help with parsing and intepretation
		* of NITZ data.
		*
		* {@hide}
		*/
		@VisibleForTesting(visibility = PACKAGE)
		public final class NitzData {
		private static final String LOG_TAG = ServiceStateTracker.LOG_TAG;
		private static final int MS_PER_HOUR = 60 * 60 * 1000;
		private static final int MS_PER_QUARTER_HOUR = 15 * 60 * 1000;

		/* Time stamp after 19 January 2038 is not supported under 32 bit */
		private static final int MAX_NITZ_YEAR = 2037;

		// Stored For logging / debugging only.
		private final String mOriginalString;

		private final int mZoneOffset;

		private final Integer mDstOffset;

		private final long mCurrentTimeMillis;

		private final TimeZone mEmulatorHostTimeZone;

		private NitzData(String originalString, int zoneOffsetMillis, Integer dstOffsetMillis,
		long utcTimeMillis, TimeZone timeZone) {
		if (originalString == null) {
		throw new NullPointerException("originalString==null");
		}
		this.mOriginalString = originalString;
		this.mZoneOffset = zoneOffsetMillis;
		this.mDstOffset = dstOffsetMillis;
		this.mCurrentTimeMillis = utcTimeMillis;
		this.mEmulatorHostTimeZone = timeZone;
		}

		/**
		* Parses the supplied NITZ string, returning the encoded data.
		*/
		public static NitzData parse(String nitz) {
		// "yy/mm/dd,hh:mm:ss(+/-)tz[,dt[,tzid]]"
		// tz, dt are in number of quarter-hours

		try {
		/* NITZ time (hour:min:sec) will be in UTC but it supplies the timezone
		* offset as well (which we won't worry about until later) */
		Calendar c = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
		c.clear();
		c.set(Calendar.DST_OFFSET, 0);

		String[] nitzSubs = nitz.split("[/:,+-]");

		int year = 2000 + Integer.parseInt(nitzSubs[0]);
		if (year > MAX_NITZ_YEAR) {
		if (ServiceStateTracker.DBG) {
		Rlog.e(LOG_TAG, "NITZ year: " + year + " exceeds limit, skip NITZ time update");
		}
		return null;
		}
		c.set(Calendar.YEAR, year);

		// month is 0 based!
		int month = Integer.parseInt(nitzSubs[1]) - 1;
		c.set(Calendar.MONTH, month);

		int date = Integer.parseInt(nitzSubs[2]);
		c.set(Calendar.DATE, date);

		int hour = Integer.parseInt(nitzSubs[3]);
		c.set(Calendar.HOUR, hour);

		int minute = Integer.parseInt(nitzSubs[4]);
		c.set(Calendar.MINUTE, minute);

		int second = Integer.parseInt(nitzSubs[5]);
		c.set(Calendar.SECOND, second);

		// The offset received from NITZ is the offset to add to get current local time.
		boolean sign = (nitz.indexOf('-') == -1);
		int totalUtcOffsetQuarterHours = Integer.parseInt(nitzSubs[6]);
		int totalUtcOffsetMillis =
		(sign ? 1 : -1) * totalUtcOffsetQuarterHours * MS_PER_QUARTER_HOUR;

		// DST correction is already applied to the UTC offset. We could subtract it if we
		// wanted the raw offset.
		Integer dstAdjustmentQuarterHours =
		(nitzSubs.length >= 8) ? Integer.parseInt(nitzSubs[7]) : null;
		Integer dstAdjustmentMillis = null;
		if (dstAdjustmentQuarterHours != null) {
		dstAdjustmentMillis = dstAdjustmentQuarterHours * MS_PER_QUARTER_HOUR;
		}

		// As a special extension, the Android emulator appends the name of
		// the host computer's timezone to the nitz string. this is zoneinfo
		// timezone name of the form Area!Location or Area!Location!SubLocation
		// so we need to convert the ! into /
		TimeZone zone = null;
		if (nitzSubs.length >= 9) {
		String tzname = nitzSubs[8].replace('!', '/');
		zone = TimeZone.getTimeZone(tzname);
		}
		return new NitzData(nitz, totalUtcOffsetMillis, dstAdjustmentMillis,
		c.getTimeInMillis(), zone);
		} catch (RuntimeException ex) {
		Rlog.e(LOG_TAG, "NITZ: Parsing NITZ time " + nitz + " ex=" + ex);
		return null;
		}
		}

		/** A method for use in tests to create NitzData instances. */
		public static NitzData createForTests(int zoneOffsetMillis, Integer dstOffsetMillis,
		long utcTimeMillis, TimeZone timeZone) {
		return new NitzData("Test data", zoneOffsetMillis, dstOffsetMillis, utcTimeMillis,
		timeZone);
		}

		/**
		* Returns the current time as the number of milliseconds since the beginning of the Unix epoch
		* (1/1/1970 00:00:00 UTC).
		*/
		public long getCurrentTimeInMillis() {
		return mCurrentTimeMillis;
		}

		/**
		* Returns the total offset to apply to the {@link #getCurrentTimeInMillis()} to arrive at a
		* local time.
		*/
		public int getLocalOffsetMillis() {
		return mZoneOffset;
		}

		/**
		* Returns the offset (already included in {@link #getLocalOffsetMillis()}) associated with
		* Daylight Savings Time (DST). This field is optional: {@code null} means the DST offset is
		* unknown.
		*/
		public Integer getDstAdjustmentMillis() {
		return mDstOffset;
		}

		/**
		* Returns {@link true} if the time is in Daylight Savings Time (DST), {@link false} if it is
		* unknown or not in DST. See {@link #getDstAdjustmentMillis()}.
		*/
		public boolean isDst() {
		return mDstOffset != null && mDstOffset != 0;
		}


		/**
		* Returns the time zone of the host computer when Android is running in an emulator. It is
		* {@code null} for real devices. This information is communicated via a non-standard Android
		* extension to NITZ.
		*/
		public TimeZone getEmulatorHostTimeZone() {
		return mEmulatorHostTimeZone;
		}

		/**
		* Using information present in the supplied {@link NitzData} object, guess the time zone.
		* 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 time zones are found.
		*/
		public static TimeZone guessTimeZone(NitzData nitzData) {
		int offset = nitzData.getLocalOffsetMillis();
		boolean dst = nitzData.isDst();
		long when = nitzData.getCurrentTimeInMillis();
		TimeZone guess = findTimeZone(offset, dst, when);
		if (guess == null) {
		// Couldn't find a proper timezone. Perhaps the DST data is wrong.
		guess = findTimeZone(offset, !dst, when);
		}
		return guess;
		}

		private static TimeZone findTimeZone(int offset, boolean dst, long when) {
		int rawOffset = offset;
		if (dst) {
		rawOffset -= MS_PER_HOUR;
		}
		String[] zones = TimeZone.getAvailableIDs(rawOffset);
		TimeZone guess = null;
		Date d = new Date(when);
		for (String zone : zones) {
		TimeZone tz = TimeZone.getTimeZone(zone);
		if (tz.getOffset(when) == offset && tz.inDaylightTime(d) == dst) {
		guess = tz;
		break;
		}
		}

		return guess;
		}

		@Override
		public boolean equals(Object o) {
		if (this == o) {
		return true;
		}
		if (o == null \|\| getClass() != o.getClass()) {
		return false;
		}

		NitzData nitzData = (NitzData) o;

		if (mZoneOffset != nitzData.mZoneOffset) {
		return false;
		}
		if (mCurrentTimeMillis != nitzData.mCurrentTimeMillis) {
		return false;
		}
		if (!mOriginalString.equals(nitzData.mOriginalString)) {
		return false;
		}
		if (mDstOffset != null ? !mDstOffset.equals(nitzData.mDstOffset)
		: nitzData.mDstOffset != null) {
		return false;
		}
		return mEmulatorHostTimeZone != null ? mEmulatorHostTimeZone
		.equals(nitzData.mEmulatorHostTimeZone) : nitzData.mEmulatorHostTimeZone == null;
		}

		@Override
		public int hashCode() {
		int result = mOriginalString.hashCode();
		result = 31 * result + mZoneOffset;
		result = 31 * result + (mDstOffset != null ? mDstOffset.hashCode() : 0);
		result = 31 * result + (int) (mCurrentTimeMillis ^ (mCurrentTimeMillis >>> 32));
		result = 31 * result + (mEmulatorHostTimeZone != null ? mEmulatorHostTimeZone.hashCode()
		: 0);
		return result;
		}

		@Override
		public String toString() {
		return "NitzData{"
		+ "mOriginalString=" + mOriginalString
		+ ", mZoneOffset=" + mZoneOffset
		+ ", mDstOffset=" + mDstOffset
		+ ", mCurrentTimeMillis=" + mCurrentTimeMillis
		+ ", mEmulatorHostTimeZone=" + mEmulatorHostTimeZone
		+ '}';
		}
		}

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

0 → 100644

+680 −0

File added.

Preview size limit exceeded, changes collapsed.

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

+77 −593

File changed.

Preview size limit exceeded, changes collapsed.

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

+14 −0

Original line number	Diff line number	Diff line
		@@ -61,6 +61,20 @@ public class TelephonyComponentFactory {
		return new ServiceStateTracker(phone, ci);
		}

		/**
		* Returns a new {@link NitzStateMachine} instance.
		*/
		public NitzStateMachine makeNitzStateMachine(GsmCdmaPhone phone) {
		return new NitzStateMachine(phone);
		}

		/**
		* Returns a new {@link TimeServiceHelper} instance.
		*/
		public TimeServiceHelper makeTimeServiceHelper(Context context) {
		return new TimeServiceHelper(context);
		}

		public SimActivationTracker makeSimActivationTracker(Phone phone) {
		return new SimActivationTracker(phone);
		}