diff options
| author | Paul Miller <paulmiller@google.com> | 2015-04-06 18:18:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-06 18:18:37 +0000 |
| commit | dc9c958256a66c333c1048ad21f1de8c1c0cdad3 (patch) | |
| tree | e9f3b3af25152d73be2a389e480b623569291d31 /AndroidManifest.xml | |
| parent | b1da6cff83eab4f707456fbdb0d64f28d26c4889 (diff) | |
| parent | 3fa0e8adb2faf92b1529d0ac39ea16b5adc3d3b4 (diff) | |
| download | packages_apps_Browser-dc9c958256a66c333c1048ad21f1de8c1c0cdad3.zip packages_apps_Browser-dc9c958256a66c333c1048ad21f1de8c1c0cdad3.tar.gz packages_apps_Browser-dc9c958256a66c333c1048ad21f1de8c1c0cdad3.tar.bz2 | |
Merge "Revert "Restrict "javascript" and "file" scheme intents""
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9ea41e6..a90468b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -86,6 +86,7 @@ <data android:scheme="http" /> <data android:scheme="https" /> <data android:scheme="about" /> + <data android:scheme="javascript" /> </intent-filter> <!-- For these schemes where any of these particular MIME types have been supplied, we are a good candidate. --> @@ -100,6 +101,16 @@ <data android:mimeType="application/xhtml+xml"/> <data android:mimeType="application/vnd.wap.xhtml+xml"/> </intent-filter> + <!-- For viewing saved web archives. --> + <intent-filter> + <action android:name="android.intent.action.VIEW" /> + <category android:name="android.intent.category.BROWSABLE" /> + <category android:name="android.intent.category.DEFAULT" /> + <data android:scheme="http" /> + <data android:scheme="https" /> + <data android:scheme="file" /> + <data android:mimeType="application/x-webarchive-xml"/> + </intent-filter> <!-- Accept inbound NFC URLs at a low priority --> <intent-filter android:priority="-101"> <action android:name="android.nfc.action.NDEF_DISCOVERED" /> |