Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49b607a6 authored Apr 07, 2017 by Chad Brubaker Committed by android-build-merger Apr 07, 2017

Merge "Add UPDATE_TZDATA to config updater intents" into oc-dev

am: c56d782e

Change-Id: I14d241e63ead50651ca21aa1d28bce3ba019b5fc

parents 574642fe c56d782e

api/system-current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -33595,6 +33595,7 @@ package android.os {
	field public static final java.lang.String ACTION_UPDATE_INTENT_FIREWALL = "android.intent.action.UPDATE_INTENT_FIREWALL";		field public static final java.lang.String ACTION_UPDATE_INTENT_FIREWALL = "android.intent.action.UPDATE_INTENT_FIREWALL";
	field public static final java.lang.String ACTION_UPDATE_PINS = "android.intent.action.UPDATE_PINS";		field public static final java.lang.String ACTION_UPDATE_PINS = "android.intent.action.UPDATE_PINS";
	field public static final java.lang.String ACTION_UPDATE_SMS_SHORT_CODES = "android.intent.action.UPDATE_SMS_SHORT_CODES";		field public static final java.lang.String ACTION_UPDATE_SMS_SHORT_CODES = "android.intent.action.UPDATE_SMS_SHORT_CODES";
			field public static final java.lang.String ACTION_UPDATE_TZDATA = "android.intent.action.UPDATE_TZDATA";
	}		}

	public abstract class CountDownTimer {		public abstract class CountDownTimer {

core/java/android/os/ConfigUpdate.java

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -67,6 +67,13 @@ public final class ConfigUpdate {
	public static final String ACTION_UPDATE_CT_LOGS		public static final String ACTION_UPDATE_CT_LOGS
	= "android.intent.action.UPDATE_CT_LOGS";		= "android.intent.action.UPDATE_CT_LOGS";

			/**
			* Update system wide timezone data.
			* @hide
			*/
			@SystemApi
			public static final String ACTION_UPDATE_TZDATA = "android.intent.action.UPDATE_TZDATA";

	private ConfigUpdate() {		private ConfigUpdate() {
	}		}
	}		}