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

Merge changes I8bdb4c74,I613a7d03 into qt-dev am: a09ee2d39f

Browse Source 
am: 036d594c69

Change-Id: I9cd5933da6620f8877b813f60a4f768291c2a3ba
This commit is contained in:
Josh Gao
2019-07-25 17:32:57 -07:00
committed by android-build-merger
parent ae07ce5d0b 036d594c69
commit 4a99f4ca90
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,7 +62,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));
}
/**
@@ -259,6 +259,9 @@ public final class SharedMemory implements Parcelable, Closeable {
mCleaner.clean();
mCleaner = null;
}
// Cleaner.clean doesn't clear the value of the file descriptor.
mFileDescriptor.setInt$(-1);
}
@Override
@@ -290,10 +293,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;
}
@@ -301,7 +304,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;