summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Keystore 2.0: Remove list permission from keystore2_key security class."HEADmasterJanis Danisevskis2020-10-014-35/+25
|\
| * Keystore 2.0: Remove list permission from keystore2_key security class.Janis Danisevskis2020-09-304-35/+25
|/
* Merge "Convert KeyParameter to wire type."Hasini Gunasinghe2020-09-161-24/+472
|\
| * Convert KeyParameter to wire type.Hasini Gunasinghe2020-09-151-24/+472
|/
* Merge "Add helper function to insert with retry."Treehugger Robot2020-09-141-37/+35
|\
| * Add helper function to insert with retry.Joel Galenson2020-09-141-37/+35
* | Merge "Keystore 2.0: Minor update to pregenerated keymint rust bindings."Treehugger Robot2020-09-111-1/+2
|\ \
| * | Keystore 2.0: Minor update to pregenerated keymint rust bindings.Janis Danisevskis2020-09-101-1/+2
| |/
* | Merge "Keystore2.0 database.rs: Add storing and loading key parameters."Treehugger Robot2020-09-112-43/+351
|\ \
| * | Keystore2.0 database.rs: Add storing and loading key parameters.Janis Danisevskis2020-09-112-43/+351
| |/
* | Merge "Merge Android R"Xin Li2020-09-104-4/+3
|\ \ | |/ |/|
| * Merge Android RXin Li2020-09-094-4/+3
|/|
| * Merge "Add functionality to Keystore 2.0 database module." am: 501a974912Treehugger Robot2020-09-091-20/+933
| |\ | |/ |/|
* | Merge "Add functionality to Keystore 2.0 database module."Treehugger Robot2020-09-091-20/+933
|\ \
| * | Add functionality to Keystore 2.0 database module.Janis Danisevskis2020-09-091-20/+933
|/ /
| * Merge "Model KeyStore security level in keymaster worker" am: ae73ca248eEdman Anjos2020-09-083-10/+24
| |\ | |/ |/|
* | Merge "Model KeyStore security level in keymaster worker"Edman Anjos2020-09-083-10/+24
|\ \
| * | Model KeyStore security level in keymaster workerEdman Anjos2020-09-023-10/+24
| | * Merge changes I7cf1b0d5,Ib9943513,I98e0d91a,I7cb60da1 am: 74cdafdfd1Treehugger Robot2020-09-036-155/+119
| | |\ | |_|/ |/| |
* | | Merge changes I7cf1b0d5,Ib9943513,I98e0d91a,I7cb60da1Treehugger Robot2020-09-036-155/+119
|\ \ \
| * | | Keystore2: Handle errors from binder service calls.Janis Danisevskis2020-09-031-2/+92
| * | | Keystore selinux and permission modules accept CStr instead of Context.Janis Danisevskis2020-09-032-8/+6
| * | | Remove aidl_generated.rsJanis Danisevskis2020-09-032-110/+0
| * | | Switch database module over to generated types.Janis Danisevskis2020-09-031-35/+21
| | | * Merge "Revise database initialization." am: 1fe037562bTreehugger Robot2020-09-031-53/+58
| | | |\ | |_|_|/ |/| | |
* | | | Merge "Revise database initialization."Treehugger Robot2020-09-031-53/+58
|\| | |
| * | | Revise database initialization.Janis Danisevskis2020-09-031-53/+58
| | | * Merge "Change error.rs to use generated types." am: 5061b81606Treehugger Robot2020-09-033-138/+76
| | | |\ | |_|_|/ |/| | |
* | | | Merge "Change error.rs to use generated types."Treehugger Robot2020-09-033-138/+76
|\| | |
| * | | Change error.rs to use generated types.Janis Danisevskis2020-09-033-138/+76
|/ / /
| | * Merge "Slightly cleanup KeyParameter error handling." am: 5de2d3086dTreehugger Robot2020-09-031-51/+43
| | |\ | |_|/ |/| |
* | | Merge "Slightly cleanup KeyParameter error handling."Treehugger Robot2020-09-031-51/+43
|\ \ \
| * | | Slightly cleanup KeyParameter error handling.Joel Galenson2020-09-021-51/+43
| | | * Merge "Keystore 2.0 permissions.rs: Use generated aidl types." am: 21e53ab0ffJanis Danisevskis2020-09-032-134/+192
| | | |\ | |_|_|/ |/| | |
* | | | Merge "Keystore 2.0 permissions.rs: Use generated aidl types."Janis Danisevskis2020-09-032-134/+192
|\ \ \ \ | |/ / / |/| | |
| * | | Keystore 2.0 permissions.rs: Use generated aidl types.Janis Danisevskis2020-09-022-134/+192
|/ / /
| | * Merge "Implement key_parameter conversion from/to rusqlite storage." am: a271...Hasini Gunasinghe2020-09-026-219/+698
| | |\ | |_|/ |/| |
* | | Merge "Implement key_parameter conversion from/to rusqlite storage."Hasini Gunasinghe2020-09-026-219/+698
|\ \ \
| * | | Implement key_parameter conversion from/to rusqlite storage.Hasini Gunasinghe2020-09-026-219/+698
| |/ /
| | * Merge "Add getpidcon to libselinux bindings and fix a typo." am: fd13bc1fe6Treehugger Robot2020-09-021-3/+50
| | |\ | |_|/ |/| |
* | | Merge "Add getpidcon to libselinux bindings and fix a typo."Treehugger Robot2020-09-021-3/+50
|\ \ \ | |/ / |/| |
| * | Add getpidcon to libselinux bindings and fix a typo.Janis Danisevskis2020-09-021-3/+50
|/ /
| * Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-284-4/+3
| |\
| | * [automerger skipped] credstore: Don't require credentials to use ACP ids star...David Zeuthen2020-07-140-0/+0
| | |\
| | | * credstore: Don't require credentials to use ACP ids starting at 0.android11-devDavid Zeuthen2020-07-131-4/+19
| | * | Merge "credstore: Don't require credentials to use ACP ids starting at 0." am...Treehugger Robot2020-07-131-4/+19
| | |\ \
| | * \ \ Merge "Remove unused libnativehelper include" am: c373ce2a88 am: 74685e1ecdOrion Hodson2020-07-071-1/+0
| | |\ \ \
| | * \ \ \ Merge "Enable rustfmt for system/security" am: ed2fe02dd0 am: ac067c8965ThiƩbaud Weksteen2020-06-252-0/+3
| | |\ \ \ \
| | * \ \ \ \ Log keystore key attestation events using statsd. am: 9d2bd25cbdHasini Gunasinghe2020-06-234-3/+67
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Log keystore key attestation events using statsd.Hasini Gunasinghe2020-06-234-3/+67