summaryrefslogtreecommitdiff
path: root/core/java/android/security
Commit message (Expand)AuthorAgeFilesLines
* Remove ASSOCIATED_DATA tagEran Messeri2021-06-221-1/+0
* Merge "Align KeyMint AIDL with usage" am: 6b8f292b17 am: eb393d45f0 am: 3a19c...David Drysdale2021-04-271-3/+0
|\
| * Align KeyMint AIDL with usageDavid Drysdale2021-04-221-3/+0
* | Merge "Keystore 2.0: Remove Keystore 1.0 SPI with all remaining references" a...Janis Danisevskis2021-04-033-161/+54
|\|
| * Keystore 2.0: Remove Keystore 1.0 SPI with all remaining referencesJanis Danisevskis2021-04-013-161/+54
* | Merge "Migrate recoverablekeystore to KeyStore V2." am: dbf8a7c1bd am: 26085e...Dmitry Dementyev2021-03-011-5/+32
|\|
| * Migrate recoverablekeystore to KeyStore V2.Dmitry Dementyev2021-02-251-5/+32
* | Merge "Add support for app-generated attestation keys." am: 50a66e39cd am: 2d...Shawn Willden2021-02-171-0/+1
|\|
| * Add support for app-generated attestation keys.Shawn Willden2021-02-171-0/+1
* | Merge "Keystore 2.0 SPI: Add CERTIFICATE_* tags." am: 14a82f7983 am: 4b875e55...Janis Danisevskis2021-02-081-0/+13
|\|
| * Merge "Keystore 2.0 SPI: Add CERTIFICATE_* tags."Janis Danisevskis2021-02-081-0/+13
| |\
| | * Keystore 2.0 SPI: Add CERTIFICATE_* tags.Janis Danisevskis2021-01-311-0/+13
| * | Add limited use keys related API into Keystore 2.0 SPI.Qi Wu2021-02-031-0/+1
| |/
* | Add limited use keys related API into Keystore 2.0 SPI.Qi Wu2021-02-031-0/+1
* | Merge "ECDH SPI interface" am: e43b86d5b1 am: 5e78686425 am: 42cc0967a5Treehugger Robot2021-01-281-0/+1
|\|
| * ECDH SPI interfaceBram Bonné2021-01-271-0/+1
* | Merge "Keystore 2.0: Android Protected Confirmation" am: 30841f177c am: 3443d...Treehugger Robot2021-01-061-36/+157
|\|
| * Keystore 2.0: Android Protected ConfirmationJanis Danisevskis2020-12-161-36/+157
* | Merge "Add owners for Protected Confirmation implementation." am: 9bb6231bd2 ...Janis Danisevskis2020-12-161-0/+2
|\|
| * Add owners for Protected Confirmation implementation.Janis Danisevskis2020-12-161-0/+2
* | Merge "Revert "Revert "Keystore 2.0 SPI: Move keymint spec to security ..."" ...Treehugger Robot2020-12-121-12/+12
|\|
| * Revert "Revert "Keystore 2.0 SPI: Move keymint spec to security ..."Shawn Willden2020-12-111-12/+12
* | Merge "Revert "Keystore 2.0 SPI: Move keymint spec to security namespace."" a...Orion Hodson2020-12-111-12/+12
|\|
| * Revert "Keystore 2.0 SPI: Move keymint spec to security namespace."Orion Hodson2020-12-111-12/+12
* | Merge "Keystore 2.0 SPI: Move keymint spec to security namespace." am: f0c386...Shawn Willden2020-12-111-12/+12
|\|
| * Keystore 2.0 SPI: Move keymint spec to security namespace.Janis Danisevskis2020-12-091-12/+12
* | resolve merge conflicts of 358f0d4fc8c248498cf113c41e043877a14e89a1 to masterJeff Sharkey2020-12-086-5/+27
|\|
| * Improve OWNERS coverage across frameworks/base/.Jeff Sharkey2020-12-086-5/+27
* | Merge "Revert "Revert "Keystore SPI: Initialize KeymasterDefs contants with A...Treehugger Robot2020-12-011-167/+258
|\|
| * Revert "Revert "Keystore SPI: Initialize KeymasterDefs contants with AIDL gen...Janis Danisevskis2020-11-301-167/+258
* | Merge "Revert "Keystore SPI: Initialize KeymasterDefs contants with AIDL gene...Louis Chang2020-11-301-258/+167
|\|
| * Revert "Keystore SPI: Initialize KeymasterDefs contants with AIDL generated e...Louis Chang2020-11-301-258/+167
* | Merge "Keystore SPI: Initialize KeymasterDefs contants with AIDL generated en...Janis Danisevskis2020-11-271-167/+258
|\|
| * Keystore SPI: Initialize KeymasterDefs contants with AIDL generated enumsJanis Danisevskis2020-11-231-167/+258
* | Merge "Adds two missing Keymaster definitions." am: 6d7e4c43d6 am: faefa76349...Bram Bonné2020-11-231-0/+2
|\|
| * Adds two missing Keymaster definitions.Bram Bonné2020-11-191-0/+2
| * Merge "Add maxTargetSdk restriction to unused APIs."Mathew Inwood2020-11-0911-24/+35
| |\
| | * Add maxTargetSdk restriction to unused APIs.Mathew Inwood2020-11-0411-24/+35
* | | Merge changes Ib3c9affb,I1dbe3d02,I88681f21 am: 1f65c6b62e am: f2abffe107 am:...Treehugger Robot2020-11-061-0/+5
|\ \ \
| * | | Merge changes Ib3c9affb,I1dbe3d02,I88681f21 am: 1f65c6b62e am: f2abffe107 am:...Treehugger Robot2020-11-061-0/+5
| |\| |
| | * | Keystore SPI: Add SecurityLevelEnum to KeyPropertiesJanis Danisevskis2020-11-051-0/+5
| | |/
* | | Merge changes I7c17ab51,I5bd4acb4,I93270f00 am: 18bbac10c1 am: 68acc834d4 am:...Janis Danisevskis2020-11-021-0/+3
|\| |
| * | Merge changes I7c17ab51,I5bd4acb4,I93270f00 am: 18bbac10c1 am: 68acc834d4 am:...Janis Danisevskis2020-11-021-0/+3
| |\|
| | * Add KM_ERROR_HARDWARE_TYPE_UNAVAILABLE to KeymasterDefsJanis Danisevskis2020-10-271-0/+3
| | * Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-3110-22/+159
| | |\
| * | | Add maxTargetSdk restriction to unused APIs.Mathew Inwood2020-11-0211-24/+35
* | | | Add maxTargetSdk restriction to unused APIs.Mathew Inwood2020-10-2911-24/+35
* | | | Merge "Revert "Add maxTargetSdk restriction to unused APIs.""Hongwei Wang2020-10-2811-35/+24
|\ \ \ \
| * | | | Revert "Add maxTargetSdk restriction to unused APIs."Hongwei Wang2020-10-2811-35/+24
* | | | | Merge "Include cause in exceptions thrown by RecoveryController."Dmitry Dementyev2020-10-281-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-06 09:40:18 +0000