summaryrefslogtreecommitdiffstats
path: root/keystore
Commit message (Expand)AuthorAgeFilesLines
* am bcdd58c5: am e21dd346: am 3e941c33: Merge "Revert "Revert "Revert "Revert ...Zoltan Szatmary-Ban2014-08-152-9/+1
|\
| * Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in ...Zoltan Szatmary-Ban2014-08-152-9/+1
* | am 08390bf9: am 1d128a5a: am 856e0928: Merge "Revert "Revert "Revert "Revert ...Zoltan Szatmary-Ban2014-08-152-1/+9
|\ \ | |/
| * Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings...Zoltan Szatmary-Ban2014-08-152-1/+9
* | am 2b83dc1a: am 09f669f0: am a7d930a0: Merge "Revert "Revert "Revert "Update ...Narayan Kamath2014-08-152-9/+1
|\ \ | |/
| * Revert "Revert "Revert "Update Trusted Credentials screen in settings"""Narayan Kamath2014-08-152-9/+1
* | am a6e86ddf: am fe2114b4: am 19c8ce29: Revert "Revert "Update Trusted Credent...Zoltan Szatmary-Ban2014-08-152-1/+9
|\ \ | |/
| * Revert "Revert "Update Trusted Credentials screen in settings""Zoltan Szatmary-Ban2014-08-152-1/+9
* | am 084a1161: am f947b96e: am a37d2244: Merge "Revert "Update Trusted Credenti...Zoltan Szatmary-Ban2014-08-072-9/+1
|\ \ | |/
| * Revert "Update Trusted Credentials screen in settings"Zoltan Szatmary-Ban2014-08-072-9/+1
* | am d9d6bfe9: am d76cefa2: am 74535f61: Merge "Update Trusted Credentials scre...Zoltan Szatmary-Ban2014-08-072-1/+9
|\ \ | |/
| * Update Trusted Credentials screen in settingsZoltan Szatmary-Ban2014-07-292-1/+9
* | Add a method to DevicePolicyManager to silently install a certificate / priva...Bernhard Bauer2014-07-311-0/+3
* | Add a method to DevicePolicyManager to register a private key access listener.Bernhard Bauer2014-07-301-6/+77
|/
* Merge "Revert "Revert "Publish DevicePolicyManager CA certificate APIs"""Robin Lee2014-06-171-3/+14
|\
| * Revert "Revert "Publish DevicePolicyManager CA certificate APIs""Robin Lee2014-06-191-3/+14
* | Merge "Revert "Publish DevicePolicyManager CA certificate APIs""Robin Lee2014-06-171-14/+3
|\ \ | |/
| * Revert "Publish DevicePolicyManager CA certificate APIs"Robin Lee2014-06-171-14/+3
* | Merge "Publish DevicePolicyManager CA certificate APIs"Robin Lee2014-06-171-3/+14
|\ \ | |/
| * Publish DevicePolicyManager CA certificate APIsRobin Lee2014-06-111-3/+14
* | am b1cb5aab: am 748856f2: am a7ddd029: am 80e84e2d: am f3cecfa2: am 55d525b2:...Robert Ly2014-06-112-4/+4
|\ \ | |/ |/|
| * am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStoreRobert Ly2014-06-102-4/+4
| |\
| | * am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStoreRobert Ly2014-06-102-4/+4
| | |\
| | | * Add documentation for AndroidKeyStoreRobert Ly2014-05-072-4/+4
* | | | Use the correct package name for CHOOSERKenny Root2014-03-171-1/+6
* | | | KeyChain: add explicit package for getPrivateKeyKenny Root2014-02-071-1/+7
* | | | Remove unused imports from frameworks/base.John Spurlock2013-11-205-11/+0
|/ / /
* | | Add argument to binder call to check key typesKenny Root2013-09-052-3/+12
* | | Unhide functions to allow ECDSA supportKenny Root2013-09-031-6/+0
* | | Add support for DSA and ECDSA key typesKenny Root2013-09-037-196/+1450
* | | Add methods for managing CAs to DevicePolicyManager(Service)Maggie Benthall2013-08-201-1/+4
|/ /
* | resolved conflicts for merge of fca0f92e to stage-aosp-masterElliott Hughes2013-06-282-6/+6
|\ \
| * | Switch frameworks/base over from @hidden Charsets to public StandardCharsets.Elliott Hughes2013-06-282-6/+6
* | | am cd1de394: Merge "Track change in NativeCrypto"Kenny Root2013-05-061-0/+2
|\ \ \ | |/ /
| * | Track change in NativeCryptoKenny Root2013-05-061-0/+2
* | | resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aospKenny Root2013-04-295-7/+7
|\ \ \ | |/ / | | / | |/ |/|
| * Track change to JSSE providerKenny Root2013-04-295-7/+7
| * AndroidKeyStore: Add encrypted flagKenny Root2013-04-159-136/+732
| * keystore: Add flag for blobs to be unencryptedKenny Root2013-04-151-6/+21
| * Remove keystore entries when package removedKenny Root2013-04-021-0/+9
| * KeyStore: add API to query storage typeKenny Root2013-03-291-0/+9
* | Rename API AndroidKey* -> Key*Kenny Root2013-04-188-76/+80
* | keystore: remove old APIsKenny Root2013-04-121-24/+0
* | Remove old KeyStore call sitesKenny Root2013-04-122-113/+175
* | AndroidKeyStore: Add encrypted flagKenny Root2013-04-129-136/+730
* | keystore: Add flag for blobs to be unencryptedKenny Root2013-04-101-6/+21
* | Revert "Remove AndroidKeyStore from API"Kenny Root2013-04-061-2/+0
* | Remove keystore entries when package removedKenny Root2013-04-031-0/+9
* | Add API to query KeyChain algorithm support, pt. 2Kenny Root2013-04-021-3/+3
* | Add API to query KeyChain algorithm supportKenny Root2013-04-021-0/+24