commit e706e55d94feb9f1900a255ebd0f1869cb15f77f
author Sergio Giro <sgiro@google.com> Wed Sep 07 12:33:59 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 07 12:33:59 2016 +0000
tree b2d70f7ef895990c70afcc288227922eba69e406
parent 77083deb709d7e2aef3c63c337bb0468a5025898
parent ebebc24c21941fc930024300bc0190b1b203ad0e

Merge "java.security: port DomainLoadStoreParameter from jdk8u60" am: 59c0fcf0c8 am: 290f2bb2a0 am: 9fb957c4e5
am: ebebc24c21

Change-Id: I7ca9c7b21310f4056f49bf31d06aa8a23c070574

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 0a76070..d85f705 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -55052,6 +55052,13 @@
     method public abstract java.security.ProtectionDomain[] combine(java.security.ProtectionDomain[], java.security.ProtectionDomain[]);
   }
 
+  public final class DomainLoadStoreParameter implements java.security.KeyStore.LoadStoreParameter {
+    ctor public DomainLoadStoreParameter(java.net.URI, java.util.Map<java.lang.String, java.security.KeyStore.ProtectionParameter>);
+    method public java.net.URI getConfiguration();
+    method public java.security.KeyStore.ProtectionParameter getProtectionParameter();
+    method public java.util.Map<java.lang.String, java.security.KeyStore.ProtectionParameter> getProtectionParams();
+  }
+
   public class GeneralSecurityException extends java.lang.Exception {
     ctor public GeneralSecurityException();
     ctor public GeneralSecurityException(java.lang.String);

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 83cb79a..d10c5cb 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -58580,6 +58580,13 @@
     method public abstract java.security.ProtectionDomain[] combine(java.security.ProtectionDomain[], java.security.ProtectionDomain[]);
   }
 
+  public final class DomainLoadStoreParameter implements java.security.KeyStore.LoadStoreParameter {
+    ctor public DomainLoadStoreParameter(java.net.URI, java.util.Map<java.lang.String, java.security.KeyStore.ProtectionParameter>);
+    method public java.net.URI getConfiguration();
+    method public java.security.KeyStore.ProtectionParameter getProtectionParameter();
+    method public java.util.Map<java.lang.String, java.security.KeyStore.ProtectionParameter> getProtectionParams();
+  }
+
   public class GeneralSecurityException extends java.lang.Exception {
     ctor public GeneralSecurityException();
     ctor public GeneralSecurityException(java.lang.String);

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index f974393..336f2564 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -55143,6 +55143,13 @@
     method public abstract java.security.ProtectionDomain[] combine(java.security.ProtectionDomain[], java.security.ProtectionDomain[]);
   }
 
+  public final class DomainLoadStoreParameter implements java.security.KeyStore.LoadStoreParameter {
+    ctor public DomainLoadStoreParameter(java.net.URI, java.util.Map<java.lang.String, java.security.KeyStore.ProtectionParameter>);
+    method public java.net.URI getConfiguration();
+    method public java.security.KeyStore.ProtectionParameter getProtectionParameter();
+    method public java.util.Map<java.lang.String, java.security.KeyStore.ProtectionParameter> getProtectionParams();
+  }
+
   public class GeneralSecurityException extends java.lang.Exception {
     ctor public GeneralSecurityException();
     ctor public GeneralSecurityException(java.lang.String);