Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1

Browse Source
This commit is contained in:
Bart Sears
2012-01-04 13:47:09 -08:00
committed by Android (Google) Code Review
parent fb578b6b88 b2c63abcdc
commit 705665acda
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/webkit/BrowserFrame.java
View File

@@ -941,6 +941,13 @@ class BrowserFrame extends Handler {
if (androidResource != null) { if (androidResource != null) {
return new WebResourceResponse(null, null, androidResource); return new WebResourceResponse(null, null, androidResource);
} }
// Note that we check this after looking for an android_asset or
// android_res URL, as we allow those even if file access is disabled.
if (!mSettings.getAllowFileAccess() && url.startsWith("file://")) {
return new WebResourceResponse(null, null, null);
}
WebResourceResponse response = mCallbackProxy.shouldInterceptRequest(url); WebResourceResponse response = mCallbackProxy.shouldInterceptRequest(url);
if (response == null && "browser:incognito".equals(url)) { if (response == null && "browser:incognito".equals(url)) {
try { try {