From b30f5d782d2936d99f83f91806a4e134dd39b16a Mon Sep 17 00:00:00 2001 From: Andrew Grieve Date: Thu, 23 Aug 2012 15:34:10 -0400 Subject: [PATCH] Fix JS timers being disabled on pause and never re-enabled. Was broken in this change: https://github.com/apache/incubator-cordova-android/commit/b234b0bded73cf878fdc8521a337bef6b2f8fb62 --- framework/src/org/apache/cordova/CordovaWebView.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java index 7e78de84..7962e81b 100755 --- a/framework/src/org/apache/cordova/CordovaWebView.java +++ b/framework/src/org/apache/cordova/CordovaWebView.java @@ -835,7 +835,7 @@ public class CordovaWebView extends WebView { } // If app doesn't want to run in background - if (keepRunning) { + if (!keepRunning) { // Pause JavaScript timers (including setInterval) this.pauseTimers(); } @@ -854,11 +854,8 @@ public class CordovaWebView extends WebView { this.pluginManager.onResume(keepRunning); } - // If app doesn't want to run in background - if (!keepRunning || activityResultKeepRunning) { - // Resume JavaScript timers (including setInterval) - this.resumeTimers(); - } + // Resume JavaScript timers (including setInterval) + this.resumeTimers(); paused = false; }