summaryrefslogtreecommitdiff
path: root/src/com/android/browser/Controller.java
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-06-05 09:22:59 -0700
committerJohn Reck <jreck@google.com>2012-06-14 13:32:07 -0700
commit38b3965028e4ac433de9d43c02d3167ff0ef208c (patch)
tree231187b7128fffe0ed6d54591eb9c544ab4abe9d /src/com/android/browser/Controller.java
parentc41c31925e30a989f12e2e20bfd6714e9975a0b1 (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/Controller.java')
-rw-r--r--src/com/android/browser/Controller.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index ebfd56fb..eefeffee 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -2574,6 +2574,9 @@ public class Controller
if (data.isPreloaded()) {
// this isn't called for preloaded tabs
} else {
+ if (t != null && data.mDisableUrlOverride) {
+ t.disableUrlOverridingForLoad();
+ }
loadUrl(t, data.mUrl, data.mHeaders);
}
}