diff options
| author | Jeff Hamilton <jham@android.com> | 2010-10-28 15:05:27 -0500 |
|---|---|---|
| committer | Jeff Hamilton <jham@android.com> | 2010-10-28 15:05:27 -0500 |
| commit | 145fe77dbf930761ccc8617f93014bf88afc7140 (patch) | |
| tree | 252f12d4a051efbd437d815d19d419db0351569b /core | |
| parent | 7d452f693f06dfa4ad6a26a51ce03edf60107e8c (diff) | |
| download | frameworks_base-145fe77dbf930761ccc8617f93014bf88afc7140.zip frameworks_base-145fe77dbf930761ccc8617f93014bf88afc7140.tar.gz frameworks_base-145fe77dbf930761ccc8617f93014bf88afc7140.tar.bz2 | |
DO NOT MERGE. Fix asset file descriptor for pipe based fds.
Change-Id: Ic366d01f91017109abfcfa65bd2231dd7416ce71
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/content/res/AssetFileDescriptor.java | 6 |
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 a37e4e8..34f1f5c 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; + } } /** |