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

1 files changed, 5 insertions, 1 deletions

diff --git a/core/java/android/content/res/AssetFileDescriptor.java b/core/java/android/content/res/AssetFileDescriptor.java
index a37e4e8cc3bf..34f1f5c30229 100644
--- 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;
+        }
     }
 
     /**