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

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

Merge "java.security: update java.security.KeyStore to jdk8u60" am: d53ae2c2 am: 565c1fbf 

am: e04c029e

Change-Id: Ib38154e6828802889d4f4e385e109de925ece1bc
parents 77906667 e04c029e

api/current.txt

+12 −0
Original line number Diff line number Diff line
@@ -55160,6 +55160,12 @@ package java.security { 
  }















  public static abstract interface KeyStore.Entry {













    method public default java.util.Set<java.security.KeyStore.Entry.Attribute> getAttributes();













  }

























  public static abstract interface KeyStore.Entry.Attribute {













    method public abstract java.lang.String getName();













    method public abstract java.lang.String getValue();















  }





























  public static abstract interface KeyStore.LoadStoreParameter {









@@ -55168,11 +55174,15 @@ package java.security {



























  public static class KeyStore.PasswordProtection implements javax.security.auth.Destroyable java.security.KeyStore.ProtectionParameter {















    ctor public KeyStore.PasswordProtection(char[]);













    ctor public KeyStore.PasswordProtection(char[], java.lang.String, java.security.spec.AlgorithmParameterSpec);















    method public synchronized char[] getPassword();













    method public java.lang.String getProtectionAlgorithm();













    method public java.security.spec.AlgorithmParameterSpec getProtectionParameters();















  }





























  public static final class KeyStore.PrivateKeyEntry implements java.security.KeyStore.Entry {















    ctor public KeyStore.PrivateKeyEntry(java.security.PrivateKey, java.security.cert.Certificate[]);













    ctor public KeyStore.PrivateKeyEntry(java.security.PrivateKey, java.security.cert.Certificate[], java.util.Set<java.security.KeyStore.Entry.Attribute>);















    method public java.security.cert.Certificate getCertificate();















    method public java.security.cert.Certificate[] getCertificateChain();















    method public java.security.PrivateKey getPrivateKey();









@@ -55183,11 +55193,13 @@ package java.security {



























  public static final class KeyStore.SecretKeyEntry implements java.security.KeyStore.Entry {















    ctor public KeyStore.SecretKeyEntry(javax.crypto.SecretKey);













    ctor public KeyStore.SecretKeyEntry(javax.crypto.SecretKey, java.util.Set<java.security.KeyStore.Entry.Attribute>);















    method public javax.crypto.SecretKey getSecretKey();















  }





























  public static final class KeyStore.TrustedCertificateEntry implements java.security.KeyStore.Entry {















    ctor public KeyStore.TrustedCertificateEntry(java.security.cert.Certificate);













    ctor public KeyStore.TrustedCertificateEntry(java.security.cert.Certificate, java.util.Set<java.security.KeyStore.Entry.Attribute>);















    method public java.security.cert.Certificate getTrustedCertificate();















  }







































api/system-current.txt



+12
−0




























Original line number
Diff line number
Diff line








@@ -58694,6 +58694,12 @@ package java.security {













  }





























  public static abstract interface KeyStore.Entry {













    method public default java.util.Set<java.security.KeyStore.Entry.Attribute> getAttributes();













  }

























  public static abstract interface KeyStore.Entry.Attribute {













    method public abstract java.lang.String getName();













    method public abstract java.lang.String getValue();















  }





























  public static abstract interface KeyStore.LoadStoreParameter {









@@ -58702,11 +58708,15 @@ package java.security {



























  public static class KeyStore.PasswordProtection implements javax.security.auth.Destroyable java.security.KeyStore.ProtectionParameter {















    ctor public KeyStore.PasswordProtection(char[]);













    ctor public KeyStore.PasswordProtection(char[], java.lang.String, java.security.spec.AlgorithmParameterSpec);















    method public synchronized char[] getPassword();













    method public java.lang.String getProtectionAlgorithm();













    method public java.security.spec.AlgorithmParameterSpec getProtectionParameters();















  }





























  public static final class KeyStore.PrivateKeyEntry implements java.security.KeyStore.Entry {















    ctor public KeyStore.PrivateKeyEntry(java.security.PrivateKey, java.security.cert.Certificate[]);













    ctor public KeyStore.PrivateKeyEntry(java.security.PrivateKey, java.security.cert.Certificate[], java.util.Set<java.security.KeyStore.Entry.Attribute>);















    method public java.security.cert.Certificate getCertificate();















    method public java.security.cert.Certificate[] getCertificateChain();















    method public java.security.PrivateKey getPrivateKey();









@@ -58717,11 +58727,13 @@ package java.security {



























  public static final class KeyStore.SecretKeyEntry implements java.security.KeyStore.Entry {















    ctor public KeyStore.SecretKeyEntry(javax.crypto.SecretKey);













    ctor public KeyStore.SecretKeyEntry(javax.crypto.SecretKey, java.util.Set<java.security.KeyStore.Entry.Attribute>);















    method public javax.crypto.SecretKey getSecretKey();















  }





























  public static final class KeyStore.TrustedCertificateEntry implements java.security.KeyStore.Entry {















    ctor public KeyStore.TrustedCertificateEntry(java.security.cert.Certificate);













    ctor public KeyStore.TrustedCertificateEntry(java.security.cert.Certificate, java.util.Set<java.security.KeyStore.Entry.Attribute>);















    method public java.security.cert.Certificate getTrustedCertificate();















  }







































api/test-current.txt



+12
−0




























Original line number
Diff line number
Diff line








@@ -55244,6 +55244,12 @@ package java.security {













  }





























  public static abstract interface KeyStore.Entry {













    method public default java.util.Set<java.security.KeyStore.Entry.Attribute> getAttributes();













  }

























  public static abstract interface KeyStore.Entry.Attribute {













    method public abstract java.lang.String getName();













    method public abstract java.lang.String getValue();















  }





























  public static abstract interface KeyStore.LoadStoreParameter {









@@ -55252,11 +55258,15 @@ package java.security {



























  public static class KeyStore.PasswordProtection implements javax.security.auth.Destroyable java.security.KeyStore.ProtectionParameter {















    ctor public KeyStore.PasswordProtection(char[]);













    ctor public KeyStore.PasswordProtection(char[], java.lang.String, java.security.spec.AlgorithmParameterSpec);















    method public synchronized char[] getPassword();













    method public java.lang.String getProtectionAlgorithm();













    method public java.security.spec.AlgorithmParameterSpec getProtectionParameters();















  }





























  public static final class KeyStore.PrivateKeyEntry implements java.security.KeyStore.Entry {















    ctor public KeyStore.PrivateKeyEntry(java.security.PrivateKey, java.security.cert.Certificate[]);













    ctor public KeyStore.PrivateKeyEntry(java.security.PrivateKey, java.security.cert.Certificate[], java.util.Set<java.security.KeyStore.Entry.Attribute>);















    method public java.security.cert.Certificate getCertificate();















    method public java.security.cert.Certificate[] getCertificateChain();















    method public java.security.PrivateKey getPrivateKey();









@@ -55267,11 +55277,13 @@ package java.security {



























  public static final class KeyStore.SecretKeyEntry implements java.security.KeyStore.Entry {















    ctor public KeyStore.SecretKeyEntry(javax.crypto.SecretKey);













    ctor public KeyStore.SecretKeyEntry(javax.crypto.SecretKey, java.util.Set<java.security.KeyStore.Entry.Attribute>);















    method public javax.crypto.SecretKey getSecretKey();















  }





























  public static final class KeyStore.TrustedCertificateEntry implements java.security.KeyStore.Entry {















    ctor public KeyStore.TrustedCertificateEntry(java.security.cert.Certificate);













    ctor public KeyStore.TrustedCertificateEntry(java.security.cert.Certificate, java.util.Set<java.security.KeyStore.Entry.Attribute>);















    method public java.security.cert.Certificate getTrustedCertificate();















  }