Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "SharedMemory: break Cleaner reference cycle." Bug: 138422309" into qt-dev

Browse Source
This commit is contained in:
bsears
2019-07-26 23:03:15 +00:00
committed by Android (Google) Code Review
parent 480f1db9bc b16411f83a
commit d4b0c9348a
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/os/SharedMemory.java
View File

@@ -62,7 +62,7 @@ public final class SharedMemory implements Parcelable, Closeable {
mMemoryRegistration = new MemoryRegistration(mSize); mMemoryRegistration = new MemoryRegistration(mSize);
mCleaner = Cleaner.create(mFileDescriptor, mCleaner = Cleaner.create(mFileDescriptor,
new Closer(mFileDescriptor.getInt$(), mMemoryRegistration)); new Closer(mFileDescriptor, mMemoryRegistration));
} }
/** /**
@@ -290,10 +290,10 @@ public final class SharedMemory implements Parcelable, Closeable {
* Cleaner that closes the FD * Cleaner that closes the FD
*/ */
private static final class Closer implements Runnable { private static final class Closer implements Runnable {
private int mFd; private FileDescriptor mFd;
private MemoryRegistration mMemoryReference; private MemoryRegistration mMemoryReference;
private Closer(int fd, MemoryRegistration memoryReference) { private Closer(FileDescriptor fd, MemoryRegistration memoryReference) {
mFd = fd; mFd = fd;
mMemoryReference = memoryReference; mMemoryReference = memoryReference;
} }
@@ -301,9 +301,7 @@ public final class SharedMemory implements Parcelable, Closeable {
@Override @Override
public void run() { public void run() {
try { try {
FileDescriptor fd = new FileDescriptor(); Os.close(mFd);
fd.setInt$(mFd);
Os.close(fd);
} catch (ErrnoException e) { /* swallow error */ } } catch (ErrnoException e) { /* swallow error */ }
mMemoryReference.release(); mMemoryReference.release();
mMemoryReference = null; mMemoryReference = null;