Merge "Make NewNitzStateMachine the only impl" (3a45b007) · Commits · e / os / android_frameworks_opt_telephony

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

+6 −19

Original line number	Diff line number	Diff line
		@@ -358,27 +358,14 @@ 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) {
		// 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 (!TimeServiceHelper.isTimeZoneSettingInitializedStatic()) {
		String zoneId = defaultTimeZoneForMcc(mcc);
		if (zoneId != null && zoneId.length() > 0) {
		// Set time zone based on MCC
		NewTimeServiceHelper.setDeviceTimeZoneStatic(context, zoneId);
		TimeServiceHelper.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/NewNitzStateMachine.java→src/java/com/android/internal/telephony/NitzStateMachineImpl.java

+6 −6

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 TimeServiceHelper(phone.getContext()),
		new DeviceState(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) {

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

deleted100644 → 0

+0 −534

File deleted.

Preview size limit exceeded, changes collapsed.

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

deleted100644 → 0

+0 −193

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 android.app.AlarmManager;
		import android.content.ContentResolver;
		import android.content.Context;
		import android.content.Intent;
		import android.database.ContentObserver;
		import android.os.Handler;
		import android.os.SystemClock;
		import android.os.SystemProperties;
		import android.os.UserHandle;
		import android.provider.Settings;

		/**
		* An interface to various time / time zone detection behaviors that should be centralized into a
		* new service.
		*/
		// Non-final to allow mocking.
		public class OldTimeServiceHelper {

		/**
		* Callback interface for automatic detection enable/disable changes.
		*/
		public interface Listener {
		/**
		* Automatic time detection has been enabled or disabled.
		*/
		void onTimeDetectionChange(boolean enabled);

		/**
		* Automatic time zone detection has been enabled or disabled.
		*/
		void onTimeZoneDetectionChange(boolean enabled);
		}

		private static final String TIMEZONE_PROPERTY = "persist.sys.timezone";

		private final Context mContext;
		private final ContentResolver mCr;

		private Listener mListener;

		/** Creates a TimeServiceHelper */
		public OldTimeServiceHelper(Context context) {
		mContext = context;
		mCr = context.getContentResolver();
		}

		/**
		* Sets a listener that will be called when the automatic time / time zone detection setting
		* changes.
		*/
		public void setListener(Listener listener) {
		if (listener == null) {
		throw new NullPointerException("listener==null");
		}
		if (mListener != null) {
		throw new IllegalStateException("listener already set");
		}
		this.mListener = listener;
		mCr.registerContentObserver(
		Settings.Global.getUriFor(Settings.Global.AUTO_TIME), true,
		new ContentObserver(new Handler()) {
		public void onChange(boolean selfChange) {
		listener.onTimeDetectionChange(isTimeDetectionEnabled());
		}
		});
		mCr.registerContentObserver(
		Settings.Global.getUriFor(Settings.Global.AUTO_TIME_ZONE), true,
		new ContentObserver(new Handler()) {
		public void onChange(boolean selfChange) {
		listener.onTimeZoneDetectionChange(isTimeZoneDetectionEnabled());
		}
		});
		}

		/**
		* Returns the same value as {@link System#currentTimeMillis()}.
		*/
		public long currentTimeMillis() {
		return System.currentTimeMillis();
		}

		/**
		* Returns the same value as {@link SystemClock#elapsedRealtime()}.
		*/
		public long elapsedRealtime() {
		return SystemClock.elapsedRealtime();
		}

		/**
		* Returns true if the device has an explicit time zone set.
		*/
		public boolean isTimeZoneSettingInitialized() {
		return isTimeZoneSettingInitializedStatic();

		}

		/**
		* Returns true if automatic time detection is enabled in settings.
		*/
		public boolean isTimeDetectionEnabled() {
		try {
		return Settings.Global.getInt(mCr, Settings.Global.AUTO_TIME) > 0;
		} catch (Settings.SettingNotFoundException snfe) {
		return true;
		}
		}

		/**
		* Returns true if automatic time zone detection is enabled in settings.
		*/
		public boolean isTimeZoneDetectionEnabled() {
		try {
		return Settings.Global.getInt(mCr, Settings.Global.AUTO_TIME_ZONE) > 0;
		} catch (Settings.SettingNotFoundException snfe) {
		return true;
		}
		}

		/**
		* Set the device time zone and send out a sticky broadcast so the system can
		* determine if the timezone was set by the carrier.
		*
		* @param zoneId timezone set by carrier
		*/
		public void setDeviceTimeZone(String zoneId) {
		setDeviceTimeZoneStatic(mContext, zoneId);
		}

		/**
		* Set the time and Send out a sticky broadcast so the system can determine
		* if the time was set by the carrier.
		*
		* @param time time set by network
		*/
		public void setDeviceTime(long time) {
		SystemClock.setCurrentTimeMillis(time);
		Intent intent = new Intent(TelephonyIntents.ACTION_NETWORK_SET_TIME);
		intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING);
		intent.putExtra("time", time);
		mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL);
		}

		/**
		* Static implementation of isTimeZoneSettingInitialized() for use from {@link MccTable}. This
		* is a hack to deflake TelephonyTests when running on a device with a real SIM: in that
		* situation real service events may come in while a TelephonyTest is running, leading to flakes
		* as the real / fake instance of TimeServiceHelper is swapped in and out from
		* {@link TelephonyComponentFactory}.
		*/
		static boolean isTimeZoneSettingInitializedStatic() {
		// 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.

		String timeZoneId = SystemProperties.get(TIMEZONE_PROPERTY);
		return timeZoneId != null && timeZoneId.length() > 0 && !timeZoneId.equals("GMT");
		}

		/**
		* Static method for use by MccTable. See {@link #isTimeZoneSettingInitializedStatic()} for
		* explanation.
		*/
		static void setDeviceTimeZoneStatic(Context context, String zoneId) {
		AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
		alarmManager.setTimeZone(zoneId);
		Intent intent = new Intent(TelephonyIntents.ACTION_NETWORK_SET_TIMEZONE);
		intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING);
		intent.putExtra("time-zone", zoneId);
		context.sendStickyBroadcastAsUser(intent, UserHandle.ALL);
		}
		}

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

+1 −9

Original line number	Diff line number	Diff line
		@@ -292,19 +292,11 @@ public class TelephonyComponentFactory {
		return new EmergencyNumberTracker(phone, ci);
		}

		/**
		* Sets the NitzStateMachine implementation to use during implementation. This boolean
		* should be removed once the new implementation is stable.
		*/
		static final boolean USE_NEW_NITZ_STATE_MACHINE = true;

		/**
		* Returns a new {@link NitzStateMachine} instance.
		*/
		public NitzStateMachine makeNitzStateMachine(GsmCdmaPhone phone) {
		return USE_NEW_NITZ_STATE_MACHINE
		? new NewNitzStateMachine(phone)
		: new OldNitzStateMachine(phone);
		return new NitzStateMachineImpl(phone);
		}

		public SimActivationTracker makeSimActivationTracker(Phone phone) {