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

Commit 524d0b6f authored by John Reck's avatar John Reck Committed by android-build-merger
Browse files

Merge "Fix regression in PFD#fromData" into qt-r1-dev am: 1775a489 

am: 1efbccc5

Change-Id: Ifa8cc2718ec176143c835c824c09cccb747914b0
parents edc6f40a 1efbccc5

core/java/android/os/ParcelFileDescriptor.java

+9 −5
Original line number Diff line number Diff line
@@ -581,12 +581,16 @@ public class ParcelFileDescriptor implements Parcelable, Closeable { 
    public static ParcelFileDescriptor fromData(byte[] data, String name) throws IOException {

        if (data == null) return null;

        MemoryFile file = new MemoryFile(name, data.length);

        try {

            if (data.length > 0) {

                file.writeBytes(data, 0, 0, data.length);

            }

            file.deactivate();

            FileDescriptor fd = file.getFileDescriptor();

            return fd != null ? ParcelFileDescriptor.dup(fd) : null;

        } finally {

            file.close();

        }

    }



    /**