diff options
| author | Satish Sampath <satish@android.com> | 2009-06-03 18:25:32 +0100 |
|---|---|---|
| committer | Satish Sampath <satish@android.com> | 2009-06-03 18:25:32 +0100 |
| commit | afcf198a24a9e88592067f544b8a132c2a2fcd10 (patch) | |
| tree | a0581665da4bffb7b0d58139320d92877542c1c9 /AndroidManifest.xml | |
| parent | 67ad85d94de610b798c22b841c9eb1415c1517a5 (diff) | |
| parent | 565505b1a2c1d3099496af5910760087602e994a (diff) | |
| download | packages_apps_browser-afcf198a24a9e88592067f544b8a132c2a2fcd10.zip packages_apps_browser-afcf198a24a9e88592067f544b8a132c2a2fcd10.tar.gz packages_apps_browser-afcf198a24a9e88592067f544b8a132c2a2fcd10.tar.bz2 | |
resolved conflicts for merge of 565505 to master
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index d95877e..aec23a2 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -53,9 +53,9 @@ (android.test) library. --> <uses-library android:name="android.test.runner" /> - <provider android:name="BrowserProvider" - android:authorities="browser" - android:multiprocess="true" + <provider android:name="BrowserProvider" + android:authorities="browser" + android:multiprocess="true" android:readPermission="com.android.browser.permission.READ_HISTORY_BOOKMARKS" android:writePermission="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS"/> <activity android:name="BrowserActivity" @@ -112,7 +112,6 @@ <data android:scheme="https" /> </intent-filter> <intent-filter> - <action android:name="android.intent.action.WEB_SEARCH" /> <action android:name="android.intent.action.MEDIA_SEARCH" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> @@ -149,7 +148,7 @@ <category android:name="android.intent.category.DEFAULT" /> </intent-filter> - </activity-alias> + </activity-alias> <activity android:name="BrowserDownloadPage" android:label="" android:configChanges="orientation|keyboardHidden"> |