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

am: 4a99f4ca90 Change-Id: If1ca5d391b6cfa6262561110bd39ce2287d694d3
2019-07-25 17:44:29 -07:00
parent 6053244b9a 4a99f4ca90
commit b8b30294e2
1 changed files with 3 additions and 0 deletions
--- a/core/java/android/os/SharedMemory.java
+++ b/core/java/android/os/SharedMemory.java
@@ -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