Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 393df923 authored by Alex Klyubin's avatar Alex Klyubin Committed by Android Git Automerger
Browse files

am eff9e253: am 56b96da7: Merge "Hide @IntDef and @StringDef annotations from... 

am eff9e253: am 56b96da7: Merge "Hide @IntDef and @StringDef annotations from AnroidKeyStore API." into mnc-dev

* commit 'eff9e253':
  Hide @IntDef and @StringDef annotations from AnroidKeyStore API.
parents 70f1bb58 eff9e253

api/current.txt

+0 −24
Original line number Diff line number Diff line
@@ -28329,9 +28329,6 @@ package android.security { 
    field public static final int UNSPECIFIED = -1; // 0xffffffff

  }













  public static abstract class EcIesParameterSpec.PointFormatEnum implements java.lang.annotation.Annotation {













  }



























  public final class KeyChain {















    ctor public KeyChain();















    method public static void choosePrivateKeyAlias(android.app.Activity, android.security.KeyChainAliasCallback, java.lang.String[], java.security.Principal[], java.lang.String, int, java.lang.String);










@@ -28474,9 +28471,6 @@ package android.security {













    field public static final java.lang.String RSA = "RSA";















  }



























  public static abstract class KeyStoreKeyProperties.AlgorithmEnum implements java.lang.annotation.Annotation {













  }



























  public static abstract class KeyStoreKeyProperties.BlockMode {















    field public static final java.lang.String CBC = "CBC";















    field public static final java.lang.String CTR = "CTR";









@@ -28484,9 +28478,6 @@ package android.security {













    field public static final java.lang.String GCM = "GCM";















  }



























  public static abstract class KeyStoreKeyProperties.BlockModeEnum implements java.lang.annotation.Annotation {













  }



























  public static abstract class KeyStoreKeyProperties.Digest {















    field public static final java.lang.String MD5 = "MD5";















    field public static final java.lang.String NONE = "NONE";









@@ -28497,9 +28488,6 @@ package android.security {













    field public static final java.lang.String SHA512 = "SHA-512";















  }



























  public static abstract class KeyStoreKeyProperties.DigestEnum implements java.lang.annotation.Annotation {













  }



























  public static abstract class KeyStoreKeyProperties.EncryptionPadding {















    field public static final java.lang.String NONE = "NoPadding";















    field public static final java.lang.String PKCS7 = "PKCS7Padding";









@@ -28507,18 +28495,12 @@ package android.security {













    field public static final java.lang.String RSA_PKCS1 = "PKCS1Padding";















  }



























  public static abstract class KeyStoreKeyProperties.EncryptionPaddingEnum implements java.lang.annotation.Annotation {













  }



























  public static abstract class KeyStoreKeyProperties.Origin {















    field public static final int GENERATED = 1; // 0x1















    field public static final int IMPORTED = 2; // 0x2















    field public static final int UNKNOWN = 4; // 0x4















  }



























  public static abstract class KeyStoreKeyProperties.OriginEnum implements java.lang.annotation.Annotation {













  }



























  public static abstract class KeyStoreKeyProperties.Purpose {















    field public static final int DECRYPT = 2; // 0x2















    field public static final int ENCRYPT = 1; // 0x1









@@ -28526,17 +28508,11 @@ package android.security {













    field public static final int VERIFY = 8; // 0x8















  }



























  public static abstract class KeyStoreKeyProperties.PurposeEnum implements java.lang.annotation.Annotation {













  }



























  public static abstract class KeyStoreKeyProperties.SignaturePadding {















    field public static final java.lang.String RSA_PKCS1 = "PKCS1";















    field public static final java.lang.String RSA_PSS = "PSS";















  }



























  public static abstract class KeyStoreKeyProperties.SignaturePaddingEnum implements java.lang.annotation.Annotation {













  }



























  public class KeyStoreKeySpec implements java.security.spec.KeySpec {















    method public java.lang.String[] getBlockModes();















    method public java.lang.String[] getDigests();

























api/system-current.txt



+0
−24




























Original line number
Diff line number
Diff line








@@ -30352,9 +30352,6 @@ package android.security {













    field public static final int UNSPECIFIED = -1; // 0xffffffff















  }



























  public static abstract class EcIesParameterSpec.PointFormatEnum implements java.lang.annotation.Annotation {













  }



























  public final class KeyChain {















    ctor public KeyChain();















    method public static void choosePrivateKeyAlias(android.app.Activity, android.security.KeyChainAliasCallback, java.lang.String[], java.security.Principal[], java.lang.String, int, java.lang.String);










@@ -30497,9 +30494,6 @@ package android.security {













    field public static final java.lang.String RSA = "RSA";















  }



























  public static abstract class KeyStoreKeyProperties.AlgorithmEnum implements java.lang.annotation.Annotation {













  }



























  public static abstract class KeyStoreKeyProperties.BlockMode {















    field public static final java.lang.String CBC = "CBC";















    field public static final java.lang.String CTR = "CTR";









@@ -30507,9 +30501,6 @@ package android.security {













    field public static final java.lang.String GCM = "GCM";















  }



























  public static abstract class KeyStoreKeyProperties.BlockModeEnum implements java.lang.annotation.Annotation {













  }



























  public static abstract class KeyStoreKeyProperties.Digest {















    field public static final java.lang.String MD5 = "MD5";















    field public static final java.lang.String NONE = "NONE";









@@ -30520,9 +30511,6 @@ package android.security {













    field public static final java.lang.String SHA512 = "SHA-512";















  }



























  public static abstract class KeyStoreKeyProperties.DigestEnum implements java.lang.annotation.Annotation {













  }



























  public static abstract class KeyStoreKeyProperties.EncryptionPadding {















    field public static final java.lang.String NONE = "NoPadding";















    field public static final java.lang.String PKCS7 = "PKCS7Padding";









@@ -30530,18 +30518,12 @@ package android.security {













    field public static final java.lang.String RSA_PKCS1 = "PKCS1Padding";















  }



























  public static abstract class KeyStoreKeyProperties.EncryptionPaddingEnum implements java.lang.annotation.Annotation {













  }



























  public static abstract class KeyStoreKeyProperties.Origin {















    field public static final int GENERATED = 1; // 0x1















    field public static final int IMPORTED = 2; // 0x2















    field public static final int UNKNOWN = 4; // 0x4















  }



























  public static abstract class KeyStoreKeyProperties.OriginEnum implements java.lang.annotation.Annotation {













  }



























  public static abstract class KeyStoreKeyProperties.Purpose {















    field public static final int DECRYPT = 2; // 0x2















    field public static final int ENCRYPT = 1; // 0x1









@@ -30549,17 +30531,11 @@ package android.security {













    field public static final int VERIFY = 8; // 0x8















  }



























  public static abstract class KeyStoreKeyProperties.PurposeEnum implements java.lang.annotation.Annotation {













  }



























  public static abstract class KeyStoreKeyProperties.SignaturePadding {















    field public static final java.lang.String RSA_PKCS1 = "PKCS1";















    field public static final java.lang.String RSA_PSS = "PSS";















  }



























  public static abstract class KeyStoreKeyProperties.SignaturePaddingEnum implements java.lang.annotation.Annotation {













  }



























  public class KeyStoreKeySpec implements java.security.spec.KeySpec {















    method public java.lang.String[] getBlockModes();















    method public java.lang.String[] getDigests();

























keystore/java/android/security/EcIesParameterSpec.java



+3
−0




























Original line number
Diff line number
Diff line








@@ -51,6 +51,9 @@ import javax.crypto.Mac;













 */















public class EcIesParameterSpec implements AlgorithmParameterSpec {





























    /**













     * @hide













     */















    @Retention(RetentionPolicy.SOURCE)















    @IntDef({















        PointFormat.UNSPECIFIED,

































keystore/java/android/security/KeyStoreKeyProperties.java



+21
−0




























Original line number
Diff line number
Diff line








@@ -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 {}