diff options
| author | John Reck <jreck@google.com> | 2012-06-05 09:22:59 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2012-06-14 13:32:07 -0700 |
| commit | 38b3965028e4ac433de9d43c02d3167ff0ef208c (patch) | |
| tree | 231187b7128fffe0ed6d54591eb9c544ab4abe9d /src/com/android/browser/IntentHandler.java | |
| parent | c41c31925e30a989f12e2e20bfd6714e9975a0b1 (diff) | |
Disable URL overriding on redirects
Bug: 5334118
When sending an intent for a URL with specialized handlers, tag
it with an extra that will surpress subsequent redirections
Change-Id: I997aa79192baea86c58958ab213200d57ec4c4f9
Diffstat (limited to 'src/com/android/browser/IntentHandler.java')
| -rw-r--r-- | src/com/android/browser/IntentHandler.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/browser/IntentHandler.java b/src/com/android/browser/IntentHandler.java index e22c5dc9..f0998a44 100644 --- a/src/com/android/browser/IntentHandler.java +++ b/src/com/android/browser/IntentHandler.java @@ -335,12 +335,14 @@ public class IntentHandler { final Map<String, String> mHeaders; final PreloadedTabControl mPreloadedTab; final String mSearchBoxQueryToSubmit; + final boolean mDisableUrlOverride; UrlData(String url) { this.mUrl = url; this.mHeaders = null; this.mPreloadedTab = null; this.mSearchBoxQueryToSubmit = null; + this.mDisableUrlOverride = false; } UrlData(String url, Map<String, String> headers, Intent intent) { @@ -353,6 +355,12 @@ public class IntentHandler { this.mHeaders = headers; this.mPreloadedTab = preloaded; this.mSearchBoxQueryToSubmit = searchBoxQueryToSubmit; + if (intent != null) { + mDisableUrlOverride = intent.getBooleanExtra( + BrowserActivity.EXTRA_DISABLE_URL_OVERRIDE, false); + } else { + mDisableUrlOverride = false; + } } boolean isEmpty() { |