summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | Separate keymaster0 and keymaster1 HALs.Shawn Willden2015-02-255-200/+379
* | | | | | | Separate keymaster0 and keymaster1 HALs.Shawn Willden2015-02-255-200/+379
* | | | | | | am 8840a683: am 587d8313: am 4f5949b5: Merge "Clarify the meaning of KM_TAG_M...Alex Klyubin2015-02-241-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 587d8313: am 4f5949b5: Merge "Clarify the meaning of KM_TAG_MAC_LENGTH."Alex Klyubin2015-02-241-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 4f5949b5: Merge "Clarify the meaning of KM_TAG_MAC_LENGTH."Alex Klyubin2015-02-241-1/+1
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | 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 "Add input HAL header."Michael Wright2015-02-235-1/+291
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Add input HAL header.Michael Wright2015-02-235-1/+291
* | | | | | | Back out locking order and (over) simplification in out_write(), in_read().Paul McLean2015-02-201-3/+4
* | | | | | | USB device disconnect latencyPaul McLean2015-02-201-42/+3
* | | | | | | am 3cbe7142: am fb9ad66a: Merge commit \'d7cc04b275ea6d1cec863159327281b0ffbc...Bill Yi2015-02-200-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am fb9ad66a: Merge commit \'d7cc04b275ea6d1cec863159327281b0ffbc8120\' into HEADBill Yi2015-02-200-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge commit 'd7cc04b275ea6d1cec863159327281b0ffbc8120' into HEADBill Yi2015-02-1921-350/+823
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
* | | | | | | 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
* | | | | | | | Merge "Improve locking/unlocking in *_set_params()."Paul McLean2015-02-181-21/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve locking/unlocking in *_set_params().Paul McLean2015-02-181-21/+27
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | 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
* | | | | | | | | am f18670b8: am 892ae44c: Merge "Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSO...Shawn Willden2015-02-180-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 892ae44c: Merge "Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA"Shawn Willden2015-02-180-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | 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
* | | | | | | | | am 87150001: Merge "Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA" ...Shawn Willden2015-02-180-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | 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-172-32/+101
|/ / / / / / / /
* | | | | | | | 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
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | 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
* | | | | Merge "Camera: modify test per framework interface change"Yin-Chia Yeh2015-02-034-18/+18
|\ \ \ \ \
| * | | | | Camera: modify test per framework interface changeYin-Chia Yeh2015-02-034-18/+18
* | | | | | 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