From ea9f91778e1f7fa580b48808b6a21b26862a6e2c Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Wed, 29 Sep 2021 14:06:28 +0000
Subject: [PATCH] Revert "Revert "Revert "Revert "SharedMemory: break Cleaner
 reference cycle.""""

This reverts commit d27119ce0a12e57860d0b5a8e8c7a30c0b633c26.

Reason for revert: This is still an extremely necessary FD leak fix

Test: android.os.cts.SharedMemoryTest passes
Fixes: 206767336

Change-Id: I33cdbde0554b9e1cb7e9f8ea3ee8dfbd30fe8a89
(cherry picked from commit 6d4a948b3d589ad74dc4042f5bb7396e04160c64)
---
 core/java/android/os/SharedMemory.java | 11 +++++++----
 core/java/android/os/TEST_MAPPING      |  9 +++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/core/java/android/os/SharedMemory.java b/core/java/android/os/SharedMemory.java
index 136e3de731a91..da478594dc1c8 100644
--- a/core/java/android/os/SharedMemory.java
+++ b/core/java/android/os/SharedMemory.java
@@ -63,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));
     }
 
     /**
@@ -256,6 +256,7 @@ public final class SharedMemory implements Parcelable, Closeable {
      */
     @Override
     public void close() {
+        mFileDescriptor.setInt$(-1);
         if (mCleaner != null) {
             mCleaner.clean();
             mCleaner = null;
@@ -305,10 +306,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;
         }
@@ -316,7 +317,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;
diff --git a/core/java/android/os/TEST_MAPPING b/core/java/android/os/TEST_MAPPING
index 55b1f940c7644..07f40828eb56a 100644
--- a/core/java/android/os/TEST_MAPPING
+++ b/core/java/android/os/TEST_MAPPING
@@ -73,6 +73,15 @@
         "[^/]*BatteryConsumer[^/]*\\.java"
       ],
       "name": "BatteryUsageStatsProtoTests"
+    },
+    {
+      "file_patterns": ["SharedMemory[^/]*\\.java"],
+      "name": "CtsOsTestCases",
+      "options": [
+        {
+          "include-filter": "android.os.cts.SharedMemoryTest"
+        }
+      ]
     }
   ],
   "postsubmit": [