Updated Branches: refs/heads/463 c63be6741 -> 27fb107ee
merging issues? 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/27fb107e Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/27fb107e Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/27fb107e Branch: refs/heads/463 Commit: 27fb107ee8a69a5dc19b6aae5c0ffd8d732fd968 Parents: 0120040 c63be67 Author: Fil Maj <maj....@gmail.com> Authored: Fri May 18 14:16:04 2012 -0700 Committer: Fil Maj <maj....@gmail.com> Committed: Fri May 18 14:16:04 2012 -0700 ---------------------------------------------------------------------- framework/assets/js/cordova.android.js | 3 ++- .../src/org/apache/cordova/AccelListener.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/27fb107e/framework/assets/js/cordova.android.js ---------------------------------------------------------------------- diff --cc framework/assets/js/cordova.android.js index cdf619d,957be77..f6054e1 --- a/framework/assets/js/cordova.android.js +++ b/framework/assets/js/cordova.android.js @@@ -3509,9 -3452,9 +3509,10 @@@ var accelerometer = clearWatch: function(id) { // Stop javascript timer & remove from timer list if (id && timers[id]) { - window.clearInterval(timers[id]); + window.clearInterval(timers[id].timer); + removeListeners(timers[id].listeners); delete timers[id]; + exec(null, null, "Accelerometer", "clearWatch", [id]); } } }; @@@ -5251,4 -5194,4 +5252,4 @@@ window.cordova = require('cordova') }(window)); --})(); ++})(); http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/27fb107e/framework/src/org/apache/cordova/AccelListener.java ---------------------------------------------------------------------- diff --cc framework/src/org/apache/cordova/AccelListener.java index 551e8bc,bc8bf17..8a8ed2a --- a/framework/src/org/apache/cordova/AccelListener.java +++ b/framework/src/org/apache/cordova/AccelListener.java @@@ -127,7 -162,10 +127,7 @@@ public class AccelListener extends Plug //-------------------------------------------------------------------------- // LOCAL METHODS //-------------------------------------------------------------------------- - // + - private int size() { - return this.watches.size() + this.callbacks.size(); - } /** * Start listening for acceleration sensor. *
