diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-02 07:27:55 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-02 07:27:55 +0000 |
| commit | 82b9931d6558fb143b6fb2cfa8fcbace16cf95d5 (patch) | |
| tree | 828567b0e193fddb7c83c29c383e8edae6bbf0ef | |
| parent | 5802a012c7a9c2bfa0d76d05847ccb9e7074e182 (diff) | |
| parent | 27412bf7d7fb8a4209fa7e56525491f137bff9de (diff) | |
| download | TimeZoneData-82b9931d6558fb143b6fb2cfa8fcbace16cf95d5.tar.gz | |
release-request-ceffd4a6-d719-491c-b078-6ce33cda5fb8-for-git_oc-mr1-release-4237114 snap-temp-L83200000088245566
Change-Id: I34905484250a3be96b31a45ebf112a0b7b02e856
| -rw-r--r-- | Android.mk | 3 | ||||
| -rw-r--r-- | src/main/com/android/timezone/data/TimeZoneRulesDataProvider.java | 8 |
2 files changed, 6 insertions, 5 deletions
@@ -22,7 +22,8 @@ LOCAL_MODULE := time_zone_distro_provider LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under, src/main) LOCAL_PROGUARD_FLAG_FILES := $(LOCAL_PATH)/proguard.cfg -LOCAL_STATIC_JAVA_LIBRARIES := time_zone_distro +LOCAL_STATIC_JAVA_LIBRARIES := time_zone_distro android-support-annotations +LOCAL_SDK_VERSION := system_current include $(BUILD_STATIC_JAVA_LIBRARY) include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/src/main/com/android/timezone/data/TimeZoneRulesDataProvider.java b/src/main/com/android/timezone/data/TimeZoneRulesDataProvider.java index ac5fc5f..b97a985 100644 --- a/src/main/com/android/timezone/data/TimeZoneRulesDataProvider.java +++ b/src/main/com/android/timezone/data/TimeZoneRulesDataProvider.java @@ -20,8 +20,6 @@ import com.android.timezone.distro.DistroException; import com.android.timezone.distro.DistroVersion; import com.android.timezone.distro.TimeZoneDistro; -import android.annotation.NonNull; -import android.annotation.Nullable; import android.content.ContentProvider; import android.content.ContentValues; import android.content.Context; @@ -35,6 +33,8 @@ import android.os.Bundle; import android.os.ParcelFileDescriptor; import android.provider.TimeZoneRulesDataContract; import android.provider.TimeZoneRulesDataContract.Operation; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import java.io.File; import java.io.FileNotFoundException; @@ -111,10 +111,10 @@ public final class TimeZoneRulesDataProvider extends ContentProvider { // Use readPermission only to implement permissions. throw new SecurityException("Use android:readPermission only"); } - if (!android.Manifest.permission.UPDATE_TIME_ZONE_RULES.equals(info.readPermission)) { + if (!TimeZoneRulesDataContract.READER_PERMISSION.equals(info.readPermission)) { // Writing is not supported. throw new SecurityException("android:readPermission must be set to \"" - + android.Manifest.permission.UPDATE_TIME_ZONE_RULES + + TimeZoneRulesDataContract.READER_PERMISSION + "\" is: " + info.readPermission); } |