Updated Branches: refs/heads/master b00cd9b55 -> b30f5d782
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 Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/b30f5d78 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/b30f5d78 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/b30f5d78 Branch: refs/heads/master Commit: b30f5d782d2936d99f83f91806a4e134dd39b16a Parents: b00cd9b Author: Andrew Grieve <agri...@chromium.org> Authored: Thu Aug 23 15:34:10 2012 -0400 Committer: Andrew Grieve <agri...@chromium.org> Committed: Thu Aug 23 15:35:08 2012 -0400 ---------------------------------------------------------------------- .../src/org/apache/cordova/CordovaWebView.java | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/b30f5d78/framework/src/org/apache/cordova/CordovaWebView.java ---------------------------------------------------------------------- diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java index 7e78de8..7962e81 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; }
