diff options
| author | Jeff Hamilton <jham@android.com> | 2010-10-28 14:03:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-28 14:03:40 -0700 |
| commit | ae5ace55d9fc45bc11608c9fb59c9ee884fd9ea6 (patch) | |
| tree | bcfe855330045b69e5817661e0720a1cc78858e9 /core/java | |
| parent | f3b87c2ebd69f96969659a4ab7f2eb55fa90189d (diff) | |
| parent | bd8ff5b5d4f4c74889ce20a0c7a2f8e0ab7b6ea9 (diff) | |
am bd8ff5b5: Merge "DO NOT MERGE. Fix asset file descriptor for pipe based fds." into gingerbread
* commit 'bd8ff5b5d4f4c74889ce20a0c7a2f8e0ab7b6ea9':
DO NOT MERGE. Fix asset file descriptor for pipe based fds.
Diffstat (limited to 'core/java')
| -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 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; + } } /** |