Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "java.security: port DomainLoadStoreParameter from jdk8u60" am: 59c0fcf0c8

Browse Source 
am: 290f2bb2a0

Change-Id: I0030e50dc05e88979d50e73feeb778c79ece47fc
This commit is contained in:
Sergio Giro
2016-09-07 12:23:41 +00:00
committed by android-build-merger
parent fceccd226b 290f2bb2a0
commit 9fb957c4e5
3 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
api/current.txt
View File

@@ -54777,6 +54777,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);

7
api/system-current.txt
View File

@@ -58134,6 +58134,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);

7
api/test-current.txt
View File

@@ -54857,6 +54857,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);