From 62cadf153f7c15e8f62550dd50c646ac9b42f3dd Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Wed, 24 Apr 2013 15:58:22 -0700 Subject: [PATCH] Workaround for bug 8700358: Reproducible WebView crash in Feedly starting in JWR22B Catching all excptions from reading from the AssetManager Change-Id: I53f99484deda3778307eab2ae86ca9fc0ad2fead --- core/java/android/webkit/BrowserFrame.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/core/java/android/webkit/BrowserFrame.java b/core/java/android/webkit/BrowserFrame.java index 33e83649aef07..bfca5e51f0db4 100644 --- a/core/java/android/webkit/BrowserFrame.java +++ b/core/java/android/webkit/BrowserFrame.java @@ -762,13 +762,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)) {