Merge "Explicitly specify 'milliseconds' as alarm manager's time unit." (7c48707a) · Commits · e / os / android_frameworks_base

core/java/android/app/AlarmManager.java

+26 −27

Original line number	Diff line number	Diff line
		@@ -16,10 +16,8 @@

		package android.app;

		import android.content.Context;
		import android.content.Intent;
		import android.os.RemoteException;
		import android.os.ServiceManager;

		/**
		* This class provides access to the system alarm services. These allow you
		@@ -117,8 +115,8 @@ public class AlarmManager
		*
		* @param type One of ELAPSED_REALTIME, ELAPSED_REALTIME_WAKEUP, RTC or
		* RTC_WAKEUP.
		* @param triggerAtTime Time the alarm should go off, using the
		* appropriate clock (depending on the alarm type).
		* @param triggerAtMillis time in milliseconds that the alarm should go
		* off, using the appropriate clock (depending on the alarm type).
		* @param operation Action to perform when the alarm goes off;
		* typically comes from {@link PendingIntent#getBroadcast
		* IntentSender.getBroadcast()}.
		@@ -134,9 +132,9 @@ public class AlarmManager
		* @see #RTC
		* @see #RTC_WAKEUP
		*/
		public void set(int type, long triggerAtTime, PendingIntent operation) {
		public void set(int type, long triggerAtMillis, PendingIntent operation) {
		try {
		mService.set(type, triggerAtTime, operation);
		mService.set(type, triggerAtMillis, operation);
		} catch (RemoteException ex) {
		}
		}
		@@ -169,9 +167,10 @@ public class AlarmManager
		*
		* @param type One of ELAPSED_REALTIME, ELAPSED_REALTIME_WAKEUP}, RTC or
		* RTC_WAKEUP.
		* @param triggerAtTime Time the alarm should first go off, using the
		* appropriate clock (depending on the alarm type).
		* @param interval Interval between subsequent repeats of the alarm.
		* @param triggerAtMillis time in milliseconds that the alarm should first
		* go off, using the appropriate clock (depending on the alarm type).
		* @param intervalMillis interval in milliseconds between subsequent repeats
		* of the alarm.
		* @param operation Action to perform when the alarm goes off;
		* typically comes from {@link PendingIntent#getBroadcast
		* IntentSender.getBroadcast()}.
		@@ -187,10 +186,10 @@ public class AlarmManager
		* @see #RTC
		* @see #RTC_WAKEUP
		*/
		public void setRepeating(int type, long triggerAtTime, long interval,
		PendingIntent operation) {
		public void setRepeating(int type, long triggerAtMillis,
		long intervalMillis, PendingIntent operation) {
		try {
		mService.setRepeating(type, triggerAtTime, interval, operation);
		mService.setRepeating(type, triggerAtMillis, intervalMillis, operation);
		} catch (RemoteException ex) {
		}
		}
		@@ -222,17 +221,17 @@ public class AlarmManager
		*
		* @param type One of ELAPSED_REALTIME, ELAPSED_REALTIME_WAKEUP}, RTC or
		* RTC_WAKEUP.
		* @param triggerAtTime Time the alarm should first go off, using the
		* appropriate clock (depending on the alarm type). This
		* is inexact: the alarm will not fire before this time,
		* but there may be a delay of almost an entire alarm
		* interval before the first invocation of the alarm.
		* @param interval Interval between subsequent repeats of the alarm. If
		* this is one of INTERVAL_FIFTEEN_MINUTES, INTERVAL_HALF_HOUR,
		* INTERVAL_HOUR, INTERVAL_HALF_DAY, or INTERVAL_DAY then the
		* alarm will be phase-aligned with other alarms to reduce
		* the number of wakeups. Otherwise, the alarm will be set
		* as though the application had called {@link #setRepeating}.
		* @param triggerAtMillis time in milliseconds that the alarm should first
		* go off, using the appropriate clock (depending on the alarm type). This
		* is inexact: the alarm will not fire before this time, but there may be a
		* delay of almost an entire alarm interval before the first invocation of
		* the alarm.
		* @param intervalMillis interval in milliseconds between subsequent repeats
		* of the alarm. If this is one of INTERVAL_FIFTEEN_MINUTES,
		* INTERVAL_HALF_HOUR, INTERVAL_HOUR, INTERVAL_HALF_DAY, or INTERVAL_DAY
		* then the alarm will be phase-aligned with other alarms to reduce the
		* number of wakeups. Otherwise, the alarm will be set as though the
		* application had called {@link #setRepeating}.
		* @param operation Action to perform when the alarm goes off;
		* typically comes from {@link PendingIntent#getBroadcast
		* IntentSender.getBroadcast()}.
		@@ -253,10 +252,10 @@ public class AlarmManager
		* @see #INTERVAL_HALF_DAY
		* @see #INTERVAL_DAY
		*/
		public void setInexactRepeating(int type, long triggerAtTime, long interval,
		PendingIntent operation) {
		public void setInexactRepeating(int type, long triggerAtMillis,
		long intervalMillis, PendingIntent operation) {
		try {
		mService.setInexactRepeating(type, triggerAtTime, interval, operation);
		mService.setInexactRepeating(type, triggerAtMillis, intervalMillis, operation);
		} catch (RemoteException ex) {
		}
		}