commit 7d64d299a3bcb60fe8b0eecf5d98e7d4bb0205cc
author Neil Fuller <nfuller@google.com> Mon Dec 02 18:05:31 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 02 18:05:31 2019 +0000
tree c81cf66e83f3ad6d91610a9f6bb2830d4d90721b
parent 139a12048770f2dcd97ea9e7e26ff393519f1b03
parent 44fcf29a027005d10abb47f9c8a33f16c2a948d9

Merge "Fix DevicePolicyManager setTime() behavior / tests"

services/core/java/com/android/server/timedetector/TimeDetectorService.java

diff --git a/services/core/java/com/android/server/timedetector/TimeDetectorService.java b/services/core/java/com/android/server/timedetector/TimeDetectorService.java
index 0930975..7f5b403 100644
--- a/services/core/java/com/android/server/timedetector/TimeDetectorService.java
+++ b/services/core/java/com/android/server/timedetector/TimeDetectorService.java
@@ -149,6 +149,6 @@
     }
 
     private void enforceSuggestManualTimePermission() {
-        mContext.enforceCallingPermission(android.Manifest.permission.SET_TIME, "set time");
+        mContext.enforceCallingOrSelfPermission(android.Manifest.permission.SET_TIME, "set time");
     }
 }