commit dc9c958256a66c333c1048ad21f1de8c1c0cdad3
author Paul Miller <paulmiller@google.com> Mon Apr 06 18:18:36 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 06 18:18:37 2015 +0000
tree e9f3b3af25152d73be2a389e480b623569291d31
parent b1da6cff83eab4f707456fbdb0d64f28d26c4889
parent 3fa0e8adb2faf92b1529d0ac39ea16b5adc3d3b4

Merge "Revert "Restrict "javascript" and "file" scheme intents""

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6d1c822..a90468b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -96,7 +96,6 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:scheme="http" />
                 <data android:scheme="https" />
-                <data android:scheme="inline" />
                 <data android:mimeType="text/html"/>
                 <data android:mimeType="text/plain"/>
                 <data android:mimeType="application/xhtml+xml"/>

src/com/android/browser/UrlUtils.java

diff --git a/src/com/android/browser/UrlUtils.java b/src/com/android/browser/UrlUtils.java
index 16b670b..18f3c62 100644
--- a/src/com/android/browser/UrlUtils.java
+++ b/src/com/android/browser/UrlUtils.java
@@ -32,7 +32,7 @@
             "(?i)" + // switch on case insensitive matching
             "(" +    // begin group for schema
             "(?:http|https|file):\\/\\/" +
-            "|(?:inline|data|about|javascript):" +
+            "|(?:data|about|javascript):" +
             "|(?:.*:.*@)" +
             ")" +
             "(.*)" );