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

Commit d27119ce authored by Devika Krishnadas's avatar Devika Krishnadas
Browse files

Revert "Revert "Revert "SharedMemory: break Cleaner reference cycle.""" 

This reverts commit 2d7554cf.

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/tests/view?invocationId=I33000009987055287&testResultId=TR81527754446280364, bug b/201476307

BUG: 201476307
Change-Id: I0cb973037300a6198d43aef7c988a01b62392c27
parent 2d7554cf

core/java/android/os/SharedMemory.java

+4 −6
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ public final class SharedMemory implements Parcelable, Closeable { 


        mMemoryRegistration = new MemoryRegistration(mSize);

        mCleaner = Cleaner.create(mFileDescriptor,

                new Closer(mFileDescriptor.getInt$(), mMemoryRegistration));

                new Closer(mFileDescriptor, mMemoryRegistration));

    }



    /**
@@ -325,10 +325,10 @@ public final class SharedMemory implements Parcelable, Closeable { 
     * Cleaner that closes the FD

     */

    private static final class Closer implements Runnable {

        private int mFd;

        private FileDescriptor mFd;

        private MemoryRegistration mMemoryReference;



        private Closer(int fd, MemoryRegistration memoryReference) {

        private Closer(FileDescriptor fd, MemoryRegistration memoryReference) {

            mFd = fd;

            mMemoryReference = memoryReference;

        }
@@ -336,9 +336,7 @@ public final class SharedMemory implements Parcelable, Closeable { 
        @Override

        public void run() {

            try {

                FileDescriptor fd = new FileDescriptor();

                fd.setInt$(mFd);

                Os.close(fd);

                Os.close(mFd);

            } catch (ErrnoException e) { /* swallow error */ }

            mMemoryReference.release();

            mMemoryReference = null;