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

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

Merge "Fix DevicePolicyManager setTime() behavior / tests" am: 7d64d299 am: ce0ca9c5 

am: a8002a17

Change-Id: I00be7bd4add00c3499fa4e862fb3508354735ff1
parents 15c81edf a8002a17

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -149,6 +149,6 @@ public final class TimeDetectorService extends ITimeDetectorService.Stub { 
    }

    }





    private void enforceSuggestManualTimePermission() {

    private void enforceSuggestManualTimePermission() {

        mContext.enforceCallingPermission(android.Manifest.permission.SET_TIME, "set time");

        mContext.enforceCallingOrSelfPermission(android.Manifest.permission.SET_TIME, "set time");

    }

    }

}
 
}