summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Rename keyguard to gatekeeperAndres Morales2015-03-201-19/+19
* Merge "Update keyguard API"Andres Morales2015-03-201-4/+10
|\
| * Update keyguard APIAndres Morales2015-03-191-4/+10
* | Merge "Camera: Fix tests per camera service interface change"Yin-Chia Yeh2015-03-191-1/+3
|\ \
| * | Camera: Fix tests per camera service interface changeYin-Chia Yeh2015-03-161-1/+3
* | | am 4dfbc5e3: am 6a39dafe: Merge "Use extern "C" rather than BEGIN/END_DECLS."Shawn Willden2015-03-192-4/+12
|\ \ \
| * | | Use extern "C" rather than BEGIN/END_DECLS.Shawn Willden2015-03-182-4/+12
* | | | am 6b5b8ba9: am 201e5555: Merge "Add KM_TAG_AUTH_TOKEN and corresponding auth...Shawn Willden2015-03-192-6/+52
|\ \ \ \ | |/ / /
| * | | Add KM_TAG_AUTH_TOKEN and corresponding auth token structure.Shawn Willden2015-03-182-6/+52
* | | | am 98bf75b4: am 0eadc764: Merge "Add error codes."Shawn Willden2015-03-181-0/+5
|\ \ \ \ | |/ / /
| * | | Add error codes.Shawn Willden2015-03-111-0/+5
* | | | Merge "initial radio HAL definition"Eric Laurent2015-03-161-0/+298
|\ \ \ \ | |_|/ / |/| | |
| * | | initial radio HAL definitionEric Laurent2015-03-101-0/+298
* | | | am fb69cf20: am 37467e5b: Merge "Add keymaster_key_param_compare function."Shawn Willden2015-03-131-0/+48
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "Add keymaster_key_param_compare function."Shawn Willden2015-03-121-0/+48
| |\ \ \
| | * | | Add keymaster_key_param_compare function.Shawn Willden2015-03-041-0/+48
| * | | | am 17dde875: Merge "Separate keymaster0 and keymaster1 HALs."Shawn Willden2015-02-264-192/+371
| |\ \ \ \ | | |/ / /
| | * | | Separate keymaster0 and keymaster1 HALs.Shawn Willden2015-02-244-192/+371
* | | | | Camera3: Add rotation field to camera3_stream_tYin-Chia Yeh2015-03-121-2/+50
* | | | | Merge "camera2: Update HAL docs on eviction behavior."Ruben Brunk2015-03-121-10/+115
|\ \ \ \ \
| * | | | | camera2: Update HAL docs on eviction behavior.Ruben Brunk2015-03-111-10/+115
* | | | | | Merge "Camera3: Add dataspace to camera HAL device stream configuration"Eino-Ville Talvala2015-03-091-0/+34
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Camera3: Add dataspace to camera HAL device stream configurationEino-Ville Talvala2015-03-091-0/+34
| |/ / / /
* | | | | Merge "Change payload size to size_t and add uid param"Andres Morales2015-03-091-6/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Change payload size to size_t and add uid paramAndres Morales2015-03-091-6/+7
* | | | | camera_common: change torch status callback APIChien-Yu Chen2015-02-271-28/+31
| |_|_|/ |/| | |
* | | | Separate keymaster0 and keymaster1 HALs.Shawn Willden2015-02-254-192/+371
* | | | am 8840a683: am 587d8313: am 4f5949b5: Merge "Clarify the meaning of KM_TAG_M...Alex Klyubin2015-02-241-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | am 4f5949b5: Merge "Clarify the meaning of KM_TAG_MAC_LENGTH."Alex Klyubin2015-02-241-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | Clarify the meaning of KM_TAG_MAC_LENGTH.Alex Klyubin2015-02-201-1/+1
| * | | Merge commit 'd7cc04b275ea6d1cec863159327281b0ffbc8120' into HEADBill Yi2015-02-199-44/+156
| |\ \ \ | | |/ / | |/| |
* | | | Merge "Add input HAL header."Michael Wright2015-02-231-0/+176
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add input HAL header.Michael Wright2015-02-231-0/+176
* | | | Merge "camera_common: add -EUSERS to set_torch_mode"Chien-Yu Chen2015-02-191-4/+6
|\ \ \ \
| * | | | camera_common: add -EUSERS to set_torch_modeChien-Yu Chen2015-02-121-4/+6
* | | | | am 66b7b389: am 0e5fca1c: Merge changes Id4bdfdcb,Ib94f3606Shawn Willden2015-02-182-14/+29
|\ \ \ \ \
| * \ \ \ \ am 0e5fca1c: Merge changes Id4bdfdcb,Ib94f3606Shawn Willden2015-02-182-14/+29
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge changes Id4bdfdcb,Ib94f3606Shawn Willden2015-02-182-14/+29
| | |\ \ \ \
| | | * | | | Added insecure (chunkless) AEAD option.Shawn Willden2015-02-102-10/+13
| | | * | | | Add additional param lists to update and finish.Shawn Willden2015-02-091-5/+17
| | * | | | | Merge "Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA"Shawn Willden2015-02-181-2/+2
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATAShawn Willden2015-02-091-2/+2
| * | | | | | Merge "Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA" into lmp-mr1-...Shawn Willden2015-02-181-2/+2
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATAShawn Willden2015-02-171-2/+2
* | | | | | | Merge "Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA"Shawn Willden2015-02-181-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATAShawn Willden2015-02-171-2/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | hardware: libhardware: introduce new fingerprint HAL 2.0 features.Sasha Levitskiy2015-02-171-29/+80
|/ / / / / /
* | | | | | am d7cc04b2: am 6bdaf827: Merge "Add explicit values to keymaster_key_format_t"Shawn Willden2015-02-141-4/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | am 6bdaf827: Merge "Add explicit values to keymaster_key_format_t"Shawn Willden2015-02-141-4/+4
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Add explicit values to keymaster_key_format_tChad Brubaker2015-02-131-4/+4
| | | |/ | | |/|