diff options
| author | Paul Miller <paulmiller@google.com> | 2015-04-02 22:25:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-02 22:25:50 +0000 |
| commit | 8d9b0bea37689cfb08c4cee128c048adf55440ee (patch) | |
| tree | 842b4005e42c31de47f7812f2e5a94d41fd42b99 /AndroidManifest.xml | |
| parent | 258c575ea8cac93fd33e75b2b1e9fa9d205ef254 (diff) | |
| parent | edc3e7a47afdef95b483f656314829574e67727b (diff) | |
| download | packages_apps_Browser-8d9b0bea37689cfb08c4cee128c048adf55440ee.zip packages_apps_Browser-8d9b0bea37689cfb08c4cee128c048adf55440ee.tar.gz packages_apps_Browser-8d9b0bea37689cfb08c4cee128c048adf55440ee.tar.bz2 | |
am edc3e7a4: am b1da6cff: Merge "Restrict "javascript" and "file" scheme intents"
* commit 'edc3e7a47afdef95b483f656314829574e67727b':
Restrict "javascript" and "file" scheme intents
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a90468b..9ea41e6 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -86,7 +86,6 @@ <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. --> @@ -101,16 +100,6 @@ <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" /> |