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

Commit ea9f9177 authored by John Reck's avatar John Reck
Browse files

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

This reverts commit d27119ce.

Reason for revert: This is still an extremely necessary FD leak fix

Test: android.os.cts.SharedMemoryTest passes
Fixes: 206767336

Change-Id: I33cdbde0554b9e1cb7e9f8ea3ee8dfbd30fe8a89
(cherry picked from commit 6d4a948b)
parent cfcfa223

core/java/android/os/SharedMemory.java

+7 −4
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, mMemoryRegistration));

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

    }



    /**
@@ -256,6 +256,7 @@ public final class SharedMemory implements Parcelable, Closeable { 
     */

    @Override

    public void close() {

        mFileDescriptor.setInt$(-1);

        if (mCleaner != null) {

            mCleaner.clean();

            mCleaner = null;
@@ -305,10 +306,10 @@ public final class SharedMemory implements Parcelable, Closeable { 
     * Cleaner that closes the FD

     */

    private static final class Closer implements Runnable {

        private FileDescriptor mFd;

        private int mFd;

        private MemoryRegistration mMemoryReference;



        private Closer(FileDescriptor fd, MemoryRegistration memoryReference) {

        private Closer(int fd, MemoryRegistration memoryReference) {

            mFd = fd;

            mMemoryReference = memoryReference;

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

        public void run() {

            try {

                Os.close(mFd);

                FileDescriptor fd = new FileDescriptor();

                fd.setInt$(mFd);

                Os.close(fd);

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

            mMemoryReference.release();

            mMemoryReference = null;

core/java/android/os/TEST_MAPPING

+9 −0
Original line number Diff line number Diff line
@@ -73,6 +73,15 @@ 
        "[^/]*BatteryConsumer[^/]*\\.java"

      ],

      "name": "BatteryUsageStatsProtoTests"

    },

    {

      "file_patterns": ["SharedMemory[^/]*\\.java"],

      "name": "CtsOsTestCases",

      "options": [

        {

          "include-filter": "android.os.cts.SharedMemoryTest"

        }

      ]

    }

  ],

  "postsubmit": [