Merge changes I8bdb4c74,I613a7d03 into qt-dev

am: a09ee2d39f Change-Id: Ibcbc22b6f4f77825f16e52a832e28fcb40d3fa6d
2019-07-25 17:41:26 -07:00
parent 1c1dc4ddc8 a09ee2d39f
commit 655d6f5cde
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