From 0ab8a0d27b7413e29bb4a5fd1c1b844ec52f526b Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Mon, 3 Jul 2017 14:38:50 +0100 Subject: [PATCH] Add TimeZoneRulesDataContract to system API Add TimeZoneRulesDataContract to system API and remove TODOs to add other classes that should not now be needed in the system API (since they are used by a platform-only app). Bug: 31008728 Test: make droid Change-Id: I600e7b08853b86b27463193411cf85207ae09ce8 --- api/system-current.txt | 16 ++++++++++++++++ .../provider/TimeZoneRulesDataContract.java | 2 ++ 2 files changed, 18 insertions(+) diff --git a/api/system-current.txt b/api/system-current.txt index 8f19a687c34dd..da88eec8cdd13 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -38525,6 +38525,22 @@ package android.provider { field public static final java.lang.String TYPE = "type"; } + public final class TimeZoneRulesDataContract { + field public static final java.lang.String AUTHORITY = "com.android.timezone"; + } + + public static final class TimeZoneRulesDataContract.Operation { + field public static final java.lang.String COLUMN_DISTRO_MAJOR_VERSION = "distro_major_version"; + field public static final java.lang.String COLUMN_DISTRO_MINOR_VERSION = "distro_minor_version"; + field public static final java.lang.String COLUMN_REVISION = "revision"; + field public static final java.lang.String COLUMN_RULES_VERSION = "rules_version"; + field public static final java.lang.String COLUMN_TYPE = "type"; + field public static final android.net.Uri CONTENT_URI; + field public static final java.lang.String TYPE_INSTALL = "INSTALL"; + field public static final java.lang.String TYPE_NO_OP = "NOOP"; + field public static final java.lang.String TYPE_UNINSTALL = "UNINSTALL"; + } + public class UserDictionary { ctor public UserDictionary(); field public static final java.lang.String AUTHORITY = "user_dictionary"; diff --git a/core/java/android/provider/TimeZoneRulesDataContract.java b/core/java/android/provider/TimeZoneRulesDataContract.java index 789638523905c..33d25880226eb 100644 --- a/core/java/android/provider/TimeZoneRulesDataContract.java +++ b/core/java/android/provider/TimeZoneRulesDataContract.java @@ -16,6 +16,7 @@ package android.provider; +import android.annotation.SystemApi; import android.net.Uri; /** @@ -24,6 +25,7 @@ import android.net.Uri; * * @hide */ +@SystemApi public final class TimeZoneRulesDataContract { private TimeZoneRulesDataContract() {}