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

Commit 58665709 authored by Kristian Monsen's avatar Kristian Monsen Committed by Android (Google) Code Review
Browse files

Merge "Workaround for bug 8700358: Reproducible WebView crash in Feedly... 

Merge "Workaround for bug 8700358: Reproducible WebView crash in Feedly starting in JWR22B" into jb-mr2-dev
parents e00a3b80 62cadf15

core/java/android/webkit/BrowserFrame.java

+5 −2
Original line number Diff line number Diff line
@@ -757,13 +757,16 @@ class BrowserFrame extends Handler { 
                return null;

            }

        } else if (url.startsWith(ANDROID_ASSET)) {

            url = url.replaceFirst(ANDROID_ASSET, "");

            String assetUrl = url.replaceFirst(ANDROID_ASSET, "");

            try {

                AssetManager assets = mContext.getAssets();

                Uri uri = Uri.parse(url);

                Uri uri = Uri.parse(assetUrl);

                return assets.open(uri.getPath(), AssetManager.ACCESS_STREAMING);

            } catch (IOException e) {

                return null;

            } catch (Exception e) {

                Log.w(LOGTAG, "Problem loading url: " + url, e);

                return null;

            }

        } else if (mSettings.getAllowContentAccess() &&

                   url.startsWith(ANDROID_CONTENT)) {