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

Commit 34e05742 authored by Sergio Giro's avatar Sergio Giro Committed by Colin Cross
Browse files

frameworks/base: add changes coming from aosp 

Corresponding to aosp changes:
https://android-review.googlesource.com/261231
https://android-review.googlesource.com/261194
https://android-review.googlesource.com/261211

Change-Id: I13caa90b7f97d5aa447050f89a5312d22db3d277
(cherry picked from commit 29835cc5)
parent e959e8f9

api/current.txt

+6 −3
Original line number Diff line number Diff line
@@ -56419,6 +56419,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;
@@ -63485,7 +63486,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















  }























@@ -63496,7 +63497,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;















  }









@@ -63504,7 +63505,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;















  }
























@@ -63622,7 +63623,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








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










@@ -67012,7 +67013,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















  }























@@ -67023,7 +67024,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;















  }









@@ -67031,7 +67032,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;















  }
























@@ -67149,7 +67150,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








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










@@ -63574,7 +63575,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















  }























@@ -63585,7 +63586,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;















  }









@@ -63593,7 +63594,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;















  }
























@@ -63711,7 +63712,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();















  }