diff options
| -rw-r--r-- | src/com/android/browser/BrowserSettings.java | 2 | ||||
| -rw-r--r-- | src/com/android/browser/IntentHandler.java | 7 | ||||
| -rw-r--r-- | src/com/android/browser/UrlUtils.java | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java index 7be3345..88bd78a 100644 --- a/src/com/android/browser/BrowserSettings.java +++ b/src/com/android/browser/BrowserSettings.java @@ -281,6 +281,8 @@ public class BrowserSettings extends Observable implements OnSharedPreferenceCha // enable smooth transition for better performance during panning or // zooming s.setEnableSmoothTransition(true); + // disable content url access + s.setAllowContentAccess(false); // HTML5 API flags s.setAppCacheEnabled(b.appCacheEnabled); diff --git a/src/com/android/browser/IntentHandler.java b/src/com/android/browser/IntentHandler.java index 06a9f6f..e4b3201 100644 --- a/src/com/android/browser/IntentHandler.java +++ b/src/com/android/browser/IntentHandler.java @@ -202,13 +202,6 @@ public class IntentHandler { final String action = intent.getAction(); if (Intent.ACTION_VIEW.equals(action)) { url = UrlUtils.smartUrlFilter(intent.getData()); - if (url != null && url.startsWith("content:")) { - /* Append mimetype so webview knows how to display */ - String mimeType = intent.resolveType(mActivity.getContentResolver()); - if (mimeType != null) { - url += "?" + mimeType; - } - } if (url != null && url.startsWith("http")) { final Bundle pairs = intent .getBundleExtra(Browser.EXTRA_HEADERS); diff --git a/src/com/android/browser/UrlUtils.java b/src/com/android/browser/UrlUtils.java index 72ac37b..0a7e90c 100644 --- a/src/com/android/browser/UrlUtils.java +++ b/src/com/android/browser/UrlUtils.java @@ -34,7 +34,7 @@ public class UrlUtils { "(?i)" + // switch on case insensitive matching "(" + // begin group for schema "(?:http|https|file):\\/\\/" + - "|(?:inline|data|about|content|javascript):" + + "|(?:inline|data|about|javascript):" + ")" + "(.*)" ); |