Bug 1001072 - Extend shutdown watchdog timeout to allow telemetry to shutdown. r=fabrice
authorJim Chen <nchen@mozilla.com>
Thu, 24 Apr 2014 12:48:00 -0400
changeset 181327 469b786fd5f17474b6584e2d50015216a6fb787e
parent 181326 eba1f5d0a90839eb400970690562e8110149dcfb
child 181328 e7dccbb42d797267562ab02ee1157886638e81b2
push id272
push userpvanderbeken@mozilla.com
push dateMon, 05 May 2014 16:31:18 +0000
reviewersfabrice
bugs1001072
milestone32.0a1
Bug 1001072 - Extend shutdown watchdog timeout to allow telemetry to shutdown. r=fabrice
b2g/app/b2g.js
dom/power/PowerManagerService.cpp
--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@@ -507,17 +507,17 @@ pref("marionette.defaultPrefs.port", 282
 // On desktop builds, we need to force the socket to listen on localhost only
 pref("marionette.force-local", true);
 #endif
 #endif
 
 #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
 pref("b2g.update.apply-idle-timeout", 600000); // milliseconds
 // Amount of time after which connection will be restarted if no progress
 pref("b2g.update.download-watchdog-timeout", 120000); // milliseconds
 pref("b2g.update.download-watchdog-max-retries", 5);
 
--- a/dom/power/PowerManagerService.cpp
+++ b/dom/power/PowerManagerService.cpp
@@ -66,17 +66,17 @@ void
 PowerManagerService::Init()
 {
   RegisterWakeLockObserver(this);
 
   // NB: default to *enabling* the watchdog even when the pref is
   // 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()
 {
   UnregisterWakeLockObserver(this);
 }
 
 void