diff options
| author | Steve Kondik <shade@chemlab.org> | 2013-02-13 00:37:05 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-02-13 00:37:05 -0800 |
| commit | 1f5a43d0469fce561c311a19c85ac8dd036c4cac (patch) | |
| tree | 3b3ce44c9eccb23e898ee53c45c3e9bac1962fb7 /src/com/android/deskclock/AlarmReceiver.java | |
| parent | 057d88c735d8d0e7dce9714f9db28388501c24e7 (diff) | |
| parent | 0ed03e8e14cf2edcda9ee3ecc604d4e048c8ccf3 (diff) | |
| download | android_packages_apps_DeskClock-mr1.1-staging.tar.gz android_packages_apps_DeskClock-mr1.1-staging.tar.bz2 android_packages_apps_DeskClock-mr1.1-staging.zip | |
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/DeskClock into 1.1mr1.1-staging
Android 4.2.2 release 1
Conflicts:
res/xml/settings.xml
src/com/android/deskclock/AlarmAlertFullScreen.java
src/com/android/deskclock/AlarmKlaxon.java
src/com/android/deskclock/DeskClock.java
src/com/android/deskclock/SettingsActivity.java
Change-Id: Ieba9c47923469713cf14c310044fe8fb3b31523c
Diffstat (limited to 'src/com/android/deskclock/AlarmReceiver.java')
| -rw-r--r-- | src/com/android/deskclock/AlarmReceiver.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/deskclock/AlarmReceiver.java b/src/com/android/deskclock/AlarmReceiver.java index 003ee09b0..69f726bbb 100644 --- a/src/com/android/deskclock/AlarmReceiver.java +++ b/src/com/android/deskclock/AlarmReceiver.java @@ -116,7 +116,7 @@ public class AlarmReceiver extends BroadcastReceiver { // Intentionally verbose: always log the alarm time to provide useful // information in bug reports. long now = System.currentTimeMillis(); - Log.v("Received alarm set for " + Log.formatTime(alarm.time)); + Log.v("Received alarm set for id=" + alarm.id + " " + Log.formatTime(alarm.time)); // Always verbose to track down time change problems. if (now > alarm.time + STALE_WINDOW) { |