summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSelim Gurun <sgurun@google.com>2014-01-15 10:02:36 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-15 10:02:36 -0800
commitd5b4fe1a50f07755cfa67ad80a5871019713b6a0 (patch)
tree67fd85f60d3ee8e2b5720c8b476e46e3b02bc73a
parent7422f735fc532f7a862d11805a641d1cb5e29569 (diff)
parent816688be5d55974d05fb1dddac784bb36e0296bd (diff)
downloadBrowser-d5b4fe1a50f07755cfa67ad80a5871019713b6a0.tar.gz
am 816688be: DO NOT MERGE Do not let intents request viewing private browser files
* commit '816688be5d55974d05fb1dddac784bb36e0296bd': DO NOT MERGE Do not let intents request viewing private browser files
-rw-r--r--src/com/android/browser/IntentHandler.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/browser/IntentHandler.java b/src/com/android/browser/IntentHandler.java
index f0998a44..9f054990 100644
--- a/src/com/android/browser/IntentHandler.java
+++ b/src/com/android/browser/IntentHandler.java
@@ -107,6 +107,13 @@ public class IntentHandler {
urlData = new UrlData(mSettings.getHomePage());
}
+ // If url is to view private data files, don't allow.
+ Uri uri = intent.getData();
+ if (uri != null && uri.getScheme().startsWith("file") &&
+ uri.getPath().startsWith(mActivity.getDatabasePath("foo").getParent())) {
+ return;
+ }
+
if (intent.getBooleanExtra(Browser.EXTRA_CREATE_NEW_TAB, false)
|| urlData.isPreloaded()) {
Tab t = mController.openTab(urlData);