From 39ca5b870bffad0e75c81ab794788a24806895b9 Mon Sep 17 00:00:00 2001
From: Neil Fuller <nfuller@google.com>
Date: Fri, 11 Aug 2017 14:28:32 +0100
Subject: [PATCH] Change SystemApi as per API council feedback

API council have requested a manifest constant be added
to the SystemApi directly in preference to an indirect
SystemApi constant here:
android.provider.TimeZoneRulesDataContract.READER_PERMISSION.

This is the third of three changes to (1) add the new constant,
(2) switch over code using the constant, (3) remove the old
constant.

Bug: 64568899
Test: None, build only
Change-Id: I75731b13ce2046556d6148aa5707cab6ed9cf9bf
(cherry picked from commit db57c03434c52d7596fbeae83e30044a6ffe5dbb)
---
 api/system-current.txt                                    | 1 -
 core/java/android/provider/TimeZoneRulesDataContract.java | 6 ------
 2 files changed, 7 deletions(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index e4eea84eca771..c96b7dd588ddc 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -38662,7 +38662,6 @@ package android.provider {
 
   public final class TimeZoneRulesDataContract {
     field public static final java.lang.String AUTHORITY = "com.android.timezone";
-    field public static final java.lang.String READER_PERMISSION = "android.permission.UPDATE_TIME_ZONE_RULES";
   }
 
   public static final class TimeZoneRulesDataContract.Operation {
diff --git a/core/java/android/provider/TimeZoneRulesDataContract.java b/core/java/android/provider/TimeZoneRulesDataContract.java
index 7a5ae1d7af41a..33d25880226eb 100644
--- a/core/java/android/provider/TimeZoneRulesDataContract.java
+++ b/core/java/android/provider/TimeZoneRulesDataContract.java
@@ -40,12 +40,6 @@ public final class TimeZoneRulesDataContract {
     /** A content:// style uri to the authority for the time zone data content provider */
     private static final Uri AUTHORITY_URI = Uri.parse("content://" + AUTHORITY);
 
-    /**
-     * The permission that the reader of the ContentProvider must possess.
-     */
-    public static final String READER_PERMISSION =
-            android.Manifest.permission.UPDATE_TIME_ZONE_RULES;
-
     /**
      * Defines fields exposed through the {@link Operation#CONTENT_URI} for describing a time zone
      * distro operation.