Alex Klyubin 338e74648d resolved conflicts for merge of 1d5a2592 to master ...

Change-Id: Ia1ea7c9c8c23eeffcd596b96506e961989ccb7a6

2015-04-14 14:23:07 -07:00

..

AndroidKeyPairGenerator.java

Symmetric key import for AndroidKeyStore.

2015-03-26 15:37:15 -07:00

AndroidKeyStore.java

resolved conflicts for merge of a978a3d6 to master

2015-04-13 10:54:53 -07:00

AndroidKeyStoreProvider.java

Add missing mapping between JCA and keystore HMAC names.

2015-04-09 10:10:34 -07:00

ArrayUtils.java

Use JCA names for block modes, paddings, and digests.

2015-04-13 09:59:04 -07:00

Credentials.java

Symmetric key import for AndroidKeyStore.

2015-03-26 15:37:15 -07:00

CryptoOperationException.java

Unhide the new AndroidKeyStore API.

2015-04-13 11:34:04 -07:00

EcIesParameterSpec.java

resolved conflicts for merge of 1d5a2592 to master

2015-04-14 14:23:07 -07:00

IKeyChainAliasCallback.aidl

…

IKeyChainService.aidl

Add DevicePolicyManager PrivateKey mgmt

2014-09-11 19:17:00 +01:00

KeyChain.java

Device Policy API to choose a private key silently

2015-02-05 19:38:43 +00:00

KeyChainAliasCallback.java

…

KeyChainException.java

…

KeyExpiredException.java

Unhide the new AndroidKeyStore API.

2015-04-13 11:34:04 -07:00

KeyGeneratorSpec.java

Unhide the new AndroidKeyStore API.

2015-04-13 11:34:04 -07:00

KeymasterUtils.java

Use JCA names for block modes, paddings, and digests.

2015-04-13 09:59:04 -07:00

KeyNotYetValidException.java

Unhide the new AndroidKeyStore API.

2015-04-13 11:34:04 -07:00

KeyPairGeneratorSpec.java

am fa2bd4fe: am 888f5cb7: am ecfda064: Merge "Make specifying self-signed cert parameters optional."

2015-04-14 20:43:54 +00:00

KeyStore.java

resolved conflicts for merge of b068f162 to master

2015-04-03 13:01:09 -07:00

KeyStoreCipherSpi.java

Use JCA names for block modes, paddings, and digests.

2015-04-13 09:59:04 -07:00

KeyStoreConnectException.java

Add license banner to recently added AndroidKeyStore files.

2015-03-31 16:50:37 -07:00

KeyStoreCryptoOperation.java

A way to obtain KeyStore operation handle from crypto primitives.

2015-03-31 21:19:26 -07:00

KeyStoreCryptoOperationChunkedStreamer.java

Use JCA names for block modes, paddings, and digests.

2015-04-13 09:59:04 -07:00

KeyStoreException.java

Rename KeymasterException to KeyStoreException.

2015-04-02 15:57:27 -07:00

KeyStoreHmacSpi.java

Use JCA names for block modes, paddings, and digests.

2015-04-13 09:59:04 -07:00

KeyStoreKeyGeneratorSpi.java

Unhide the new AndroidKeyStore API.

2015-04-13 11:34:04 -07:00

KeyStoreKeyProperties.java

Unhide the new AndroidKeyStore API.

2015-04-13 11:34:04 -07:00

KeyStoreKeySpec.java

Unhide the new AndroidKeyStore API.

2015-04-13 11:34:04 -07:00

KeyStoreParameter.java

Unhide the new AndroidKeyStore API.

2015-04-13 11:34:04 -07:00

KeyStoreSecretKey.java

Add license banner to recently added AndroidKeyStore files.

2015-03-31 16:50:37 -07:00

KeyStoreSecretKeyFactorySpi.java

resolved conflicts for merge of a978a3d6 to master

2015-04-13 10:54:53 -07:00

NewFingerprintEnrolledException.java

Unhide the new AndroidKeyStore API.

2015-04-13 11:34:04 -07:00

package.html

…

SystemKeyStore.java

…

UserNotAuthenticatedException.java

Unhide the new AndroidKeyStore API.

2015-04-13 11:34:04 -07:00