Bug 1001072 - Extend shutdown watchdog timeout to allow telemetry to …

…shutdown. r=fabrice
dothq · Apr 24, 2014 · e505a81 · e505a81
1 parent f9cf32e
commit e505a81
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/b2g/app/b2g.js b/b2g/app/b2g.js
@@ -512,7 +512,7 @@ pref("marionette.force-local", true);
 #ifdef MOZ_UPDATER
 // When we're applying updates, we can't let anything hang us on
 // quit+restart.  The user has no recourse.
-pref("shutdown.watchdog.timeoutSecs", 5);
+pref("shutdown.watchdog.timeoutSecs", 10);
 // Timeout before the update prompt automatically installs the update
 pref("b2g.update.apply-prompt-timeout", 60000); // milliseconds
 // Amount of time to wait after the user is idle before prompting to apply an update

diff --git a/dom/power/PowerManagerService.cpp b/dom/power/PowerManagerService.cpp
@@ -71,7 +71,7 @@ PowerManagerService::Init()
   // absent, in case the profile might be damaged and we need to
   // restart to repair it.
   mWatchdogTimeoutSecs =
-    Preferences::GetInt("shutdown.watchdog.timeoutSecs", 5);
+    Preferences::GetInt("shutdown.watchdog.timeoutSecs", 10);
 }
 
 PowerManagerService::~PowerManagerService()