summaryrefslogtreecommitdiffstats
path: root/src/com/android/deskclock/DeskClock.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/deskclock/DeskClock.java')
-rw-r--r--src/com/android/deskclock/DeskClock.java13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/com/android/deskclock/DeskClock.java b/src/com/android/deskclock/DeskClock.java
index 3206e38a2..22fcff635 100644
--- a/src/com/android/deskclock/DeskClock.java
+++ b/src/com/android/deskclock/DeskClock.java
@@ -286,12 +286,13 @@ public class DeskClock extends Activity {
String screensaver_timeout = PreferenceManager.getDefaultSharedPreferences(this)
.getString(SettingsActivity.SCREENSAVER_TIMEOUT, SCREEN_SAVER_TIMEOUT_DEFAULT);
Long timeout = (Long.parseLong(screensaver_timeout)) * 60 * 1000;
-
- // reschedule screen saver
- mHandy.removeMessages(SCREEN_SAVER_TIMEOUT_MSG);
- mHandy.sendMessageDelayed(
- Message.obtain(mHandy, SCREEN_SAVER_TIMEOUT_MSG),
- timeout);
+ if (timeout > 0) {
+ // reschedule screen saver
+ mHandy.removeMessages(SCREEN_SAVER_TIMEOUT_MSG);
+ mHandy.sendMessageDelayed(
+ Message.obtain(mHandy, SCREEN_SAVER_TIMEOUT_MSG),
+ timeout);
+ }
}
private void restoreScreen() {