summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarcin Kosiba <mkosiba@google.com>2014-05-09 17:52:39 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-09 17:52:39 +0000
commit397ff6ba26dd37e40fbabe2a893da4d10704a48d (patch)
tree612510a5ff7d1c1419b176b9b9417c10d97f91ef /src
parent30879d5e687515cbbd73dbe19efd7fd5dfbc00de (diff)
parentd42aa9ebbf2647445c2848ea9ede6c526bc59f3a (diff)
downloadBrowser-397ff6ba26dd37e40fbabe2a893da4d10704a48d.tar.gz
am d42aa9eb: am bac9c87b: Sanitize selector Intent when handling intent: scheme.
* commit 'd42aa9ebbf2647445c2848ea9ede6c526bc59f3a': Sanitize selector Intent when handling intent: scheme.
Diffstat (limited to 'src')
-rw-r--r--src/com/android/browser/UrlHandler.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/browser/UrlHandler.java b/src/com/android/browser/UrlHandler.java
index 167d4105..e21e3e87 100644
--- a/src/com/android/browser/UrlHandler.java
+++ b/src/com/android/browser/UrlHandler.java
@@ -160,6 +160,11 @@ public class UrlHandler {
// security (only access to BROWSABLE activities).
intent.addCategory(Intent.CATEGORY_BROWSABLE);
intent.setComponent(null);
+ Intent selector = intent.getSelector();
+ if (selector != null) {
+ selector.addCategory(Intent.CATEGORY_BROWSABLE);
+ selector.setComponent(null);
+ }
// Re-use the existing tab if the intent comes back to us
if (tab != null) {
if (tab.getAppId() == null) {