Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce0ca9c5 authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

Merge "Fix DevicePolicyManager setTime() behavior / tests" 

am: 7d64d299

Change-Id: Ibad73619b71c262e98889ef0dee2f278749a5258
parents 3b2c30fd 7d64d299

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

+1 −1
Original line number Diff line number Diff line
@@ -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");

    }

}