Merge "Fix #62350081 - annotate permission requirements" into oc-dev

am: 42abe82bbb

Change-Id: I3b8415aac86f9dfd6457e5eca7dce904b1bfef7c
This commit is contained in:
Christopher Tate
2017-06-06 20:32:55 +00:00
committed by android-build-merger

View File

@@ -17,6 +17,7 @@
package android.app;
import android.annotation.IntDef;
import android.annotation.RequiresPermission;
import android.annotation.SdkConstant;
import android.annotation.SystemApi;
import android.annotation.SystemService;
@@ -596,6 +597,7 @@ public class AlarmManager {
/** @hide */
@SystemApi
@RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS)
public void set(@AlarmType int type, long triggerAtMillis, long windowMillis,
long intervalMillis, PendingIntent operation, WorkSource workSource) {
setImpl(type, triggerAtMillis, windowMillis, intervalMillis, 0, operation, null, null,
@@ -630,6 +632,7 @@ public class AlarmManager {
* @hide
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS)
public void set(@AlarmType int type, long triggerAtMillis, long windowMillis,
long intervalMillis, OnAlarmListener listener, Handler targetHandler,
WorkSource workSource) {