diff options
| author | Patrick Scott <phanna@android.com> | 2011-01-05 11:38:58 -0500 |
|---|---|---|
| committer | Patrick Scott <phanna@android.com> | 2011-01-12 12:44:19 -0500 |
| commit | b92bbb498f1eeab477d62632c235d0a68a4f4ea2 (patch) | |
| tree | b9d569c3a6cdbbb4966c77db7b23c8a46da8a609 /src/com/android/browser/IntentHandler.java | |
| parent | c8f04afcdfd06efe456afc395ac8cab0082499f0 (diff) | |
| download | packages_apps_browser-b92bbb498f1eeab477d62632c235d0a68a4f4ea2.zip packages_apps_browser-b92bbb498f1eeab477d62632c235d0a68a4f4ea2.tar.gz packages_apps_browser-b92bbb498f1eeab477d62632c235d0a68a4f4ea2.tar.bz2 | |
Do not merge.
Cherry pick:
Remove content:// from the Browser.
Disable content access in WebView as well. This requires a change to
frameworks/base.
Bug: 1196879
Change-Id: I00ca884654cbf53128f1e97389d2d8d44598e1c1
Diffstat (limited to 'src/com/android/browser/IntentHandler.java')
| -rw-r--r-- | src/com/android/browser/IntentHandler.java | 7 |
1 files changed, 0 insertions, 7 deletions
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); |