diff options
| author | Sergio Giro <sgiro@google.com> | 2016-09-07 12:33:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-07 12:33:59 +0000 |
| commit | e706e55d94feb9f1900a255ebd0f1869cb15f77f (patch) | |
| tree | b2d70f7ef895990c70afcc288227922eba69e406 | |
| parent | 77083deb709d7e2aef3c63c337bb0468a5025898 (diff) | |
| parent | ebebc24c21941fc930024300bc0190b1b203ad0e (diff) | |
Merge "java.security: port DomainLoadStoreParameter from jdk8u60" am: 59c0fcf0c8 am: 290f2bb2a0 am: 9fb957c4e5
am: ebebc24c21
Change-Id: I7ca9c7b21310f4056f49bf31d06aa8a23c070574
| -rw-r--r-- | api/current.txt | 7 | ||||
| -rw-r--r-- | api/system-current.txt | 7 | ||||
| -rw-r--r-- | api/test-current.txt | 7 |
3 files changed, 21 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 0a7607056cd9..d85f705817af 100644 --- a/api/current.txt +++ b/api/current.txt @@ -55052,6 +55052,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<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); diff --git a/api/system-current.txt b/api/system-current.txt index 83cb79af60b1..d10c5cb46c21 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -58580,6 +58580,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<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); diff --git a/api/test-current.txt b/api/test-current.txt index f974393c6207..336f2564c586 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -55143,6 +55143,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<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); |