From 242b93b7605b46fc025bc51165bef4a9e9c1d175 Mon Sep 17 00:00:00 2001
From: Hans Boehm <hboehm@google.com>
Date: Thu, 18 Jan 2018 20:21:29 -0800
Subject: [PATCH] Add reachabilityFence, remove ExemptionMechanism.finalize

ReachabilityFence is taken from Java 9.

ExemptionMechanism.finalize was never useful, and is also being removed
upstream. It is unsafe in the presence of dead reference elimination.

Bug: 63934467
Bug: 28342794
Test: Build and boot AOSP
Change-Id: I91dc4d33b91175248f44783e3c868a4f1b1d2d0d
---
 api/current.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/current.txt b/api/current.txt
index 40452b7636631..0a86fa9a22a3e 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -56393,6 +56393,7 @@ package java.lang.ref {
     method public boolean enqueue();
     method public T get();
     method public boolean isEnqueued();
+    method public static void reachabilityFence(java.lang.Object);
   }
 
   public class ReferenceQueue<T> {
@@ -69415,7 +69416,6 @@ package javax.crypto {
 
   public class ExemptionMechanism {
     ctor protected ExemptionMechanism(javax.crypto.ExemptionMechanismSpi, java.security.Provider, java.lang.String);
-    method protected void finalize();
     method public final byte[] genExemptionBlob() throws javax.crypto.ExemptionMechanismException, java.lang.IllegalStateException;
     method public final int genExemptionBlob(byte[]) throws javax.crypto.ExemptionMechanismException, java.lang.IllegalStateException, javax.crypto.ShortBufferException;
     method public final int genExemptionBlob(byte[], int) throws javax.crypto.ExemptionMechanismException, java.lang.IllegalStateException, javax.crypto.ShortBufferException;