Merge "put the watchdog values back to what they should be"

This commit is contained in:
Mathias Agopian
2011-08-25 17:13:59 -07:00
committed by Android (Google) Code Review

View File

@@ -54,7 +54,7 @@ public class Watchdog extends Thread {
static final int MONITOR = 2718;
static final int TIME_TO_RESTART = DB ? 15*1000000 : 60*1000000;
static final int TIME_TO_RESTART = DB ? 15*1000 : 60*1000;
static final int TIME_TO_WAIT = TIME_TO_RESTART / 2;
static final int MEMCHECK_DEFAULT_MIN_SCREEN_OFF = DB ? 1*60 : 5*60; // 5 minutes