summaryrefslogtreecommitdiffstats
path: root/keystore
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-05-11 19:47:54 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-11 19:47:55 +0000
commit4dc541497dd1b25afb8b0323312800bf80f89eac (patch)
tree089cdfb6a6b0ec0e1bc665efecb9454df67d7295 /keystore
parent09b15d5bdb2eebc5e63889297789c15e97fa24b5 (diff)
parent322e2c3a129f2ace802898c70b240776d068ff18 (diff)
downloadframeworks_base-4dc541497dd1b25afb8b0323312800bf80f89eac.zip
frameworks_base-4dc541497dd1b25afb8b0323312800bf80f89eac.tar.gz
frameworks_base-4dc541497dd1b25afb8b0323312800bf80f89eac.tar.bz2
Merge "Add missing value for EcIesParameterSpec.PointFormatEnum." into mnc-dev
Diffstat (limited to 'keystore')
-rw-r--r--keystore/java/android/security/EcIesParameterSpec.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/keystore/java/android/security/EcIesParameterSpec.java b/keystore/java/android/security/EcIesParameterSpec.java
index 45d46c5..af93519 100644
--- a/keystore/java/android/security/EcIesParameterSpec.java
+++ b/keystore/java/android/security/EcIesParameterSpec.java
@@ -52,7 +52,11 @@ import javax.crypto.Mac;
public class EcIesParameterSpec implements AlgorithmParameterSpec {
@Retention(RetentionPolicy.SOURCE)
- @IntDef(value = {PointFormat.UNCOMPRESSED, PointFormat.COMPRESSED})
+ @IntDef({
+ PointFormat.UNSPECIFIED,
+ PointFormat.UNCOMPRESSED,
+ PointFormat.COMPRESSED,
+ })
public @interface PointFormatEnum {}
/**