diff options
| author | 2019-12-02 16:37:28 +0000 | |
|---|---|---|
| committer | 2019-12-02 16:45:40 +0000 | |
| commit | 44fcf29a027005d10abb47f9c8a33f16c2a948d9 (patch) | |
| tree | fc648c8482ecdf0cdd5d47c42e1a7e02b3f7eafc | |
| parent | 5f01cb6ddca16e231c9ce57baa6949c075b3cc05 (diff) | |
Fix DevicePolicyManager setTime() behavior / tests
Fix DevicePolicyManagerService setTime() behavior and associated CTS
tests. Since change ID If48d465fce04c094a997b25c8b62fcf0c3386ebe,
DevicePolicyManagerService calls TimeDetector.suggestManualTime().
Before doing so it clears client permissions so it is reliant on system
server permissions. The permission check for suggestManualTime() should
therefore be a enforceCallingOrSelfPermission() not a
enforceCallingPermission().
Bug: 145508391
Bug: 140712361
Test: atest com.android.cts.devicepolicy.DeviceOwnerTest#testSetTime
Change-Id: I20678e145127fd67f356f1c29abc30b484278231
| -rw-r--r-- | services/core/java/com/android/server/timedetector/TimeDetectorService.java | 2 |
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"); } } |