diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-18 18:37:18 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-18 18:37:18 +0000 |
| commit | f0fcf8c85a14e4f316758fe66e61cd82dcbccbc0 (patch) | |
| tree | 8e6535470ec24edc2f2fafcaf8e081ea20a11e35 /core/java/android/util/CloseGuard.java | |
| parent | 06888f4a2ae47bc282607513e6a05b5592694815 (diff) | |
| parent | 16257918c996d17a51b3ef22a09537cbc4894f41 (diff) | |
Merge "Fix android.util.CloseGuard sample usage" am: 7381525076 am: 66b0e7d150 am: 16257918c9
Change-Id: I23ca1a8ca61e62b20c5b5eff0c7e9ef10c2e6711
Diffstat (limited to 'core/java/android/util/CloseGuard.java')
| -rw-r--r-- | core/java/android/util/CloseGuard.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/core/java/android/util/CloseGuard.java b/core/java/android/util/CloseGuard.java index c39a6c9aac93..6ac769623bff 100644 --- a/core/java/android/util/CloseGuard.java +++ b/core/java/android/util/CloseGuard.java @@ -38,6 +38,11 @@ import android.annotation.NonNull; * public void cleanup() { * guard.close(); * ...; + * if (Build.VERSION.SDK_INT >= 28) { + * Reference.reachabilityFence(this); + * } + * // For full correctness in the absence of a close() call, other methods may also need + * // reachabilityFence() calls. * } * * protected void finalize() throws Throwable { @@ -75,7 +80,9 @@ import android.annotation.NonNull; * public void cleanup() { * guard.close(); * ...; - * Reference.reachabilityFence(this); + * if (Build.VERSION.SDK_INT >= 28) { + * Reference.reachabilityFence(this); + * } * // For full correctness in the absence of a close() call, other methods may also need * // reachabilityFence() calls. * } |