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

Commit 59c0fcf0 authored by Sergio Giro's avatar Sergio Giro Committed by Gerrit Code Review
Browse files

Merge "java.security: port DomainLoadStoreParameter from jdk8u60"

parents 15c6078f 0d342700

api/current.txt

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

























api/system-current.txt



+7
−0




























Original line number
Original line
Diff line number
Diff line








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

























api/test-current.txt



+7
−0




























Original line number
Original line
Diff line number
Diff line








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