DO NOT MERGE. Fix asset file descriptor for pipe based fds.

Change-Id: Ic366d01f91017109abfcfa65bd2231dd7416ce71
2010-10-28 15:05:27 -05:00
parent 7d452f693f
commit 145fe77dbf
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;
+        }
    }

    /**