Merge "Fix issue where old alarm manager triggers are being listen to." into klp-dev (fd951391) · Commits · e / os / android_packages_apps_DeskClock

src/com/android/deskclock/AlarmInitReceiver.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -47,6 +47,10 @@ public class AlarmInitReceiver extends BroadcastReceiver {
		final PendingResult result = goAsync();
		final WakeLock wl = AlarmAlertWakeLock.createPartialWakeLock(context);
		wl.acquire();

		// We need to increment the global id out of the async task to prevent
		// race conditions
		AlarmStateManager.updateGloablIntentId(context);
		AsyncHandler.post(new Runnable() {
		@Override public void run() {
		// Remove the snooze alarm after a boot.
		@@ -65,12 +69,8 @@ public class AlarmInitReceiver extends BroadcastReceiver {
		}
		}

		// Register all instances after major time changes or phone restarts
		ContentResolver contentResolver = context.getContentResolver();
		for (AlarmInstance instance : AlarmInstance.getInstances(contentResolver, null)) {
		AlarmStateManager.registerInstance(context, instance, false);
		}
		AlarmStateManager.updateNextAlarm(context);
		// Update all the alarm instances on time change event
		AlarmStateManager.fixAlarmInstances(context);

		result.finish();
		Log.v("AlarmInitReceiver finished");

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

+39 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.content.BroadcastReceiver;
		import android.content.ContentResolver;
		import android.content.Context;
		import android.content.Intent;
		import android.content.SharedPreferences;
		import android.net.Uri;
		import android.os.PowerManager;
		import android.preference.PreferenceManager;
		@@ -104,9 +105,23 @@ public final class AlarmStateManager extends BroadcastReceiver {
		// Extra key to set the desired state change.
		public static final String ALARM_STATE_EXTRA = "intent.extra.alarm.state";

		// Extra key to set the global broadcast id.
		private static final String ALARM_GLOBAL_ID_EXTRA = "intent.extra.alarm.global.id";

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

		public static int getGlobalIntentId(Context context) {
		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
		return prefs.getInt(ALARM_GLOBAL_ID_EXTRA, -1);
		}

		public static void updateGloablIntentId(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();
		}

		/**
		* Find and notify system what the next alarm that will fire. This is used
		* to update text in the system and widgets.
		@@ -179,6 +194,7 @@ public final class AlarmStateManager extends BroadcastReceiver {
		Intent intent = AlarmInstance.createIntent(context, AlarmStateManager.class, instance.mId);
		intent.setAction(CHANGE_STATE_ACTION);
		intent.addCategory(tag);
		intent.putExtra(ALARM_GLOBAL_ID_EXTRA, getGlobalIntentId(context));
		if (state != null) {
		intent.putExtra(ALARM_STATE_EXTRA, state.intValue());
		}
		@@ -576,6 +592,21 @@ public final class AlarmStateManager extends BroadcastReceiver {
		updateNextAlarm(context);
		}

		/**
		* Fix and update all alarm instance when a time change event occurs.
		*
		* @param context application context
		*/
		public static void fixAlarmInstances(Context context) {
		// Register all instances after major time changes or when phone restarts
		// TODO: Refactor this code to not use the overloaded registerInstance method.
		ContentResolver contentResolver = context.getContentResolver();
		for (AlarmInstance instance : AlarmInstance.getInstances(contentResolver, null)) {
		AlarmStateManager.registerInstance(context, instance, false);
		}
		AlarmStateManager.updateNextAlarm(context);
		}

		/**
		* Utility method to set alarm instance state via constants.
		*
		@@ -642,7 +673,15 @@ public final class AlarmStateManager extends BroadcastReceiver {
		return;
		}

		int globalId = getGlobalIntentId(context);
		int intentId = intent.getIntExtra(ALARM_GLOBAL_ID_EXTRA, -1);
		int alarmState = intent.getIntExtra(ALARM_STATE_EXTRA, -1);
		if (intentId != globalId) {
		Log.i("Ignoring old Intent. IntentId: " + intentId + " GlobalId: " + globalId +
		" AlarmState: " + alarmState);
		return;
		}

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