diff options
| author | Selim Gurun <sgurun@google.com> | 2012-03-14 16:24:31 -0700 |
|---|---|---|
| committer | Selim Gurun <sgurun@google.com> | 2012-03-14 16:24:31 -0700 |
| commit | 658dcd87db14935275d5cbabdd63662c41062ed2 (patch) | |
| tree | 9c786344d5464019a97ceb128681ae177dd5d81a /core/java/android/webkit/BrowserFrame.java | |
| parent | 772a73963d22163deff3fd3c7f65013ccb941f34 (diff) | |
Fix file path calculation for asset files.
Bug: 6019611
filter out query params and URI fragments from file path.
Change-Id: Ia5892490a5ffa89d82b52c2a5e6956a244566a4a
Diffstat (limited to 'core/java/android/webkit/BrowserFrame.java')
| -rw-r--r-- | core/java/android/webkit/BrowserFrame.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/webkit/BrowserFrame.java b/core/java/android/webkit/BrowserFrame.java index f09e29d857df..dbcea71ef180 100644 --- a/core/java/android/webkit/BrowserFrame.java +++ b/core/java/android/webkit/BrowserFrame.java @@ -742,7 +742,8 @@ class BrowserFrame extends Handler { url = url.replaceFirst(ANDROID_ASSET, ""); try { AssetManager assets = mContext.getAssets(); - return assets.open(url, AssetManager.ACCESS_STREAMING); + Uri uri = Uri.parse(url); + return assets.open(uri.getPath(), AssetManager.ACCESS_STREAMING); } catch (IOException e) { return null; } |