From 5966196515ec44190386d9966da3f762859b7b78 Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Fri, 26 Jul 2019 17:14:01 +0000 Subject: [PATCH] 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 --- core/java/android/os/SharedMemory.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/core/java/android/os/SharedMemory.java b/core/java/android/os/SharedMemory.java index 0540e3611b52c..3e2ba3d3115f7 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