Merge "Fix DevicePolicyManager setTime() behavior / tests" am: 7d64d299a3 am: ce0ca9c511

am: a8002a17af Change-Id: I00be7bd4add00c3499fa4e862fb3508354735ff1
2019-12-02 10:25:31 -08:00
parent 15c81edf43 a8002a17af
commit 6f46b5e242
1 changed files with 1 additions and 1 deletions
--- 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");
    }
 }