You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2012/06/11 19:29:05 UTC
[1/10] android commit: Weird comment conflict
Updated Branches:
refs/heads/master 47211f6cb -> 9ebdca66d
Weird comment conflict
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/9ebdca66
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/9ebdca66
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/9ebdca66
Branch: refs/heads/master
Commit: 9ebdca66d974826c84b75fdcb0c66c359736eb93
Parents: 34ebdad 47211f6
Author: Joe Bowser <bo...@apache.org>
Authored: Mon Jun 11 10:28:24 2012 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Mon Jun 11 10:28:24 2012 -0700
----------------------------------------------------------------------
framework/src/org/apache/cordova/DroidGap.java | 46 ++++++++------
.../org/apache/cordova/api/CordovaInterface.java | 17 +++---
2 files changed, 34 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/9ebdca66/framework/src/org/apache/cordova/DroidGap.java
----------------------------------------------------------------------
diff --cc framework/src/org/apache/cordova/DroidGap.java
index cd667bf,18a47e9..9d17097
--- a/framework/src/org/apache/cordova/DroidGap.java
+++ b/framework/src/org/apache/cordova/DroidGap.java
@@@ -181,13 -181,9 +181,13 @@@ public class DroidGap extends Activity
// when another application (activity) is started.
protected boolean keepRunning = true;
+ private boolean volumeupBound;
+
+ private boolean volumedownBound;
+
/**
* Sets the authentication token.
- *
+ *
* @param authenticationToken
* @param host
* @param realm