You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2012/08/27 21:05:51 UTC
android commit: Refactor to avoid adb warnings of VFY: on start-up.
Updated Branches:
refs/heads/master f111c245c -> 07439ff99
Refactor to avoid adb warnings of VFY: on start-up.
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/07439ff9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/07439ff9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/07439ff9
Branch: refs/heads/master
Commit: 07439ff99ca5f61c444ae7673d9fec96e4502492
Parents: f111c24
Author: Andrew Grieve <ag...@chromium.org>
Authored: Mon Aug 27 13:58:17 2012 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Aug 27 15:05:20 2012 -0400
----------------------------------------------------------------------
.../src/org/apache/cordova/CordovaWebView.java | 17 +++++++++++---
1 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/07439ff9/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 3f7a504..e878a74 100755
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -215,10 +215,10 @@ public class CordovaWebView extends WebView {
if(android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.HONEYCOMB)
settings.setNavDump(true);
- //Jellybean rightfully tried to lock this down. Too bad they didn't give us a whitelist
- //while we do this
- if(android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1)
- settings.setAllowUniversalAccessFromFileURLs(true);
+ // Jellybean rightfully tried to lock this down. Too bad they didn't give us a whitelist
+ // while we do this
+ if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1)
+ Level16Apis.enableUniversalAccess(settings);
// Enable database
settings.setDatabaseEnabled(true);
String databasePath = this.cordova.getActivity().getApplicationContext().getDir("database", Context.MODE_PRIVATE).getPath();
@@ -891,4 +891,13 @@ public class CordovaWebView extends WebView {
public boolean hadKeyEvent() {
return handleButton;
}
+
+ // Wrapping these functions in their own class prevents warnings in adb like:
+ // VFY: unable to resolve virtual method 285: Landroid/webkit/WebSettings;.setAllowUniversalAccessFromFileURLs
+ @TargetApi(16)
+ private static class Level16Apis {
+ static void enableUniversalAccess(WebSettings settings) {
+ settings.setAllowUniversalAccessFromFileURLs(true);
+ }
+ }
}