summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | |/ | | |/|
* | | | am 4c2059d8: am adbfbb74: Add new SENSOR_TYPE_WRIST_TILT_GESTURE sensor typeNick Vaccaro2015-02-111-0/+16
|\ \ \ \ | |/ / /
| * | | am adbfbb74: Add new SENSOR_TYPE_WRIST_TILT_GESTURE sensor typeNick Vaccaro2015-02-111-0/+16
| |\ \ \ | | |_|/ | |/| |
| | * | Add new SENSOR_TYPE_WRIST_TILT_GESTURE sensor typeNick Vaccaro2015-02-051-0/+16
* | | | am 2c16d1e0: am a163e491: Merge "gralloc: clarify lock_ycbcr in light of mult...Lajos Molnar2015-02-041-2/+11
|\ \ \ \ | |/ / /
| * | | am a163e491: Merge "gralloc: clarify lock_ycbcr in light of multimedia codec ...Lajos Molnar2015-02-041-2/+11
| |\ \ \ | | |/ /
| | * | Merge "gralloc: clarify lock_ycbcr in light of multimedia codec usage" into l...Lajos Molnar2015-02-041-2/+11
| | |\ \
| | | * | gralloc: clarify lock_ycbcr in light of multimedia codec usageLajos Molnar2015-01-301-2/+11
* | | | | am efbc9f6d: am 949d6d4b: Merge changes I38700cda,I088e6094Shawn Willden2015-02-031-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | am 949d6d4b: Merge changes I38700cda,I088e6094Shawn Willden2015-02-031-1/+2
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge changes I38700cda,I088e6094Shawn Willden2015-02-031-1/+2
| | |\ \ \
| | | * | | Add raw key format, for symmetric key import.Shawn Willden2015-02-031-0/+1
| | | * | | Remove "required" label from DSA algorithm.Shawn Willden2015-02-031-1/+1
* | | | | | Merge "camera_common: add TORCH_MODE_STATUS_OFF"Chien-Yu Chen2015-02-031-2/+20
|\ \ \ \ \ \
| * | | | | | camera_common: add TORCH_MODE_STATUS_OFFChien-Yu Chen2015-01-291-2/+20
* | | | | | | am 9da1cb51: am f3391a93: Merge changes I4ef53a09,I7c3c5bd5Shawn Willden2015-02-022-35/+24
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am f3391a93: Merge changes I4ef53a09,I7c3c5bd5Shawn Willden2015-02-022-35/+24
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge changes I4ef53a09,I7c3c5bd5Shawn Willden2015-02-022-35/+24
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Remove get_output_size() method from keymaster HAL.Shawn Willden2015-02-021-12/+0
| | | * | | | Add tag to allow caller-specified nonce.Shawn Willden2015-02-021-23/+24
* | | | | | | am 3ec7c973: am d5f7dbec: audio: Add audio parameter key for device connectHaynes Mathew George2015-02-021-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am d5f7dbec: audio: Add audio parameter key for device connectHaynes Mathew George2015-02-021-0/+1
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | audio: Add audio parameter key for device connectHaynes Mathew George2015-01-311-0/+1
| | | |_|_|/ | | |/| | |
* | | | | | am cb37e73b: am ee844515: Merge "Fix "error: \'strlen\' was not declared in t...Elliott Hughes2015-01-311-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am ee844515: Merge "Fix "error: \'strlen\' was not declared in this scope"."Elliott Hughes2015-01-311-0/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Fix "error: 'strlen' was not declared in this scope".Elliott Hughes2015-01-301-0/+1
| | | |/ / | | |/| |
* | | | | Merge "hardware keyguard HAL"Andres Morales2015-01-311-0/+92
|\ \ \ \ \
| * | | | | hardware keyguard HALAndres Morales2015-01-301-0/+92
* | | | | | Merge "camera HAL: Update camera_info with simultaneous access information."Ruben Brunk2015-01-301-0/+80
|\ \ \ \ \ \
| * | | | | | camera HAL: Update camera_info with simultaneous access information.Ruben Brunk2015-01-291-0/+80
* | | | | | | camera3: update reprocessing specZhijun He2015-01-292-4/+161
* | | | | | | am 2a96edc3: am b2bc0e51: camera3: update ZSL specZhijun He2015-01-291-31/+2
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | am b2bc0e51: camera3: update ZSL specZhijun He2015-01-291-31/+2
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | camera3: update ZSL specZhijun He2015-01-291-31/+2