diff options
author | Selim Gurun <sgurun@google.com> | 2014-01-15 10:12:47 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-15 10:12:47 -0800 |
commit | f450dfcadc218c3cbb81de642448a6c97e213677 (patch) | |
tree | 45efaa584ecb8cb8af3e365218c319fa1e404a8f /src | |
parent | c7e711599ced508057cf96f4a120a8ed8f8636a3 (diff) | |
parent | 40c2b93ef0128756bd1a3bb1d471ab515a181404 (diff) | |
download | Browser-f450dfcadc218c3cbb81de642448a6c97e213677.tar.gz |
am 40c2b93e: am d5b4fe1a: am 816688be: DO NOT MERGE Do not let intents request viewing private browser files
* commit '40c2b93ef0128756bd1a3bb1d471ab515a181404':
DO NOT MERGE Do not let intents request viewing private browser files
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/browser/IntentHandler.java | 7 |
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); |