From baf1c3df80499b6c9895a0988dfc0e6fd602674e 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 ++++++++++++++++ core/java/android/app/timezone/Callback.java | 1 - .../app/timezone/DistroFormatVersion.java | 1 - .../android/app/timezone/DistroRulesVersion.java | 1 - core/java/android/app/timezone/RulesManager.java | 1 - core/java/android/app/timezone/RulesState.java | 1 - .../app/timezone/RulesUpdaterContract.java | 1 - .../provider/TimeZoneRulesDataContract.java | 3 ++- 8 files changed, 18 insertions(+), 7 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index e6675f6780c19..7bb8604d72ca0 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -38545,6 +38545,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/app/timezone/Callback.java b/core/java/android/app/timezone/Callback.java index b51e5bad0f69c..aea8038056ab5 100644 --- a/core/java/android/app/timezone/Callback.java +++ b/core/java/android/app/timezone/Callback.java @@ -27,7 +27,6 @@ import java.lang.annotation.RetentionPolicy; * * @hide */ -// TODO(nfuller): Expose necessary APIs for OEMs with @SystemApi. http://b/31008728 public abstract class Callback { @Retention(RetentionPolicy.SOURCE) diff --git a/core/java/android/app/timezone/DistroFormatVersion.java b/core/java/android/app/timezone/DistroFormatVersion.java index e879e8f8adbc6..be732e4c0188e 100644 --- a/core/java/android/app/timezone/DistroFormatVersion.java +++ b/core/java/android/app/timezone/DistroFormatVersion.java @@ -35,7 +35,6 @@ import android.os.Parcelable; * * @hide */ -// TODO(nfuller): Expose necessary APIs for OEMs with @SystemApi. http://b/31008728 public final class DistroFormatVersion implements Parcelable { private final int mMajorVersion; diff --git a/core/java/android/app/timezone/DistroRulesVersion.java b/core/java/android/app/timezone/DistroRulesVersion.java index 1eb9f45f48f12..a680594657ae7 100644 --- a/core/java/android/app/timezone/DistroRulesVersion.java +++ b/core/java/android/app/timezone/DistroRulesVersion.java @@ -36,7 +36,6 @@ import android.os.Parcelable; * * @hide */ -// TODO(nfuller): Expose necessary APIs for OEMs with @SystemApi. http://b/31008728 public final class DistroRulesVersion implements Parcelable { private final String mRulesVersion; diff --git a/core/java/android/app/timezone/RulesManager.java b/core/java/android/app/timezone/RulesManager.java index 649d894ca6857..ad9b698a8fd7d 100644 --- a/core/java/android/app/timezone/RulesManager.java +++ b/core/java/android/app/timezone/RulesManager.java @@ -64,7 +64,6 @@ import java.util.Arrays; * {@link Context#TIME_ZONE_RULES_MANAGER_SERVICE}. * @hide */ -// TODO(nfuller): Expose necessary APIs for OEMs with @SystemApi. http://b/31008728 public final class RulesManager { private static final String TAG = "timezone.RulesManager"; private static final boolean DEBUG = false; diff --git a/core/java/android/app/timezone/RulesState.java b/core/java/android/app/timezone/RulesState.java index 7d6ad2119fb7d..ec247ebf502f0 100644 --- a/core/java/android/app/timezone/RulesState.java +++ b/core/java/android/app/timezone/RulesState.java @@ -60,7 +60,6 @@ import java.lang.annotation.RetentionPolicy; * * @hide */ -// TODO(nfuller): Expose necessary APIs for OEMs with @SystemApi. http://b/31008728 public final class RulesState implements Parcelable { @Retention(RetentionPolicy.SOURCE) diff --git a/core/java/android/app/timezone/RulesUpdaterContract.java b/core/java/android/app/timezone/RulesUpdaterContract.java index 07b2f33ef5e0b..9c62f46b6e36a 100644 --- a/core/java/android/app/timezone/RulesUpdaterContract.java +++ b/core/java/android/app/timezone/RulesUpdaterContract.java @@ -27,7 +27,6 @@ import android.os.UserHandle; * * @hide */ -// TODO(nfuller): Expose necessary APIs for OEMs with @SystemApi. http://b/31008728 public final class RulesUpdaterContract { /** diff --git a/core/java/android/provider/TimeZoneRulesDataContract.java b/core/java/android/provider/TimeZoneRulesDataContract.java index a607563123108..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,7 +25,7 @@ import android.net.Uri; * * @hide */ -// TODO(nfuller): Expose necessary APIs for OEMs with @SystemApi. http://b/31008728 +@SystemApi public final class TimeZoneRulesDataContract { private TimeZoneRulesDataContract() {}