Merge "DO NOT MERGE. Fix asset file descriptor for pipe based fds." into gingerbread

2010-10-28 14:01:21 -07:00
parent 9112b8ebd2 145fe77dbf
commit bd8ff5b5d4
1 changed files with 5 additions and 1 deletions
--- a/core/java/android/content/res/AssetFileDescriptor.java
+++ b/core/java/android/content/res/AssetFileDescriptor.java
@@ -130,7 +130,11 @@ public class AssetFileDescriptor implements Parcelable {
     * Checks whether this file descriptor is for a memory file.
     */
    private boolean isMemoryFile() throws IOException {
-        return MemoryFile.isMemoryFile(mFd.getFileDescriptor());
+        try {
+            return MemoryFile.isMemoryFile(mFd.getFileDescriptor());
+        } catch (IOException e) {
+            return false;
+        }
    }

    /**