From 339d447785456d00754417af59a741c40ef07da3 Mon Sep 17 00:00:00 2001 From: Hans Boehm Date: Thu, 30 May 2019 15:48:17 -0700 Subject: [PATCH] Add comment that mWrapped ==> mClosed This captures the discussion from ag/361549, which I found nonobvious. Bug: 133424499 Test: Treehugger Change-Id: Ia59aa3ef46e5e4e0dbb9411241feaae0b9919ad1 --- core/java/android/os/ParcelFileDescriptor.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/java/android/os/ParcelFileDescriptor.java b/core/java/android/os/ParcelFileDescriptor.java index 8355e08b6aa8c..f59bfd100e115 100644 --- a/core/java/android/os/ParcelFileDescriptor.java +++ b/core/java/android/os/ParcelFileDescriptor.java @@ -79,6 +79,7 @@ public class ParcelFileDescriptor implements Parcelable, Closeable { /** * Wrapped {@link ParcelFileDescriptor}, if any. Used to avoid * double-closing {@link #mFd}. + * mClosed is always true if mWrapped is non-null. */ private final ParcelFileDescriptor mWrapped; @@ -1018,6 +1019,7 @@ public class ParcelFileDescriptor implements Parcelable, Closeable { } try { if (!mClosed) { + // mWrapped was and is null. closeWithStatus(Status.LEAKED, null); } } finally {