From 38b3965028e4ac433de9d43c02d3167ff0ef208c Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Tue, 5 Jun 2012 09:22:59 -0700
Subject: 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
---
 src/com/android/browser/IntentHandler.java | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/com/android/browser/IntentHandler.java')

diff --git a/src/com/android/browser/IntentHandler.java b/src/com/android/browser/IntentHandler.java
index e22c5dc91..f0998a442 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() {
-- 
cgit v1.2.3