commit 38b3965028e4ac433de9d43c02d3167ff0ef208c
author John Reck <jreck@google.com> Tue Jun 05 09:22:59 2012 -0700
committer John Reck <jreck@google.com> Thu Jun 14 13:32:07 2012 -0700
tree 231187b7128fffe0ed6d54591eb9c544ab4abe9d
parent c41c31925e30a989f12e2e20bfd6714e9975a0b1

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/Controller.java

diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index ebfd56f..eefeffe 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -2574,6 +2574,9 @@
             if (data.isPreloaded()) {
                 // this isn't called for preloaded tabs
             } else {
+                if (t != null && data.mDisableUrlOverride) {
+                    t.disableUrlOverridingForLoad();
+                }
                 loadUrl(t, data.mUrl, data.mHeaders);
             }
         }