4 files changed, 57 insertions, 0 deletions
diff --git a/luni/src/main/java/java/security/Signature.java b/luni/src/main/java/java/security/Signature.java
index 3151058..a45fa59 100644
--- a/luni/src/main/java/java/security/Signature.java
+++ b/luni/src/main/java/java/security/Signature.java
@@ -254,6 +254,16 @@ public abstract class Signature extends SignatureSpi {
     }
 
     /**
+     * Returns the {@code SignatureSpi} backing this {@code Signature} or {@code null} if no
+     * {@code SignatureSpi} is backing this {@code Signature}.
+     *
+     * @hide
+     */
+    public SignatureSpi getCurrentSpi() {
+        return null;
+    }
+
+    /**
      * Returns the name of the algorithm of this {@code Signature}.
      *
      * @return the name of the algorithm of this {@code Signature}.
@@ -746,5 +756,12 @@ public abstract class Signature extends SignatureSpi {
         public SignatureSpi getSpi() {
             return getSpi(null);
         }
+
+        @Override
+        public SignatureSpi getCurrentSpi() {
+            synchronized (initLock) {
+                return spiImpl;
+            }
+        }
     }
 }
diff --git a/luni/src/main/java/javax/crypto/Cipher.java b/luni/src/main/java/javax/crypto/Cipher.java
index 66d03ad..225822d 100644
--- a/luni/src/main/java/javax/crypto/Cipher.java
+++ b/luni/src/main/java/javax/crypto/Cipher.java
@@ -374,6 +374,22 @@ public class Cipher {
     }
 
     /**
+     * Returns the {@code CipherSpi} backing this {@code Cipher} or {@code null} if no
+     * {@code CipherSpi} is backing this {@code Cipher}.
+     *
+     * @hide
+     */
+    public CipherSpi getCurrentSpi() {
+        if (specifiedSpi != null) {
+            return specifiedSpi;
+        }
+
+        synchronized (initLock) {
+            return spiImpl;
+        }
+    }
+
+    /**
      * Try all combinations of mode strings:
      *
      * <pre>
diff --git a/luni/src/main/java/javax/crypto/KeyAgreement.java b/luni/src/main/java/javax/crypto/KeyAgreement.java
index d27aa2e..c804273 100644
--- a/luni/src/main/java/javax/crypto/KeyAgreement.java
+++ b/luni/src/main/java/javax/crypto/KeyAgreement.java
@@ -260,6 +260,18 @@ public class KeyAgreement {
     }
 
     /**
+     * Returns the {@code KeyAgreementSpi} backing this {@code KeyAgreement} or {@code null} if no
+     * {@code KeyAgreementSpi} is backing this {@code KeyAgreement}.
+     *
+     * @hide
+     */
+    public KeyAgreementSpi getCurrentSpi() {
+        synchronized (initLock) {
+            return spiImpl;
+        }
+    }
+
+    /**
      * Initializes this {@code KeyAgreement} with the specified key.
      *
      * @param key the key to initialize this key agreement.
diff --git a/luni/src/main/java/javax/crypto/Mac.java b/luni/src/main/java/javax/crypto/Mac.java
index 536f0c5..5774eb2 100644
--- a/luni/src/main/java/javax/crypto/Mac.java
+++ b/luni/src/main/java/javax/crypto/Mac.java
@@ -274,6 +274,18 @@ public class Mac implements Cloneable {
     }
 
     /**
+     * Returns the {@code MacSpi} backing this {@code Mac} or {@code null} if no {@code MacSpi} is
+     * backing this {@code Mac}.
+     *
+     * @hide
+     */
+    public MacSpi getCurrentSpi() {
+        synchronized (initLock) {
+            return spiImpl;
+        }
+    }
+
+    /**
      * Returns the length of this MAC (in bytes).
      *
      * @return the length of this MAC (in bytes).