From e86c2e59709709c767036fa48de1ed190451446b Mon Sep 17 00:00:00 2001
From: Andrew Grieve <agrieve@chromium.org>
Date: Tue, 8 Jul 2014 11:47:26 -0400
Subject: [PATCH] Move registration of App plugin from config.xml -> code

Less fragile this way.
---
 bin/templates/cordova/defaults.xml                   | 5 -----
 framework/res/xml/config.xml                         | 4 ----
 framework/src/org/apache/cordova/CordovaWebView.java | 1 +
 test/res/xml/config.xml                              | 3 ---
 4 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/bin/templates/cordova/defaults.xml b/bin/templates/cordova/defaults.xml
index 1654c136..5286ab9c 100644
--- a/bin/templates/cordova/defaults.xml
+++ b/bin/templates/cordova/defaults.xml
@@ -23,9 +23,4 @@
 
     <!-- Preferences for Android -->
     <preference name="loglevel" value="DEBUG" />
-
-    <!-- This is required for native Android hooks -->
-    <feature name="App">
-        <param name="android-package" value="org.apache.cordova.App" />
-    </feature>
 </widget>
diff --git a/framework/res/xml/config.xml b/framework/res/xml/config.xml
index 24e57254..50459b92 100644
--- a/framework/res/xml/config.xml
+++ b/framework/res/xml/config.xml
@@ -43,8 +43,4 @@
       <preference name="InAppBrowserStorageEnabled" value="true" />
       <preference name="disallowOverscroll" value="true" />
     -->
-    <!-- This is required for native Android hooks -->
-    <feature name="App">
-        <param name="android-package" value="org.apache.cordova.App" />
-    </feature>
 </widget>
diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java
index 8eae3509..4650588a 100755
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -157,6 +157,7 @@ public class CordovaWebView extends WebView {
         exposedJsApi = new ExposedJsApi(pluginManager, jsMessageQueue);
         resourceApi = new CordovaResourceApi(this.getContext(), pluginManager);
 
+        pluginManager.addService("App", "org.apache.cordova.App");
         initWebViewSettings();
         exposeJsInterface();
     }
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 @@
     <feature name="PluginStub">
         <param name="android-package" value="org.apache.cordova.pluginApi.pluginStub" />
     </feature>
-    <feature name="App">
-        <param name="android-package" value="org.apache.cordova.App" />
-    </feature>
 </widget>