Merge "Add reachabilityFence, remove ExemptionMechanism.finalize"

am: 9a9e22fad4

Change-Id: I7d78410e9dcbb6f7e45950387931d380935cdff3

1 files changed, 1 insertions, 1 deletions

diff --git a/api/current.txt b/api/current.txt
index f6b1cbd5c792..a9bf7d194be1 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -56464,6 +56464,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> {
@@ -69486,7 +69487,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;