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

Merge "Revert "Revert "Revert "Revert "SharedMemory: break Cleaner reference cycle.""""" into sc-v2-dev

Browse Source
This commit is contained in:
John Reck
2021-11-30 23:31:11 +00:00
committed by Android (Google) Code Review
parent bb9b3aa14f ea9f91778e
commit 13d840f012
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,7 +63,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, mMemoryRegistration)); new Closer(mFileDescriptor.getInt$(), mMemoryRegistration));
} }
/** /**
@@ -256,6 +256,7 @@ public final class SharedMemory implements Parcelable, Closeable {
*/ */
@Override @Override
public void close() { public void close() {
mFileDescriptor.setInt$(-1);
if (mCleaner != null) { if (mCleaner != null) {
mCleaner.clean(); mCleaner.clean();
mCleaner = null; mCleaner = null;
@@ -305,10 +306,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 FileDescriptor mFd; private int mFd;
private MemoryRegistration mMemoryReference; private MemoryRegistration mMemoryReference;
private Closer(FileDescriptor fd, MemoryRegistration memoryReference) { private Closer(int fd, MemoryRegistration memoryReference) {
mFd = fd; mFd = fd;
mMemoryReference = memoryReference; mMemoryReference = memoryReference;
} }
@@ -316,7 +317,9 @@ public final class SharedMemory implements Parcelable, Closeable {
@Override @Override
public void run() { public void run() {
try { try {
Os.close(mFd); FileDescriptor fd = new FileDescriptor();
fd.setInt$(mFd);
Os.close(fd);
} catch (ErrnoException e) { /* swallow error */ } } catch (ErrnoException e) { /* swallow error */ }
mMemoryReference.release(); mMemoryReference.release();
mMemoryReference = null; mMemoryReference = null;

9
core/java/android/os/TEST_MAPPING
View File

@@ -73,6 +73,15 @@
"[^/]*BatteryConsumer[^/]*\\.java" "[^/]*BatteryConsumer[^/]*\\.java"
], ],
"name": "BatteryUsageStatsProtoTests" "name": "BatteryUsageStatsProtoTests"
},
{
"file_patterns": ["SharedMemory[^/]*\\.java"],
"name": "CtsOsTestCases",
"options": [
{
"include-filter": "android.os.cts.SharedMemoryTest"
}
]
} }
], ],
"postsubmit": [ "postsubmit": [