am def08b76: am 4dc54149: Merge "Add missing value for EcIesParameterSpec.PointFormatEnum." into mnc-dev

* commit 'def08b76357e4b72c3f6012ae2132a14b4a03774': Add missing value for EcIesParameterSpec.PointFormatEnum.
2015-05-11 20:05:29 +00:00
parent 969385f50c def08b7635
commit 278f18971b
1 changed files with 5 additions and 1 deletions
--- 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 {}

    /**