1 files changed, 9 insertions, 3 deletions
diff --git a/src/com/android/deskclock/Alarms.java b/src/com/android/deskclock/Alarms.java
index c9439e5ea..b9a848cfc 100644
--- a/src/com/android/deskclock/Alarms.java
+++ b/src/com/android/deskclock/Alarms.java
@@ -78,6 +78,9 @@ public class Alarms {
     // alarm played before being killed.
     public static final String ALARM_KILLED_TIMEOUT = "alarm_killed_timeout";
 
+    // Extra in the ALARM_KILLED intent to indicate when alarm was replaced
+    public static final String ALARM_REPLACED = "alarm_replaced";
+
     // This string is used to indicate a silent alarm in the db.
     public static final String ALARM_ALERT_SILENT = "silent";
 
@@ -427,9 +430,9 @@ public class Alarms {
         AlarmManager am = (AlarmManager)
                 context.getSystemService(Context.ALARM_SERVICE);
 
-        if (Log.LOGV) {
-            Log.v("** setAlert id " + alarm.id + " atTime " + atTimeInMillis);
-        }
+        // Intentionally verbose: always log the alarm time to provide useful
+        // information in bug reports.
+        Log.v("Alarm set for id=" + alarm.id + " " + Log.formatTime(atTimeInMillis));
 
         Intent intent = new Intent(ALARM_ALERT_ACTION);
 
@@ -477,6 +480,9 @@ public class Alarms {
                 PendingIntent.FLAG_CANCEL_CURRENT);
         am.cancel(sender);
         setStatusBarIcon(context, false);
+        // Intentionally verbose: always log the lack of a next alarm to provide useful
+        // information in bug reports.
+        Log.v("No next alarm");
         saveNextAlarm(context, "");
     }