commit 3aa8204dffd85a291305cc5fbf133c05cc6fbc91
author Android (Google) Code Review <android-gerrit@google.com> Tue Sep 08 05:46:48 2009 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 08 05:46:48 2009 -0700
tree 5a079eef0cd6a3f2653d5fcd5a758b59fbeb1051
parent 304442375719effd41dbd53ae62de7a8d0cec7d9
parent 3ccaf955ff9b68c4fb8fe7e9c553a159a2f0c163

Merge changes 23486,23988 into eclair

* changes:
  Update the manifest to mark the activity as the default.
  enable plugins to launch an activity within the browser

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a355610..b23f113 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -183,6 +183,12 @@
         <!-- Makes .BrowserActivity the search target for any activity in Browser -->
         <meta-data android:name="android.app.default_searchable" android:value=".BrowserActivity" />
 
+        <activity android:name="android.webkit.PluginActivity">
+            <intent-filter>
+                <action android:name="android.intent.webkit.PLUGIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
 
     </application>