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

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

frameworks/base: add changes coming from aosp 

am: 29835cc5

Change-Id: Ia89b81f3d5c1d8a4d20280355bb9d27b655098d3
parents f929ef6c 29835cc5

api/current.txt

+6 −3
Original line number Diff line number Diff line
@@ -56145,6 +56145,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;
@@ -63211,7 +63212,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















  }























@@ -63222,7 +63223,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;















  }









@@ -63230,7 +63231,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;















  }
























@@ -63348,7 +63349,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








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










@@ -66568,7 +66569,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















  }























@@ -66579,7 +66580,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;















  }









@@ -66587,7 +66588,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;















  }
























@@ -66705,7 +66706,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








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










@@ -63291,7 +63292,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















  }























@@ -63302,7 +63303,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;















  }









@@ -63310,7 +63311,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;















  }
























@@ -63428,7 +63429,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();















  }