github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-26 20:33:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor to avoid adb warnings of VFY: on start-up.

Browse Source
This commit is contained in:
Andrew Grieve 2012-08-27 13:58:17 -04:00
parent f111c245c1
commit 07439ff99c
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
framework/src/org/apache/cordova/CordovaWebView.java
View File

@ -215,10 +215,10 @@ public class CordovaWebView extends WebView {
if(android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.HONEYCOMB) if(android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.HONEYCOMB)
settings.setNavDump(true); settings.setNavDump(true);
//Jellybean rightfully tried to lock this down. Too bad they didn't give us a whitelist // Jellybean rightfully tried to lock this down. Too bad they didn't give us a whitelist
//while we do this // while we do this
if(android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1)
settings.setAllowUniversalAccessFromFileURLs(true); Level16Apis.enableUniversalAccess(settings);
// Enable database // Enable database
settings.setDatabaseEnabled(true); settings.setDatabaseEnabled(true);
String databasePath = this.cordova.getActivity().getApplicationContext().getDir("database", Context.MODE_PRIVATE).getPath(); String databasePath = this.cordova.getActivity().getApplicationContext().getDir("database", Context.MODE_PRIVATE).getPath();
@ -891,4 +891,13 @@ public class CordovaWebView extends WebView {
public boolean hadKeyEvent() { public boolean hadKeyEvent() {
return handleButton; 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);
}
}
} }