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

Merge "Merge "java.security: port DomainLoadStoreParameter from jdk8u60" am: 59c0fcf0c8 am: 290f2bb2a0 am: 9fb957c4e5" into nyc-mr1-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2016-09-07 12:28:17 +00:00
committed by Android (Google) Code Review
parent fb653868d4 ebebc24c21
commit c3804b1327
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

@@ -54966,6 +54966,13 @@ package java.security {
method public abstract java.security.ProtectionDomain[] combine(java.security.ProtectionDomain[], java.security.ProtectionDomain[]); 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 { public class GeneralSecurityException extends java.lang.Exception {
ctor public GeneralSecurityException(); ctor public GeneralSecurityException();
ctor public GeneralSecurityException(java.lang.String); ctor public GeneralSecurityException(java.lang.String);

7
api/system-current.txt
View File

@@ -58500,6 +58500,13 @@ package java.security {
method public abstract java.security.ProtectionDomain[] combine(java.security.ProtectionDomain[], java.security.ProtectionDomain[]); 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 { public class GeneralSecurityException extends java.lang.Exception {
ctor public GeneralSecurityException(); ctor public GeneralSecurityException();
ctor public GeneralSecurityException(java.lang.String); ctor public GeneralSecurityException(java.lang.String);

7
api/test-current.txt
View File

@@ -55050,6 +55050,13 @@ package java.security {
method public abstract java.security.ProtectionDomain[] combine(java.security.ProtectionDomain[], java.security.ProtectionDomain[]); 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 { public class GeneralSecurityException extends java.lang.Exception {
ctor public GeneralSecurityException(); ctor public GeneralSecurityException();
ctor public GeneralSecurityException(java.lang.String); ctor public GeneralSecurityException(java.lang.String);