From 0d342700c89def22690c311e7ba010188fb694ad Mon Sep 17 00:00:00 2001 From: Sergio Giro Date: Thu, 25 Aug 2016 14:57:54 +0100 Subject: [PATCH] java.security: port DomainLoadStoreParameter from jdk8u60 This class is introduced in Java 8 Change-Id: Ibb6dbbeba99cdc97c8da5019d11160c3ce6aa690 Test: check-ojluni-files; make droid docs; vogar DomainLoadStoreParameterTest.java Bug: 29631070 --- api/current.txt | 7 +++++++ api/system-current.txt | 7 +++++++ api/test-current.txt | 7 +++++++ 3 files changed, 21 insertions(+) diff --git a/api/current.txt b/api/current.txt index 7b184bf459c3a..bf2c445a0c895 100644 --- a/api/current.txt +++ b/api/current.txt @@ -54769,6 +54769,13 @@ package java.security { 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); + method public java.net.URI getConfiguration(); + method public java.security.KeyStore.ProtectionParameter getProtectionParameter(); + method public java.util.Map getProtectionParams(); + } + public class GeneralSecurityException extends java.lang.Exception { ctor public GeneralSecurityException(); ctor public GeneralSecurityException(java.lang.String); diff --git a/api/system-current.txt b/api/system-current.txt index 01a872a0897a3..5db35565162ee 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -58125,6 +58125,13 @@ package java.security { 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); + method public java.net.URI getConfiguration(); + method public java.security.KeyStore.ProtectionParameter getProtectionParameter(); + method public java.util.Map getProtectionParams(); + } + public class GeneralSecurityException extends java.lang.Exception { ctor public GeneralSecurityException(); ctor public GeneralSecurityException(java.lang.String); diff --git a/api/test-current.txt b/api/test-current.txt index d936c2784130a..77a345bdb8073 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -54849,6 +54849,13 @@ package java.security { 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); + method public java.net.URI getConfiguration(); + method public java.security.KeyStore.ProtectionParameter getProtectionParameter(); + method public java.util.Map getProtectionParams(); + } + public class GeneralSecurityException extends java.lang.Exception { ctor public GeneralSecurityException(); ctor public GeneralSecurityException(java.lang.String);