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

Commit 12ea937f authored by John Reck's avatar John Reck
Browse files

Fix regression in PFD#fromData 

Don't rely on the GC to clean up FD resources when they can
just be cleaned up immediately. We know the MemoryFile isn't
going to be used any further, so just close it.

Bug: 138323667
Test: Repro steps in bug. Verified addresses FD leak in system_server from repeatedly opening & closing settings.
Change-Id: Ic82006c9cb48f580aaad942c4679e774186382c9
parent 58184123

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();

        }

    }



    /**