From 145fe77dbf930761ccc8617f93014bf88afc7140 Mon Sep 17 00:00:00 2001 From: Jeff Hamilton Date: Thu, 28 Oct 2010 15:05:27 -0500 Subject: DO NOT MERGE. Fix asset file descriptor for pipe based fds. Change-Id: Ic366d01f91017109abfcfa65bd2231dd7416ce71 --- core/java/android/content/res/AssetFileDescriptor.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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; + } } /** -- cgit v1.2.3-59-g8ed1b