summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Seaton <aseaton@google.com>2019-07-26 17:14:01 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-07-26 17:35:35 +0000
commita7eed88f4e68c403d6a726283849bcd826238616 (patch)
treec97237fffe8ac848a249646378ff9bd720e6ca0b
parent86e0e0ba19c81b974b9bc26524b7a16f5f98f82a (diff)
downloadbase-a7eed88f4e68c403d6a726283849bcd826238616.tar.gz
Revert "SharedMemory: clear file descriptor when explicitly closed."
Bug: 138422309 This reverts commit 20ab1e34273aa179053f5dc93e70c0191a39e91b. Reason for revert: crashes documented in b/138422309 Change-Id: Ic9e33fdb24bad2b30f0eb357d6752c1834df41d5 (cherry picked from commit 5966196515ec44190386d9966da3f762859b7b78)
-rw-r--r--core/java/android/os/SharedMemory.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/core/java/android/os/SharedMemory.java b/core/java/android/os/SharedMemory.java
index 0540e3611b52..3e2ba3d3115f 100644
--- a/core/java/android/os/SharedMemory.java
+++ b/core/java/android/os/SharedMemory.java
@@ -259,9 +259,6 @@ 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