Merge "Fix DevicePolicyManager setTime() behavior / tests"

am: 7d64d299a3 Change-Id: Ibad73619b71c262e98889ef0dee2f278749a5258
2019-12-02 10:15:05 -08:00
parent 3b2c30fd30 7d64d299a3
commit ce0ca9c511
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");
    }
 }