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

Merge cherrypicks of [8943691, 8943693] into qt-release

Browse Source 
Change-Id: I18db5ed890671b17c80acc71b0ab23e78b6c585b
This commit is contained in:
android-build-team Robot
2019-07-26 17:35:56 +00:00
parent 86e0e0ba19 90a3bc3372
commit a45d6a7e84
1 changed files with 4 additions and 9 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.getInt$(), mMemoryRegistration));
new Closer(mFileDescriptor, mMemoryRegistration));
}
/**
@@ -259,9 +259,6 @@ 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
@@ -293,10 +290,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;
}
@@ -304,9 +301,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;