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 2013/01/11 19:25:01 UTC
[3/10] android commit: Doing the merge and fixing DroidGap up a bit
Doing the merge and fixing DroidGap up a bit
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/c8ec7e51
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/c8ec7e51
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/c8ec7e51
Branch: refs/heads/master
Commit: c8ec7e5191d9786d88f511b72303ab522ff1ef63
Parents: a0d2b96
Author: Joe Bowser <bo...@apache.org>
Authored: Wed Nov 28 15:30:22 2012 -0800
Committer: Joe Bowser <bo...@apache.org>
Committed: Wed Nov 28 15:30:22 2012 -0800
----------------------------------------------------------------------
framework/src/org/apache/cordova/DroidGap.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/c8ec7e51/framework/src/org/apache/cordova/DroidGap.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/DroidGap.java b/framework/src/org/apache/cordova/DroidGap.java
index 3288e72..efa7cb5 100755
--- a/framework/src/org/apache/cordova/DroidGap.java
+++ b/framework/src/org/apache/cordova/DroidGap.java
@@ -816,7 +816,7 @@ public class DroidGap extends Activity implements CordovaInterface {
* @param data An Intent, which can return result data to the caller (various data can be attached to Intent "extras").
*/
protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
- Log.d(TAG, "Incoming Result");
+ LOG.d(TAG, "Incoming Result");
super.onActivityResult(requestCode, resultCode, intent);
CordovaPlugin callback = this.activityResultCallback;
if(callback == null)
@@ -825,13 +825,13 @@ public class DroidGap extends Activity implements CordovaInterface {
{
this.activityResultCallback = appView.pluginManager.getPlugin(initCallbackClass);
callback = activityResultCallback;
- Log.d(TAG, "We have a callback to send this result to");
+ LOG.d(TAG, "We have a callback to send this result to");
callback.onActivityResult(requestCode, resultCode, intent);
}
}
else
{
- Log.d(TAG, "We have a callback to send this result to");
+ LOG.d(TAG, "We have a callback to send this result to");
callback.onActivityResult(requestCode, resultCode, intent);
}
}