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

Commit bb13b216 authored by Patrick Scott's avatar Patrick Scott
Browse files

Check for -1 id before modifying alarms. 

Bug: 2898729
Change-Id: I9f70ee40fbcebeae2028c19a3b355e5d1cc433d4
parent bb8db9f6

src/com/android/deskclock/AlarmClock.java

+4 −0
Original line number Diff line number Diff line
@@ -154,6 +154,10 @@ public class AlarmClock extends Activity implements OnItemClickListener { 
        final AdapterContextMenuInfo info =

                (AdapterContextMenuInfo) item.getMenuInfo();

        final int id = (int) info.id;

        // Error check just in case.

        if (id == -1) {

            return super.onContextItemSelected(item);

        }

        switch (item.getItemId()) {

            case R.id.delete_alarm:

                // Confirm that the alarm will be deleted.

src/com/android/deskclock/Alarms.java

+2 −2
Original line number Diff line number Diff line
@@ -115,8 +115,8 @@ public class Alarms { 
     * Removes an existing Alarm.  If this alarm is snoozing, disables

     * snooze.  Sets next alert.

     */

    public static void deleteAlarm(

            Context context, int alarmId) {

    public static void deleteAlarm(Context context, int alarmId) {

        if (alarmId == -1) return;



        ContentResolver contentResolver = context.getContentResolver();

        /* If alarm is snoozing, lose it */