Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebebc24c authored by Sergio Giro's avatar Sergio Giro Committed by android-build-merger
Browse files

Merge "java.security: port DomainLoadStoreParameter from jdk8u60" am: 59c0fcf0 am: 290f2bb2 

am: 9fb957c4

Change-Id: Ia497ce4aec873aa9a74099f0dadbf9fe81424205
parents ddad1247 9fb957c4

api/current.txt

+7 −0
Original line number Diff line number Diff line
@@ -54966,6 +54966,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);

























api/system-current.txt



+7
−0




























Original line number
Diff line number
Diff line








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

























api/test-current.txt



+7
−0




























Original line number
Diff line number
Diff line








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