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

Commit 770bc122 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['android-review.googlesource.com/3470321'] into... 

Merge cherrypicks of ['android-review.googlesource.com/3470321'] into sparse-13003188-L84000030009306061.
SPARSE_CHANGE: I5d410f05b061a41e089fa652e5565224a3488baf

Change-Id: I48de93d0322d95956549878e0fd24c84cade5d9a
parents d57664e9 7ae3b07c

core/java/android/os/SharedMemory.java

+9 −9
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ import android.system.OsConstants; 


import dalvik.system.VMRuntime;



import libcore.io.IoUtils;



import java.io.Closeable;

import java.io.FileDescriptor;

import java.io.IOException;
@@ -65,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));

    }



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

    @Override

    public void close() {

        mFileDescriptor.setInt$(-1);

        if (mCleaner != null) {

            mCleaner.clean();

            mCleaner = null;
@@ -327,20 +326,21 @@ 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;

            IoUtils.setFdOwner(mFd, this);

            mMemoryReference = memoryReference;

        }



        @Override

        public void run() {

            IoUtils.closeQuietly(mFd);

            mFd = null;



            try {

                FileDescriptor fd = new FileDescriptor();

                fd.setInt$(mFd);

                Os.close(fd);

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

            mMemoryReference.release();

            mMemoryReference = null;

        }