commit b214bc44f1942b957f60dad75517e07cede77f18
author Neil Fuller <nfuller@google.com> Mon Dec 18 16:57:22 2017 +0000
committer Neil Fuller <nfuller@google.com> Mon Feb 12 15:15:13 2018 +0000
tree 68de04489aa03c306d6423870ba6b386fe100ff0
parent d93e8866a3daf67b2eeea15ed8b88411b9119d26

Split query permission from update permission

Split time zone rules query permission from update permission.
This would allow an app like Settings to determine the current rules
update state, which would enable it to show the version of rules
the device came with, if there have been any updates and whether
a reboot is needed for changes to take effect.

Test: PTS: run -m PtsTimeZoneTestCases
Test: atest FrameworksServicesTests:RulesManagerServiceTest
Bug: 69443060
Change-Id: Ia5d31814d7caee842f5e28870fab61f7c7129386

services/core/java/com/android/server/timezone/RulesManagerService.java

diff --git a/services/core/java/com/android/server/timezone/RulesManagerService.java b/services/core/java/com/android/server/timezone/RulesManagerService.java
index 872d723..23c4a33 100644
--- a/services/core/java/com/android/server/timezone/RulesManagerService.java
+++ b/services/core/java/com/android/server/timezone/RulesManagerService.java
@@ -92,6 +92,9 @@
     @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE)
     static final String REQUIRED_UPDATER_PERMISSION =
             android.Manifest.permission.UPDATE_TIME_ZONE_RULES;
+    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE)
+    static final String REQUIRED_QUERY_PERMISSION =
+            android.Manifest.permission.QUERY_TIME_ZONE_RULES;
     private static final File SYSTEM_TZ_DATA_FILE = new File("/system/usr/share/zoneinfo/tzdata");
     private static final File TZ_DATA_DIR = new File("/data/misc/zoneinfo");
 
@@ -131,7 +134,7 @@
 
     @Override // Binder call
     public RulesState getRulesState() {
-        mPermissionHelper.enforceCallerHasPermission(REQUIRED_UPDATER_PERMISSION);
+        mPermissionHelper.enforceCallerHasPermission(REQUIRED_QUERY_PERMISSION);
 
         return getRulesStateInternal();
     }