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

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

frameworks/base: add changes coming from aosp am: 29835cc5 

am: 263820bb

Change-Id: Ifb8ea64e1dd24a75beafd29b0b61115c39b88fd1
parents 716cd2b7 263820bb

api/current.txt

+6 −3
Original line number Diff line number Diff line
@@ -56334,6 +56334,7 @@ package java.security.spec { 
    ctor public MGF1ParameterSpec(java.lang.String);

    method public java.lang.String getDigestAlgorithm();

    field public static final java.security.spec.MGF1ParameterSpec SHA1;

    field public static final java.security.spec.MGF1ParameterSpec SHA224;

    field public static final java.security.spec.MGF1ParameterSpec SHA256;

    field public static final java.security.spec.MGF1ParameterSpec SHA384;

    field public static final java.security.spec.MGF1ParameterSpec SHA512;
@@ -63400,7 +63401,7 @@ package javax.crypto { 
    field protected byte[] encodedParams;

  }













  public abstract interface SecretKey implements java.security.Key {













  public abstract interface SecretKey implements javax.security.auth.Destroyable java.security.Key {















    field public static final long serialVersionUID = -4795878709595146952L; // 0xbd719db928b8f538L















  }























@@ -63411,7 +63412,7 @@ package javax.crypto {













    method public static final javax.crypto.SecretKeyFactory getInstance(java.lang.String) throws java.security.NoSuchAlgorithmException;















    method public static final javax.crypto.SecretKeyFactory getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;















    method public static final javax.crypto.SecretKeyFactory getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException;













    method public final java.security.spec.KeySpec getKeySpec(javax.crypto.SecretKey, java.lang.Class) throws java.security.spec.InvalidKeySpecException;













    method public final java.security.spec.KeySpec getKeySpec(javax.crypto.SecretKey, java.lang.Class<?>) throws java.security.spec.InvalidKeySpecException;















    method public final java.security.Provider getProvider();















    method public final javax.crypto.SecretKey translateKey(javax.crypto.SecretKey) throws java.security.InvalidKeyException;















  }









@@ -63419,7 +63420,7 @@ package javax.crypto {













  public abstract class SecretKeyFactorySpi {















    ctor public SecretKeyFactorySpi();















    method protected abstract javax.crypto.SecretKey engineGenerateSecret(java.security.spec.KeySpec) throws java.security.spec.InvalidKeySpecException;













    method protected abstract java.security.spec.KeySpec engineGetKeySpec(javax.crypto.SecretKey, java.lang.Class) throws java.security.spec.InvalidKeySpecException;













    method protected abstract java.security.spec.KeySpec engineGetKeySpec(javax.crypto.SecretKey, java.lang.Class<?>) throws java.security.spec.InvalidKeySpecException;















    method protected abstract javax.crypto.SecretKey engineTranslateKey(javax.crypto.SecretKey) throws java.security.InvalidKeyException;















  }
























@@ -63537,7 +63538,9 @@ package javax.crypto.spec {



























  public class PBEParameterSpec implements java.security.spec.AlgorithmParameterSpec {















    ctor public PBEParameterSpec(byte[], int);













    ctor public PBEParameterSpec(byte[], int, java.security.spec.AlgorithmParameterSpec);















    method public int getIterationCount();













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















    method public byte[] getSalt();















  }







































api/system-current.txt



+6
−3




























Original line number
Diff line number
Diff line








@@ -59868,6 +59868,7 @@ package java.security.spec {













    ctor public MGF1ParameterSpec(java.lang.String);















    method public java.lang.String getDigestAlgorithm();















    field public static final java.security.spec.MGF1ParameterSpec SHA1;













    field public static final java.security.spec.MGF1ParameterSpec SHA224;















    field public static final java.security.spec.MGF1ParameterSpec SHA256;















    field public static final java.security.spec.MGF1ParameterSpec SHA384;















    field public static final java.security.spec.MGF1ParameterSpec SHA512;










@@ -66934,7 +66935,7 @@ package javax.crypto {













    field protected byte[] encodedParams;















  }



























  public abstract interface SecretKey implements java.security.Key {













  public abstract interface SecretKey implements javax.security.auth.Destroyable java.security.Key {















    field public static final long serialVersionUID = -4795878709595146952L; // 0xbd719db928b8f538L















  }























@@ -66945,7 +66946,7 @@ package javax.crypto {













    method public static final javax.crypto.SecretKeyFactory getInstance(java.lang.String) throws java.security.NoSuchAlgorithmException;















    method public static final javax.crypto.SecretKeyFactory getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;















    method public static final javax.crypto.SecretKeyFactory getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException;













    method public final java.security.spec.KeySpec getKeySpec(javax.crypto.SecretKey, java.lang.Class) throws java.security.spec.InvalidKeySpecException;













    method public final java.security.spec.KeySpec getKeySpec(javax.crypto.SecretKey, java.lang.Class<?>) throws java.security.spec.InvalidKeySpecException;















    method public final java.security.Provider getProvider();















    method public final javax.crypto.SecretKey translateKey(javax.crypto.SecretKey) throws java.security.InvalidKeyException;















  }









@@ -66953,7 +66954,7 @@ package javax.crypto {













  public abstract class SecretKeyFactorySpi {















    ctor public SecretKeyFactorySpi();















    method protected abstract javax.crypto.SecretKey engineGenerateSecret(java.security.spec.KeySpec) throws java.security.spec.InvalidKeySpecException;













    method protected abstract java.security.spec.KeySpec engineGetKeySpec(javax.crypto.SecretKey, java.lang.Class) throws java.security.spec.InvalidKeySpecException;













    method protected abstract java.security.spec.KeySpec engineGetKeySpec(javax.crypto.SecretKey, java.lang.Class<?>) throws java.security.spec.InvalidKeySpecException;















    method protected abstract javax.crypto.SecretKey engineTranslateKey(javax.crypto.SecretKey) throws java.security.InvalidKeyException;















  }
























@@ -67071,7 +67072,9 @@ package javax.crypto.spec {



























  public class PBEParameterSpec implements java.security.spec.AlgorithmParameterSpec {















    ctor public PBEParameterSpec(byte[], int);













    ctor public PBEParameterSpec(byte[], int, java.security.spec.AlgorithmParameterSpec);















    method public int getIterationCount();













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















    method public byte[] getSalt();















  }







































api/test-current.txt



+6
−3




























Original line number
Diff line number
Diff line








@@ -56416,6 +56416,7 @@ package java.security.spec {













    ctor public MGF1ParameterSpec(java.lang.String);















    method public java.lang.String getDigestAlgorithm();















    field public static final java.security.spec.MGF1ParameterSpec SHA1;













    field public static final java.security.spec.MGF1ParameterSpec SHA224;















    field public static final java.security.spec.MGF1ParameterSpec SHA256;















    field public static final java.security.spec.MGF1ParameterSpec SHA384;















    field public static final java.security.spec.MGF1ParameterSpec SHA512;










@@ -63482,7 +63483,7 @@ package javax.crypto {













    field protected byte[] encodedParams;















  }



























  public abstract interface SecretKey implements java.security.Key {













  public abstract interface SecretKey implements javax.security.auth.Destroyable java.security.Key {















    field public static final long serialVersionUID = -4795878709595146952L; // 0xbd719db928b8f538L















  }























@@ -63493,7 +63494,7 @@ package javax.crypto {













    method public static final javax.crypto.SecretKeyFactory getInstance(java.lang.String) throws java.security.NoSuchAlgorithmException;















    method public static final javax.crypto.SecretKeyFactory getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;















    method public static final javax.crypto.SecretKeyFactory getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException;













    method public final java.security.spec.KeySpec getKeySpec(javax.crypto.SecretKey, java.lang.Class) throws java.security.spec.InvalidKeySpecException;













    method public final java.security.spec.KeySpec getKeySpec(javax.crypto.SecretKey, java.lang.Class<?>) throws java.security.spec.InvalidKeySpecException;















    method public final java.security.Provider getProvider();















    method public final javax.crypto.SecretKey translateKey(javax.crypto.SecretKey) throws java.security.InvalidKeyException;















  }









@@ -63501,7 +63502,7 @@ package javax.crypto {













  public abstract class SecretKeyFactorySpi {















    ctor public SecretKeyFactorySpi();















    method protected abstract javax.crypto.SecretKey engineGenerateSecret(java.security.spec.KeySpec) throws java.security.spec.InvalidKeySpecException;













    method protected abstract java.security.spec.KeySpec engineGetKeySpec(javax.crypto.SecretKey, java.lang.Class) throws java.security.spec.InvalidKeySpecException;













    method protected abstract java.security.spec.KeySpec engineGetKeySpec(javax.crypto.SecretKey, java.lang.Class<?>) throws java.security.spec.InvalidKeySpecException;















    method protected abstract javax.crypto.SecretKey engineTranslateKey(javax.crypto.SecretKey) throws java.security.InvalidKeyException;















  }
























@@ -63619,7 +63620,9 @@ package javax.crypto.spec {



























  public class PBEParameterSpec implements java.security.spec.AlgorithmParameterSpec {















    ctor public PBEParameterSpec(byte[], int);













    ctor public PBEParameterSpec(byte[], int, java.security.spec.AlgorithmParameterSpec);















    method public int getIterationCount();













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















    method public byte[] getSalt();















  }