Allow snooze/dismiss to always go through (b4aacfb2) · Commits · e / os / android_packages_apps_DeskClock

src/com/android/deskclock/AlarmInitReceiver.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@ public class AlarmInitReceiver extends BroadcastReceiver {

		// We need to increment the global id out of the async task to prevent
		// race conditions
		AlarmStateManager.updateGloablIntentId(context);
		AlarmStateManager.updateGlobalIntentId(context);
		AsyncHandler.post(new Runnable() {
		@Override public void run() {
		// Remove the snooze alarm after a boot.

src/com/android/deskclock/alarms/AlarmNotifications.java

+15 −14

Original line number	Diff line number	Diff line
		@@ -76,14 +76,15 @@ public final class AlarmNotifications {
		.setVisibility(Notification.VISIBILITY_PUBLIC);

		// Setup up hide notification
		Intent hideIntent = AlarmStateManager.createStateChangeIntent(context, "DELETE_TAG",
		instance, AlarmInstance.HIDE_NOTIFICATION_STATE);
		Intent hideIntent = AlarmStateManager.createStateChangeIntent(context,
		AlarmStateManager.ALARM_DELETE_TAG, instance,
		AlarmInstance.HIDE_NOTIFICATION_STATE);
		notification.setDeleteIntent(PendingIntent.getBroadcast(context, instance.hashCode(),
		hideIntent, PendingIntent.FLAG_UPDATE_CURRENT));

		// Setup up dismiss action
		Intent dismissIntent = AlarmStateManager.createStateChangeIntent(context, "DISMISS_TAG",
		instance, AlarmInstance.DISMISSED_STATE);
		Intent dismissIntent = AlarmStateManager.createStateChangeIntent(context,
		AlarmStateManager.ALARM_DISMISS_TAG, instance, AlarmInstance.DISMISSED_STATE);
		notification.addAction(R.drawable.ic_alarm_off_black,
		resources.getString(R.string.alarm_alert_dismiss_now_text),
		PendingIntent.getBroadcast(context, instance.hashCode(),
		@@ -115,8 +116,8 @@ public final class AlarmNotifications {
		.setVisibility(Notification.VISIBILITY_PUBLIC);

		// Setup up dismiss action
		Intent dismissIntent = AlarmStateManager.createStateChangeIntent(context, "DISMISS_TAG",
		instance, AlarmInstance.DISMISSED_STATE);
		Intent dismissIntent = AlarmStateManager.createStateChangeIntent(context,
		AlarmStateManager.ALARM_DISMISS_TAG, instance, AlarmInstance.DISMISSED_STATE);
		notification.addAction(R.drawable.ic_alarm_off_black,
		resources.getString(R.string.alarm_alert_dismiss_now_text),
		PendingIntent.getBroadcast(context, instance.hashCode(),
		@@ -149,8 +150,8 @@ public final class AlarmNotifications {
		.setVisibility(Notification.VISIBILITY_PUBLIC);

		// Setup up dismiss action
		Intent dismissIntent = AlarmStateManager.createStateChangeIntent(context, "DISMISS_TAG",
		instance, AlarmInstance.DISMISSED_STATE);
		Intent dismissIntent = AlarmStateManager.createStateChangeIntent(context,
		AlarmStateManager.ALARM_DISMISS_TAG, instance, AlarmInstance.DISMISSED_STATE);
		notification.addAction(R.drawable.ic_alarm_off_black,
		resources.getString(R.string.alarm_alert_dismiss_text),
		PendingIntent.getBroadcast(context, instance.hashCode(),
		@@ -182,8 +183,8 @@ public final class AlarmNotifications {
		.setVisibility(Notification.VISIBILITY_PUBLIC);

		// Setup dismiss intent
		Intent dismissIntent = AlarmStateManager.createStateChangeIntent(context, "DISMISS_TAG",
		instance, AlarmInstance.DISMISSED_STATE);
		Intent dismissIntent = AlarmStateManager.createStateChangeIntent(context,
		AlarmStateManager.ALARM_DISMISS_TAG, instance, AlarmInstance.DISMISSED_STATE);
		notification.setDeleteIntent(PendingIntent.getBroadcast(context, instance.hashCode(),
		dismissIntent, PendingIntent.FLAG_UPDATE_CURRENT));

		@@ -219,8 +220,8 @@ public final class AlarmNotifications {
		.setVisibility(Notification.VISIBILITY_PUBLIC);

		// Setup Snooze Action
		Intent snoozeIntent = AlarmStateManager.createStateChangeIntent(context, "SNOOZE_TAG",
		instance, AlarmInstance.SNOOZE_STATE);
		Intent snoozeIntent = AlarmStateManager.createStateChangeIntent(context,
		AlarmStateManager.ALARM_SNOOZE_TAG, instance, AlarmInstance.SNOOZE_STATE);
		PendingIntent snoozePendingIntent = PendingIntent.getBroadcast(context, instance.hashCode(),
		snoozeIntent,
		PendingIntent.FLAG_UPDATE_CURRENT);
		@@ -228,8 +229,8 @@ public final class AlarmNotifications {
		resources.getString(R.string.alarm_alert_snooze_text), snoozePendingIntent);

		// Setup Dismiss Action
		Intent dismissIntent = AlarmStateManager.createStateChangeIntent(context, "DISMISS_TAG",
		instance, AlarmInstance.DISMISSED_STATE);
		Intent dismissIntent = AlarmStateManager.createStateChangeIntent(context,
		AlarmStateManager.ALARM_DISMISS_TAG, instance, AlarmInstance.DISMISSED_STATE);
		PendingIntent dismissPendingIntent = PendingIntent.getBroadcast(context,
		instance.hashCode(), dismissIntent, PendingIntent.FLAG_UPDATE_CURRENT);
		notification.addAction(R.drawable.ic_alarm_off_black,

src/com/android/deskclock/alarms/AlarmStateManager.java

+15 −5

Original line number	Diff line number	Diff line
		@@ -111,8 +111,13 @@ public final class AlarmStateManager extends BroadcastReceiver {
		// Extra key to set the global broadcast id.
		private static final String ALARM_GLOBAL_ID_EXTRA = "intent.extra.alarm.global.id";

		// Intent category tags used to dismiss, snooze or delete an alarm
		public static final String ALARM_DISMISS_TAG = "DISMISS_TAG";
		public static final String ALARM_SNOOZE_TAG = "SNOOZE_TAG";
		public static final String ALARM_DELETE_TAG = "DELETE_TAG";

		// Intent category tag used when schedule state change intents in alarm manager.
		public static final String ALARM_MANAGER_TAG = "ALARM_MANAGER";
		private static final String ALARM_MANAGER_TAG = "ALARM_MANAGER";

		// Buffer time in seconds to fire alarm instead of marking it missed.
		public static final int ALARM_FIRE_BUFFER = 15;
		@@ -122,7 +127,7 @@ public final class AlarmStateManager extends BroadcastReceiver {
		return prefs.getInt(ALARM_GLOBAL_ID_EXTRA, -1);
		}

		public static void updateGloablIntentId(Context context) {
		public static void updateGlobalIntentId(Context context) {
		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
		int globalId = prefs.getInt(ALARM_GLOBAL_ID_EXTRA, -1) + 1;
		prefs.edit().putInt(ALARM_GLOBAL_ID_EXTRA, globalId).commit();
		@@ -707,10 +712,15 @@ public final class AlarmStateManager extends BroadcastReceiver {
		int intentId = intent.getIntExtra(ALARM_GLOBAL_ID_EXTRA, -1);
		int alarmState = intent.getIntExtra(ALARM_STATE_EXTRA, -1);
		if (intentId != globalId) {
		LogUtils.i("Ignoring old Intent. IntentId: " + intentId + " GlobalId: " + globalId +
		" AlarmState: " + alarmState);
		LogUtils.i("IntentId: " + intentId + " GlobalId: " + globalId + " AlarmState: " +
		alarmState);
		// Allows dismiss/snooze requests to go through
		if (!intent.hasCategory(ALARM_DISMISS_TAG) &&
		!intent.hasCategory(ALARM_SNOOZE_TAG)) {
		LogUtils.i("Ignoring old Intent");
		return;
		}
		}

		if (alarmState >= 0) {
		setAlarmState(context, instance, alarmState);