commit 1419bd32bbcccd8918df6d217572ed74bab3aac0
author Robyn Coultas <coultasr@android.com> Thu Dec 06 23:23:10 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Dec 06 23:23:10 2012 -0800
tree e33731ed1281f9561aba59c704d453d3f554516f
parent da1ff501c89a695f7941bcb69e36309fedc72ec1
parent ba60b3eb1550603716c7b910da6a818fc67b8e43

am ba60b3eb: am 0ed9f5a3: am 1e34a1be: Always log the alarm time

* commit 'ba60b3eb1550603716c7b910da6a818fc67b8e43':
  Always log the alarm time

src/com/android/deskclock/Alarms.java

diff --git a/src/com/android/deskclock/Alarms.java b/src/com/android/deskclock/Alarms.java
index 93c1ec9..637b824 100644
--- a/src/com/android/deskclock/Alarms.java
+++ b/src/com/android/deskclock/Alarms.java
@@ -426,9 +426,9 @@
         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);
 
@@ -472,6 +472,9 @@
                 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, "");
     }
 

src/com/android/deskclock/Log.java

diff --git a/src/com/android/deskclock/Log.java b/src/com/android/deskclock/Log.java
index 39e7e34..e075442 100644
--- a/src/com/android/deskclock/Log.java
+++ b/src/com/android/deskclock/Log.java
@@ -55,6 +55,6 @@
     }
 
     public static String formatTime(long millis) {
-        return new SimpleDateFormat("HH:mm:ss.SSS aaa").format(new Date(millis));
+        return new SimpleDateFormat("HH:mm:ss.SSS/E").format(new Date(millis));
     }
 }