Merge "Add reachabilityFence, remove ExemptionMechanism.finalize" am: 9a9e22fad4 am: 7940256a91

am: 0f63ca00eb

Change-Id: Ib8228ecf75e2fc4b142effe46ad41e3b40fff034

1 files changed, 1 insertions, 1 deletions

diff --git a/api/current.txt b/api/current.txt
index 90817e25d035..63db31254a44 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -57588,6 +57588,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> {
@@ -70610,7 +70611,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;