Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae5ace55 authored by Jeff Hamilton's avatar Jeff Hamilton Committed by Android Git Automerger
Browse files

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

* commit 'bd8ff5b5':
  DO NOT MERGE. Fix asset file descriptor for pipe based fds.
parents f3b87c2e bd8ff5b5

core/java/android/content/res/AssetFileDescriptor.java

+5 −1
Original line number Diff line number Diff line
@@ -130,7 +130,11 @@ public class AssetFileDescriptor implements Parcelable { 
     * Checks whether this file descriptor is for a memory file.

     */

    private boolean isMemoryFile() throws IOException {

        try {

            return MemoryFile.isMemoryFile(mFd.getFileDescriptor());

        } catch (IOException e) {

            return false;

        }

    }



    /**