diff options
| author | 2019-07-25 17:33:51 -0700 | |
|---|---|---|
| committer | 2019-07-25 17:33:51 -0700 | |
| commit | de90a881a71b11529213eb58b2c2a50f59623f80 (patch) | |
| tree | eb389e7258a1325f18745539001a243fce0275c1 | |
| parent | ceb633ae4d688836d0060a11429f6659dd12bc06 (diff) | |
| parent | 036d594c698fc06695719c90235a36d098a367d4 (diff) | |
Merge changes I8bdb4c74,I613a7d03 into qt-dev am: a09ee2d39f
am: 036d594c69
Change-Id: Ib925304a870e5d9881147eaa9831e57be4dda6a9
| -rw-r--r-- | core/java/android/os/SharedMemory.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/os/SharedMemory.java b/core/java/android/os/SharedMemory.java index 3e2ba3d3115f..0540e3611b52 100644 --- 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 |