summaryrefslogtreecommitdiff
path: root/core/java/android/security
Commit message (Expand)AuthorAgeFilesLines
* Add an optional metadata blob for recoverable application keysBo Zhu2019-01-172-2/+115
* Merge "Update KeyStore for new biometric modalities"TreeHugger Robot2018-11-161-1/+1
|\
| * Update KeyStore for new biometric modalitiesKevin Chyn2018-11-021-1/+1
* | Merge "Multi-threaded keystore" am: 9f248989bf am: cbd890315eJanis Danisevskis2018-11-154-0/+25
|\ \ | |/ |/|
| * Multi-threaded keystoreJanis Danisevskis2018-11-144-0/+25
* | Clean-up removed RecoveryController APIDmitry Dementyev2018-10-094-177/+0
* | Merge "Inline two short methods from Conscrypt" am: 9da9b33cc2 am: 91d61ea0edAdam Vartanian2018-09-251-11/+36
|\|
| * Inline two short methods from ConscryptAdam Vartanian2018-09-241-11/+36
| * Add @UnsupportedAppUsage annotationsMathew Inwood2018-08-167-0/+21
* | Add @UnsupportedAppUsage annotationsMathew Inwood2018-08-167-0/+21
* | Deprecate targetSandboxVersion=2Chad Brubaker2018-08-022-2/+2
* | Merge "Revert "Revert "Change the root of trust for CryptAuth Vault Service""...Bo Zhu2018-05-111-30/+28
|\|
| * Revert "Revert "Change the root of trust for CryptAuth Vault Service""Bo Zhu2018-05-111-30/+28
* | Merge "Revert "Change the root of trust for CryptAuth Vault Service"" into pi...Bo Zhu2018-05-101-28/+30
|\|
| * Revert "Change the root of trust for CryptAuth Vault Service"Bo Zhu2018-05-101-28/+30
* | Merge "Change the root of trust for CryptAuth Vault Service" into pi-dev am: ...android-build-team Robot2018-05-091-30/+28
|\|
| * Change the root of trust for CryptAuth Vault ServiceBo Zhu2018-05-081-30/+28
* | Add nsconfig support for WFA CAsChad Brubaker2018-04-262-0/+44
|/
* Remove implementation of deprecated RecoveryController methods.Dmitry Dementyev2018-04-144-79/+14
* Clean up APIs before declaring API 28.Jeff Sharkey2018-04-114-0/+15
* Add an API to check whether the recoverable keystore is enabledBo Zhu2018-04-101-0/+13
* Merge "Revert "Remove deprecated RecoveryController API."" into pi-devTreeHugger Robot2018-04-064-13/+32
|\
| * Revert "Remove deprecated RecoveryController API."Robert Berry2018-04-064-13/+32
* | Merge "ConfirmationPrompt: Update for API review." into pi-devTreeHugger Robot2018-04-052-30/+37
|\ \
| * | ConfirmationPrompt: Update for API review.David Zeuthen2018-04-042-30/+37
* | | Merge "Remove deprecated recoverable keystore classes." into pi-devDmitry Dementyev2018-04-0414-1684/+0
|\ \ \
| * | | Remove deprecated recoverable keystore classes.Dmitry Dementyev2018-04-0214-1684/+0
* | | | Merge "Remove deprecated RecoveryController API." into pi-devDmitry Dementyev2018-04-044-32/+13
|\ \ \ \ | | |_|/ | |/| |
| * | | Remove deprecated RecoveryController API.Dmitry Dementyev2018-04-024-32/+13
| |/ /
* | | Throw ServiceSpecificException if calling app tries to initializeAseem Kumar2018-04-031-0/+14
* | | Merge "Revert "Throw invalid cert exception when deprecated initRecoveryServi...TreeHugger Robot2018-04-031-1/+11
|\ \ \
| * | | Revert "Throw invalid cert exception when deprecated initRecoveryService method"Dmitry Dementyev2018-04-031-1/+11
* | | | Merge "Expose the JNI scrypt function in a standalone Java class so we can us...Bo Zhu2018-04-031-0/+32
|\ \ \ \ | |_|/ / |/| | |
| * | | Expose the JNI scrypt function in a standalone Java class so we canBo Zhu2018-04-021-0/+32
* | | | Merge "Throw invalid cert exception when deprecated initRecoveryService metho...Dmitry Dementyev2018-04-012-25/+5
|\ \ \ \ | | |/ / | |/| |
| * | | Throw invalid cert exception when deprecated initRecoveryService methodDmitry Dementyev2018-03-312-25/+5
| |/ /
* / / Throw an exception if the given root alias is unknownBo Zhu2018-03-311-1/+1
|/ /
* | Expose e.getMessage() from the exceptions in RecoverableKeyStoreBo Zhu2018-03-302-6/+6
* | Merge "Remove deprecated generateAndStoreKey method implementation" into pi-devDmitry Dementyev2018-03-305-43/+10
|\ \
| * | Remove deprecated generateAndStoreKey method implementationDmitry Dementyev2018-03-305-43/+10
* | | Merge changes from topics "niap-asym-write-pi-dev", "niap-asym-write-api-pi-d...Brian Young2018-03-301-0/+3
|\ \ \
| * | | Add "Unlocked device required" key APIBrian Young2018-03-281-0/+3
* | | | Merge "Update RecoveryController JavaDoc" into pi-devRobert Berry2018-03-301-12/+124
|\ \ \ \ | |_|/ / |/| | |
| * | | Update RecoveryController JavaDocRobert Berry2018-03-301-12/+124
| | |/ | |/|
* | | Merge "Minor correction to the javadoc to match implementation" into pi-devBo Zhu2018-03-301-1/+1
|\ \ \
| * | | Minor correction to the javadoc to match implementationBo Zhu2018-03-291-1/+1
| | |/ | |/|
* | | Add support for testing mode root certificate.Dmitry Dementyev2018-03-291-3/+67
| |/ |/|
* | Add warning comment about serializationRobert Berry2018-03-294-0/+63
|/
* Use Builder instead for KeyChainProtectionParams.Dmitry Dementyev2018-03-263-21/+7
* Merge "Remove unimplemented RecoverableKeystoreManager APIs." into pi-devDmitry Dementyev2018-03-261-18/+2
|\