From d24b8183b93e781080b2c16c487e60d51c12da31 Mon Sep 17 00:00:00 2001
From: The Android Open Source Project <initial-contribution@android.com>
Date: Tue, 10 Feb 2009 15:44:00 -0800
Subject: auto import from //branches/cupcake/...@130745

---
 core/java/android/webkit/FileLoader.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'core/java/android/webkit/FileLoader.java')

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,
-- 
cgit v1.2.3