commit f0efc8fc28620b1f298c3144572c60a2598e95a8
author Sergio Giro <sgiro@google.com> Wed Sep 07 12:33:57 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 07 12:33:57 2016 +0000
tree 816e4c2458864fa90fd3ca018937f2771f5c69c5
parent e043ec79179c65ffb4c0ff07ef342c6c0c3cb993
parent 724155a3beeab638a5e49728a961b8e7b8f31d47

Merge "java.security.PKCS12Attribute: port class from jdk8u60" am: 6767fd28b1 am: 52e0434748
am: 724155a3be

Change-Id: I1ba1e83b0610166f7ae89cd460ec7435853ccd4e

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 7adb870..1b0efc1 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -55287,6 +55287,14 @@
     ctor public NoSuchProviderException(java.lang.String);
   }
 
+  public final class PKCS12Attribute implements java.security.KeyStore.Entry.Attribute {
+    ctor public PKCS12Attribute(java.lang.String, java.lang.String);
+    ctor public PKCS12Attribute(byte[]);
+    method public byte[] getEncoded();
+    method public java.lang.String getName();
+    method public java.lang.String getValue();
+  }
+
   public abstract class Permission implements java.security.Guard java.io.Serializable {
     ctor public Permission(java.lang.String);
     method public void checkGuard(java.lang.Object) throws java.lang.SecurityException;

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index ff18e77..e366cea 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -58821,6 +58821,14 @@
     ctor public NoSuchProviderException(java.lang.String);
   }
 
+  public final class PKCS12Attribute implements java.security.KeyStore.Entry.Attribute {
+    ctor public PKCS12Attribute(java.lang.String, java.lang.String);
+    ctor public PKCS12Attribute(byte[]);
+    method public byte[] getEncoded();
+    method public java.lang.String getName();
+    method public java.lang.String getValue();
+  }
+
   public abstract class Permission implements java.security.Guard java.io.Serializable {
     ctor public Permission(java.lang.String);
     method public void checkGuard(java.lang.Object) throws java.lang.SecurityException;

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index f7cbe3b..3ab81f3 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -55371,6 +55371,14 @@
     ctor public NoSuchProviderException(java.lang.String);
   }
 
+  public final class PKCS12Attribute implements java.security.KeyStore.Entry.Attribute {
+    ctor public PKCS12Attribute(java.lang.String, java.lang.String);
+    ctor public PKCS12Attribute(byte[]);
+    method public byte[] getEncoded();
+    method public java.lang.String getName();
+    method public java.lang.String getValue();
+  }
+
   public abstract class Permission implements java.security.Guard java.io.Serializable {
     ctor public Permission(java.lang.String);
     method public void checkGuard(java.lang.Object) throws java.lang.SecurityException;