Hide @IntDef and @StringDef annotations from AnroidKeyStore API.

By convention, these annotation classes should remain hidden API.

Bug: 18088752
Bug: 21039983
Change-Id: Ifb5d2910c7dae4e0fd809876eb641f1aaf7a00a6

2 files changed, 24 insertions, 0 deletions

diff --git a/keystore/java/android/security/EcIesParameterSpec.java b/keystore/java/android/security/EcIesParameterSpec.java
index a3e5aec..7af17ed 100644
--- a/keystore/java/android/security/EcIesParameterSpec.java
+++ b/keystore/java/android/security/EcIesParameterSpec.java
@@ -49,6 +49,9 @@ import javax.crypto.Mac;
  */
 public class EcIesParameterSpec implements AlgorithmParameterSpec {
 
+    /**
+     * @hide
+     */
     @Retention(RetentionPolicy.SOURCE)
     @IntDef(value = {PointFormat.UNCOMPRESSED, PointFormat.COMPRESSED})
     public @interface PointFormatEnum {}
diff --git a/keystore/java/android/security/KeyStoreKeyProperties.java b/keystore/java/android/security/KeyStoreKeyProperties.java
index 1cf6a7a..9ae4c9c 100644
--- a/keystore/java/android/security/KeyStoreKeyProperties.java
+++ b/keystore/java/android/security/KeyStoreKeyProperties.java
@@ -41,6 +41,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})
@@ -131,6 +134,9 @@ public abstract class KeyStoreKeyProperties {
         }
     }
 
+    /**
+     * @hide
+     */
     @Retention(RetentionPolicy.SOURCE)
     @StringDef({
         Algorithm.RSA,
@@ -257,6 +263,9 @@ public abstract class KeyStoreKeyProperties {
         }
     }
 
+    /**
+     * @hide
+     */
     @Retention(RetentionPolicy.SOURCE)
     @StringDef({
         BlockMode.ECB,
@@ -350,6 +359,9 @@ public abstract class KeyStoreKeyProperties {
         }
     }
 
+    /**
+     * @hide
+     */
     @Retention(RetentionPolicy.SOURCE)
     @StringDef({
         EncryptionPadding.NONE,
@@ -437,6 +449,9 @@ public abstract class KeyStoreKeyProperties {
         }
     }
 
+    /**
+     * @hide
+     */
     @Retention(RetentionPolicy.SOURCE)
     @StringDef({
         SignaturePadding.RSA_PKCS1,
@@ -504,6 +519,9 @@ public abstract class KeyStoreKeyProperties {
         }
     }
 
+    /**
+     * @hide
+     */
     @Retention(RetentionPolicy.SOURCE)
     @StringDef({
         Digest.NONE,
@@ -639,6 +657,9 @@ public abstract class KeyStoreKeyProperties {
         }
     }
 
+    /**
+     * @hide
+     */
     @Retention(RetentionPolicy.SOURCE)
     @IntDef({Origin.GENERATED, Origin.IMPORTED, Origin.UNKNOWN})
     public @interface OriginEnum {}