From c8ec7e5191d9786d88f511b72303ab522ff1ef63 Mon Sep 17 00:00:00 2001 From: Joe Bowser Date: Wed, 28 Nov 2012 15:30:22 -0800 Subject: [PATCH] Doing the merge and fixing DroidGap up a bit --- framework/src/org/apache/cordova/DroidGap.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/src/org/apache/cordova/DroidGap.java b/framework/src/org/apache/cordova/DroidGap.java index 3288e726..efa7cb5b 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); } }