Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

frameworks/base: add changes coming from aosp

Browse Source 
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
This commit is contained in:
Sergio Giro
2016-08-24 15:45:02 +01:00
parent 621fb590e3
commit 29835cc56e
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
api/current.txt
View File

@@ -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();
}

9
api/system-current.txt
View File

@@ -59501,6 +59501,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;
@@ -66567,7 +66568,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
}
@@ -66578,7 +66579,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;
}
@@ -66586,7 +66587,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;
}
@@ -66704,7 +66705,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();
}

9
api/test-current.txt
View File

@@ -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();
}