diff --git a/bin/templates/cordova/defaults.xml b/bin/templates/cordova/defaults.xml index 77c90e67..5286ab9c 100644 --- a/bin/templates/cordova/defaults.xml +++ b/bin/templates/cordova/defaults.xml @@ -23,9 +23,4 @@ - - - - - diff --git a/framework/res/xml/config.xml b/framework/res/xml/config.xml index a942ce9f..0f00c3b3 100644 --- a/framework/res/xml/config.xml +++ b/framework/res/xml/config.xml @@ -44,8 +44,4 @@ --> - - - - diff --git a/framework/src/org/apache/cordova/AndroidWebView.java b/framework/src/org/apache/cordova/AndroidWebView.java index 417fcb36..c8c3c903 100755 --- a/framework/src/org/apache/cordova/AndroidWebView.java +++ b/framework/src/org/apache/cordova/AndroidWebView.java @@ -147,6 +147,7 @@ public class AndroidWebView extends WebView implements CordovaWebView { exposedJsApi = new AndroidExposedJsApi(pluginManager, jsMessageQueue); resourceApi = new CordovaResourceApi(this.getContext(), pluginManager); + pluginManager.addService("App", "org.apache.cordova.CoreAndroid"); initWebViewSettings(); exposeJsInterface(); } diff --git a/framework/src/org/apache/cordova/PluginManager.java b/framework/src/org/apache/cordova/PluginManager.java index 7ba9450e..243dc364 100755 --- a/framework/src/org/apache/cordova/PluginManager.java +++ b/framework/src/org/apache/cordova/PluginManager.java @@ -60,11 +60,6 @@ public class PluginManager { PluginManager(CordovaWebView cordovaWebView, CordovaInterface cordova, List pluginEntries) { this.ctx = cordova; this.app = cordovaWebView; - if (pluginEntries == null) { - ConfigXmlParser parser = new ConfigXmlParser(); - parser.parse(ctx.getActivity()); - pluginEntries = parser.getPluginEntries(); - } setPluginEntries(pluginEntries); } diff --git a/test/res/xml/config.xml b/test/res/xml/config.xml index 76172cbf..7572732b 100644 --- a/test/res/xml/config.xml +++ b/test/res/xml/config.xml @@ -36,7 +36,4 @@ - - -