Expose getSpi from crypto operations as hidden API.

This makes it possible for platform code to obtain the current SPI
implementation of Cipher, Signature, Mac, and KeyAgreement instances.

The current use case is to access additional information about these
crypto operations when they are backed by Android KeyStore.

NOTE: The getSpi API will not and cannot become public framework API.

Bug: 18088752
Change-Id: If575726d288eebc73ffa3209c316fad071a087fd

3 files changed, 9 insertions, 3 deletions

diff --git a/luni/src/main/java/javax/crypto/Cipher.java b/luni/src/main/java/javax/crypto/Cipher.java
index a6df1e6..66d03ad 100644
--- a/luni/src/main/java/javax/crypto/Cipher.java
+++ b/luni/src/main/java/javax/crypto/Cipher.java
@@ -366,8 +366,10 @@ public class Cipher {
 
     /**
      * Convenience call when the Key is not available.
+     *
+     * @hide
      */
-    private CipherSpi getSpi() {
+    public CipherSpi getSpi() {
         return getSpi(null);
     }
 
diff --git a/luni/src/main/java/javax/crypto/KeyAgreement.java b/luni/src/main/java/javax/crypto/KeyAgreement.java
index 53ce136..d27aa2e 100644
--- a/luni/src/main/java/javax/crypto/KeyAgreement.java
+++ b/luni/src/main/java/javax/crypto/KeyAgreement.java
@@ -252,8 +252,10 @@ public class KeyAgreement {
 
     /**
      * Convenience call when the Key is not available.
+     *
+     * @hide
      */
-    private KeyAgreementSpi getSpi() {
+    public KeyAgreementSpi getSpi() {
         return getSpi(null);
     }
 
diff --git a/luni/src/main/java/javax/crypto/Mac.java b/luni/src/main/java/javax/crypto/Mac.java
index 3166032..536f0c5 100644
--- a/luni/src/main/java/javax/crypto/Mac.java
+++ b/luni/src/main/java/javax/crypto/Mac.java
@@ -266,8 +266,10 @@ public class Mac implements Cloneable {
 
     /**
      * Convenience call when the Key is not available.
+     *
+     * @hide
      */
-    private MacSpi getSpi() {
+    public MacSpi getSpi() {
         return getSpi(null);
     }