summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2019-12-02 18:05:31 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-12-02 18:05:31 +0000
commit7d64d299a3bcb60fe8b0eecf5d98e7d4bb0205cc (patch)
treec81cf66e83f3ad6d91610a9f6bb2830d4d90721b
parent139a12048770f2dcd97ea9e7e26ff393519f1b03 (diff)
parent44fcf29a027005d10abb47f9c8a33f16c2a948d9 (diff)
downloadbase-7d64d299a3bcb60fe8b0eecf5d98e7d4bb0205cc.tar.gz
Merge "Fix DevicePolicyManager setTime() behavior / tests"
-rw-r--r--services/core/java/com/android/server/timedetector/TimeDetectorService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/timedetector/TimeDetectorService.java b/services/core/java/com/android/server/timedetector/TimeDetectorService.java
index 09309751d493..7f5b4030306f 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 @@ public final class TimeDetectorService extends ITimeDetectorService.Stub {
}
private void enforceSuggestManualTimePermission() {
- mContext.enforceCallingPermission(android.Manifest.permission.SET_TIME, "set time");
+ mContext.enforceCallingOrSelfPermission(android.Manifest.permission.SET_TIME, "set time");
}
}