diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-02-10 15:44:00 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-02-10 15:44:00 -0800 |
| commit | d24b8183b93e781080b2c16c487e60d51c12da31 (patch) | |
| tree | fbb89154858984eb8e41556da7e9433040d55cd4 /core/java/android/webkit/FileLoader.java | |
| parent | f1e484acb594a726fb57ad0ae4cfe902c7f35858 (diff) | |
auto import from //branches/cupcake/...@130745
Diffstat (limited to 'core/java/android/webkit/FileLoader.java')
| -rw-r--r-- | core/java/android/webkit/FileLoader.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/webkit/FileLoader.java b/core/java/android/webkit/FileLoader.java index 10343b2c0e24..54a4c1d12468 100644 --- a/core/java/android/webkit/FileLoader.java +++ b/core/java/android/webkit/FileLoader.java @@ -76,8 +76,12 @@ class FileLoader extends StreamLoader { protected boolean setupStreamAndSendStatus() { try { if (mIsAsset) { - mDataStream = mContext.getAssets().open(mPath, - AssetManager.ACCESS_STREAMING); + try { + mDataStream = mContext.getAssets().open(mPath); + } catch (java.io.FileNotFoundException ex) { + // try the rest files included in the package + mDataStream = mContext.getAssets().openNonAsset(mPath); + } } else { if (!mAllowFileAccess) { mHandler.error(EventHandler.FILE_ERROR, |