Alex Klyubin 1620a65d32 resolved conflicts for merge of 06adabdb to master ...

Change-Id: Ifb09e2e6242f79cabe76e95eacc982f6cc7e1a6c

2015-04-07 11:39:51 -07:00

..

AndroidKeyPairGenerator.java

Symmetric key import for AndroidKeyStore.

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

AndroidKeyStore.java

resolved conflicts for merge of 06adabdb to master

2015-04-07 11:39:51 -07:00

AndroidKeyStoreProvider.java

Load fewer classes when AndroidKeyStore provider is installed.

2015-04-03 12:45:16 -07:00

Credentials.java

Symmetric key import for AndroidKeyStore.

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

CryptoOperationException.java

Add license banner to recently added AndroidKeyStore files.

2015-03-31 16:50:37 -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

Add exception types for AndroidKeyStore key validity issues.

2015-04-01 16:22:00 -07:00

KeyGeneratorSpec.java

resolved conflicts for merge of 06adabdb to master

2015-04-07 11:39:51 -07:00

KeymasterUtils.java

Rename KeymasterException to KeyStoreException.

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

KeyNotYetValidException.java

Add exception types for AndroidKeyStore key validity issues.

2015-04-01 16:22:00 -07:00

KeyPairGeneratorSpec.java

resolved conflicts for merge of 06adabdb to master

2015-04-07 11:39:51 -07:00

KeyStore.java

resolved conflicts for merge of b068f162 to master

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

KeyStoreCipherSpi.java

Rename KeymasterException to KeyStoreException.

2015-04-02 15:57:27 -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

Rename KeymasterException to KeyStoreException.

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

KeyStoreException.java

Rename KeymasterException to KeyStoreException.

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

KeyStoreHmacSpi.java

Rename KeymasterException to KeyStoreException.

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

KeyStoreKeyCharacteristics.java

Add license banner to recently added AndroidKeyStore files.

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

KeyStoreKeyConstraints.java

resolved conflicts for merge of 06adabdb to master

2015-04-07 11:39:51 -07:00

KeyStoreKeyGeneratorSpi.java

resolved conflicts for merge of 06adabdb to master

2015-04-07 11:39:51 -07:00

KeyStoreKeySpec.java

resolved conflicts for merge of 06adabdb to master

2015-04-07 11:39:51 -07:00

KeyStoreParameter.java

resolved conflicts for merge of 06adabdb to master

2015-04-07 11:39:51 -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 06adabdb to master

2015-04-07 11:39:51 -07:00

NewFingerprintEnrolledException.java

Add fingerprint-specific AndroidKeyStore API.

2015-04-01 18:35:36 -07:00

package.html

…

SystemKeyStore.java

…

UserNotAuthenticatedException.java

Add exception types for AndroidKeyStore key validity issues.

2015-04-01 16:22:00 -07:00