diff options
Diffstat (limited to 'src/com/android/deskclock/AlarmKlaxon.java')
-rw-r--r-- | src/com/android/deskclock/AlarmKlaxon.java | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/com/android/deskclock/AlarmKlaxon.java b/src/com/android/deskclock/AlarmKlaxon.java index 94643e683..82494727c 100644 --- a/src/com/android/deskclock/AlarmKlaxon.java +++ b/src/com/android/deskclock/AlarmKlaxon.java @@ -33,6 +33,7 @@ import android.os.Vibrator; import android.preference.PreferenceManager; import android.telephony.PhoneStateListener; import android.telephony.TelephonyManager; +import android.text.format.DateUtils; import android.util.Log; /** @@ -69,9 +70,10 @@ public class AlarmKlaxon extends Service { public void handleMessage(Message msg) { switch (msg.what) { case KILLER: - Log.d(TAG, "*********** Alarm killer triggered ***********"); - - sendKillBroadcast((Alarm) msg.obj); + if (Log.LOGV) { + Log.v("*********** Alarm killer triggered ***********"); + } + sendKillBroadcast((Alarm) msg.obj, false); stopSelf(); break; case INCVOL: @@ -96,7 +98,7 @@ public class AlarmKlaxon extends Service { // we don't kill the alarm during a call. if (state != TelephonyManager.CALL_STATE_IDLE && state != mInitialCallState) { - sendKillBroadcast(mCurrentAlarm); + sendKillBroadcast(mCurrentAlarm, false); stopSelf(); } } @@ -147,7 +149,7 @@ public class AlarmKlaxon extends Service { } if (mCurrentAlarm != null) { - sendKillBroadcast(mCurrentAlarm); + sendKillBroadcast(mCurrentAlarm, true); } play(alarm); @@ -159,12 +161,13 @@ public class AlarmKlaxon extends Service { return START_STICKY; } - private void sendKillBroadcast(Alarm alarm) { + private void sendKillBroadcast(Alarm alarm, boolean replaced) { long millis = System.currentTimeMillis() - mStartTime; - int minutes = (int) Math.round(millis / 60000.0); + int minutes = (int) Math.round(millis / (double)DateUtils.MINUTE_IN_MILLIS); Intent alarmKilled = new Intent(Alarms.ALARM_KILLED); alarmKilled.putExtra(Alarms.ALARM_INTENT_EXTRA, alarm); alarmKilled.putExtra(Alarms.ALARM_KILLED_TIMEOUT, minutes); + alarmKilled.putExtra(Alarms.ALARM_REPLACED, replaced); sendBroadcast(alarmKilled); } @@ -328,7 +331,7 @@ public class AlarmKlaxon extends Service { int autoSnoozeMinutes = Integer.parseInt(autoSnooze); if (autoSnoozeMinutes != -1) { mHandler.sendMessageDelayed(mHandler.obtainMessage(KILLER, alarm), - 1000 * autoSnoozeMinutes * 60); + autoSnoozeMinutes * DateUtils.MINUTE_IN_MILLIS); } } |