Merge "Hide @IntDef and @StringDef annotations from AnroidKeyStore API." into mnc-dev

2 files changed, 24 insertions, 0 deletions

diff --git a/keystore/java/android/security/EcIesParameterSpec.java b/keystore/java/android/security/EcIesParameterSpec.java
index af93519..360270e 100644
--- a/keystore/java/android/security/EcIesParameterSpec.java
+++ b/keystore/java/android/security/EcIesParameterSpec.java
@@ -51,6 +51,9 @@ import javax.crypto.Mac;
  */
 public class EcIesParameterSpec implements AlgorithmParameterSpec {
 
+    /**
+     * @hide
+     */
     @Retention(RetentionPolicy.SOURCE)
     @IntDef({
         PointFormat.UNSPECIFIED,
diff --git a/keystore/java/android/security/KeyStoreKeyProperties.java b/keystore/java/android/security/KeyStoreKeyProperties.java
index d1b0e5b..021c6dd 100644
--- a/keystore/java/android/security/KeyStoreKeyProperties.java
+++ b/keystore/java/android/security/KeyStoreKeyProperties.java
@@ -43,6 +43,9 @@ import javax.crypto.SecretKeyFactory;
 public abstract class KeyStoreKeyProperties {
     private KeyStoreKeyProperties() {}
 
+    /**
+     * @hide
+     */
     @Retention(RetentionPolicy.SOURCE)
     @IntDef(flag = true,
             value = {Purpose.ENCRYPT, Purpose.DECRYPT, Purpose.SIGN, Purpose.VERIFY})
@@ -134,6 +137,9 @@ public abstract class KeyStoreKeyProperties {
         }
     }
 
+    /**
+     * @hide
+     */
     @Retention(RetentionPolicy.SOURCE)
     @StringDef({
         Algorithm.RSA,
@@ -261,6 +267,9 @@ public abstract class KeyStoreKeyProperties {
         }
     }
 
+    /**
+     * @hide
+     */
     @Retention(RetentionPolicy.SOURCE)
     @StringDef({
         BlockMode.ECB,
@@ -356,6 +365,9 @@ public abstract class KeyStoreKeyProperties {
         }
     }
 
+    /**
+     * @hide
+     */
     @Retention(RetentionPolicy.SOURCE)
     @StringDef({
         EncryptionPadding.NONE,
@@ -445,6 +457,9 @@ public abstract class KeyStoreKeyProperties {
         }
     }
 
+    /**
+     * @hide
+     */
     @Retention(RetentionPolicy.SOURCE)
     @StringDef({
         SignaturePadding.RSA_PKCS1,
@@ -514,6 +529,9 @@ public abstract class KeyStoreKeyProperties {
         }
     }
 
+    /**
+     * @hide
+     */
     @Retention(RetentionPolicy.SOURCE)
     @StringDef({
         Digest.NONE,
@@ -652,6 +670,9 @@ public abstract class KeyStoreKeyProperties {
         }
     }
 
+    /**
+     * @hide
+     */
     @Retention(RetentionPolicy.SOURCE)
     @IntDef({Origin.GENERATED, Origin.IMPORTED, Origin.UNKNOWN})
     public @interface OriginEnum {}