Merge pull request #10383 from alivedise/bugzilla/880609/wake-lock-af…

…ter-device-off-and-on Bug 880609 - Request wake lock failed after device is off and on.r=timdream,a=leo+
mozilla-b2g · Jun 14, 2013 · 65197db · 65197db
2 parents 0c836be + abaff16
commit 65197db
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/apps/system/js/screen_manager.js b/apps/system/js/screen_manager.js
@@ -393,12 +393,12 @@ var ScreenManager = {
       this._setIdleTimeout(10, true);
       var self = this;
       var stopShortIdleTimeout = function scm_stopShortIdleTimeout() {
-        window.removeEventListener('unlock', stopShortIdleTimeout);
+        window.removeEventListener('will-unlock', stopShortIdleTimeout);
         window.removeEventListener('lockpanelchange', stopShortIdleTimeout);
         self._setIdleTimeout(self._idleTimeout, false);
       };
 
-      window.addEventListener('unlock', stopShortIdleTimeout);
+      window.addEventListener('will-unlock', stopShortIdleTimeout);
       window.addEventListener('lockpanelchange', stopShortIdleTimeout);
     } else {
       this._setIdleTimeout(this._idleTimeout, false);