diff options
| author | 2017-04-07 02:28:19 +0000 | |
|---|---|---|
| committer | 2017-04-07 02:28:23 +0000 | |
| commit | c56d782e13be966e5efbe162f422d9cbc80ea874 (patch) | |
| tree | f1a034205797aecca14bf18c228513dfe3ab33da | |
| parent | eaf6b3b19384c3b14afc664fb79b24bed35a1c75 (diff) | |
| parent | df9bd4f7b351862dc839fe3299ddd98dcb1e6120 (diff) | |
Merge "Add UPDATE_TZDATA to config updater intents" into oc-dev
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/os/ConfigUpdate.java | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index ba96bec5fa85..53cd0ad47502 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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_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_TZDATA = "android.intent.action.UPDATE_TZDATA"; } public abstract class CountDownTimer { diff --git a/core/java/android/os/ConfigUpdate.java b/core/java/android/os/ConfigUpdate.java index 304ee292182d..793a90e1ece7 100644 --- a/core/java/android/os/ConfigUpdate.java +++ b/core/java/android/os/ConfigUpdate.java @@ -67,6 +67,13 @@ public final class ConfigUpdate { public static final String 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() { } } |