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

Commit 78a84ea0 authored by Paul Sliwowski's avatar Paul Sliwowski Committed by Android Git Automerger
Browse files

am a65b19b6: Fixed bug where deleting an alarm doesn\'t stop it from ringing. 

* commit 'a65b19b6':
  Fixed bug where deleting an alarm doesn't stop it from ringing.
parents a4ed0ddb a65b19b6

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

+2 −3
Original line number Diff line number Diff line
@@ -430,9 +430,6 @@ public final class AlarmStateManager extends BroadcastReceiver { 
    public static void setDismissState(Context context, AlarmInstance instance) {

        Log.v("Setting dismissed state to instance " + instance.mId);



        // Stop alarm if this instance is firing it

        AlarmService.stopAlarm(context, instance);



        // Remove all other timers and notifications associated to it

        unregisterInstance(context, instance);
@@ -456,6 +453,8 @@ public final class AlarmStateManager extends BroadcastReceiver { 
     * @param instance to unregister

     */

    public static void unregisterInstance(Context context, AlarmInstance instance) {

        // Stop alarm if this instance is firing it

        AlarmService.stopAlarm(context, instance);

        AlarmNotifications.clearNotification(context, instance);

        cancelScheduledInstance(context, instance);

    }