diff options
| -rw-r--r-- | core/java/android/webkit/BrowserFrame.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/webkit/BrowserFrame.java b/core/java/android/webkit/BrowserFrame.java index 33e83649aef0..bfca5e51f0db 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)) { |