Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'bd8ff5b5d4f4c74889ce20a0c7a2f8e0ab7b6ea9':
  DO NOT MERGE. Fix asset file descriptor for pipe based fds.
This commit is contained in:
Jeff Hamilton
2010-10-28 14:03:40 -07:00
committed by Android Git Automerger
parent f3b87c2ebd bd8ff5b5d4
commit ae5ace55d9
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/content/res/AssetFileDescriptor.java
View File

@@ -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;
}
}
/**