Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 705665ac authored by Bart Sears's avatar Bart Sears Committed by Android (Google) Code Review
Browse files

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

parents fb578b6b b2c63abc

core/java/android/webkit/BrowserFrame.java

+7 −0
Original line number Diff line number Diff line
@@ -941,6 +941,13 @@ class BrowserFrame extends Handler { 
        if (androidResource != null) {

            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);

        if (response == null && "browser:incognito".equals(url)) {

            try {