diff options
| author | Huahui Wu <hwu@google.com> | 2011-03-24 03:36:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-24 03:36:07 -0700 |
| commit | 69aa3e41a346e0c2251e0e972152dcbbd015c169 (patch) | |
| tree | 15f30caebfae70252211336e84922b28b3239b4c | |
| parent | a73be78a3202305d8831636f5573495192837a17 (diff) | |
| parent | 604a598e1e01bda781600a45e0a971898a582666 (diff) | |
| download | packages_apps_Browser-69aa3e41a346e0c2251e0e972152dcbbd015c169.zip packages_apps_Browser-69aa3e41a346e0c2251e0e972152dcbbd015c169.tar.gz packages_apps_Browser-69aa3e41a346e0c2251e0e972152dcbbd015c169.tar.bz2 | |
am 604a598e: DO NOT MERGE
* commit '604a598e1e01bda781600a45e0a971898a582666':
DO NOT MERGE
| -rw-r--r-- | src/com/android/browser/BrowserActivity.java | 9 | ||||
| -rw-r--r-- | src/com/android/browser/BrowserSettings.java | 2 |
2 files changed, 3 insertions, 8 deletions
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java index 44ab307..359ebda 100644 --- a/src/com/android/browser/BrowserActivity.java +++ b/src/com/android/browser/BrowserActivity.java @@ -622,13 +622,6 @@ public class BrowserActivity extends Activity final String action = intent.getAction(); if (Intent.ACTION_VIEW.equals(action)) { url = smartUrlFilter(intent.getData()); - if (url != null && url.startsWith("content:")) { - /* Append mimetype so webview knows how to display */ - String mimeType = intent.resolveType(getContentResolver()); - if (mimeType != null) { - url += "?" + mimeType; - } - } if (url != null && url.startsWith("http")) { final Bundle pairs = intent .getBundleExtra(Browser.EXTRA_HEADERS); @@ -3665,7 +3658,7 @@ public class BrowserActivity extends Activity "(?i)" + // switch on case insensitive matching "(" + // begin group for schema "(?:http|https|file):\\/\\/" + - "|(?:inline|data|about|content|javascript):" + + "|(?:inline|data|about|javascript):" + ")" + "(.*)" ); diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java index 3791eb0..a322b59 100644 --- a/src/com/android/browser/BrowserSettings.java +++ b/src/com/android/browser/BrowserSettings.java @@ -229,6 +229,8 @@ class BrowserSettings extends Observable { s.setNeedInitialFocus(false); // Browser supports multiple windows s.setSupportMultipleWindows(true); + // disable content url access + s.setAllowContentAccess(false); // HTML5 API flags s.setAppCacheEnabled(b.appCacheEnabled); |