summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Separate keymaster0 and keymaster1 HALs.Shawn Willden2015-02-255-200/+379
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For now the keymaster1 HAL still includes all of the keymaster0 entry points, and soft_keymaster_device will continue to implement them. In the near future the keymaster0 entry points will be removed, as soon as we can ensure that keystore no longer needs them. Change-Id: I5c54282c12d1c4b8b22ed4929b6e6c724a94ede4
* | | | | | | Separate keymaster0 and keymaster1 HALs.Shawn Willden2015-02-255-200/+379
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For now the keymaster1 HAL still includes all of the keymaster0 entry points, and soft_keymaster_device will continue to implement them. In the near future the keymaster0 entry points will be removed, as soon as we can ensure that keystore no longer needs them. Change-Id: I5c54282c12d1c4b8b22ed4929b6e6c724a94ede4
* | | | | | | am 8840a683: am 587d8313: am 4f5949b5: Merge "Clarify the meaning of ↵Alex Klyubin2015-02-241-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KM_TAG_MAC_LENGTH." * commit '8840a6833a4be28dddef0a3a318f0145b3f615cd': Clarify the meaning of KM_TAG_MAC_LENGTH.
| * | | | | | am 587d8313: am 4f5949b5: Merge "Clarify the meaning of KM_TAG_MAC_LENGTH."Alex Klyubin2015-02-241-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '587d8313d6d9d9f44ac2d8702676c02c792e1bf3': Clarify the meaning of KM_TAG_MAC_LENGTH.
| | * | | | | am 4f5949b5: Merge "Clarify the meaning of KM_TAG_MAC_LENGTH."Alex Klyubin2015-02-241-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '4f5949b5dda4a2e95d29e1aa3effb22c678df21a': Clarify the meaning of KM_TAG_MAC_LENGTH.
| | | * | | | 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
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I18478923059783e955613142a8d3352f98f5d7b0
* | | | | | | Merge "Add input HAL header."Michael Wright2015-02-235-1/+291
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Add input HAL header.Michael Wright2015-02-235-1/+291
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia959dd1d1adf024459d2423fc9d59a811466e53c
* | | | | | | Back out locking order and (over) simplification in out_write(), in_read().Paul McLean2015-02-201-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I96954f883798f8e10adce56d9c33b70574999d1c
* | | | | | | USB device disconnect latencyPaul McLean2015-02-201-42/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eliminated unnecessay locking/unlocking in adev_set_parameters(). Corrected and simplified lock/unlock order in out_write() and in_read(). Bugs 19363750 Change-Id: Iede9a95f5f17645d9780b344fd5ee009cd9fa94d
* | | | | | | am 3cbe7142: am fb9ad66a: Merge commit ↵Bill Yi2015-02-200-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | \'d7cc04b275ea6d1cec863159327281b0ffbc8120\' into HEAD * commit '3cbe71422d9df74a2a1383f858fa81ea9b267cb7':
| * | | | | | am fb9ad66a: Merge commit \'d7cc04b275ea6d1cec863159327281b0ffbc8120\' into HEADBill Yi2015-02-200-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | * commit 'fb9ad66afd1591fffc24db04214f45a6abf96c59':
| | * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To match the public API, seperate camera device in use and other resources in use errors. Bug: 2682206 Change-Id: Ie0451931f0c84fc65f3f6294a9f44bec10627afe
* | | | | | | | 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
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also clean up logging. This doesn't completely fix the referenced bug, but substantially reduces the instances of long latency on USB device disconnect. Bug: 19363750 Change-Id: If0a6d64c4973277ae2474e121198e47df973965e
* | | | | | | | am 66b7b389: am 0e5fca1c: Merge changes Id4bdfdcb,Ib94f3606Shawn Willden2015-02-182-14/+29
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '66b7b3899fdc76add9e728cebcde146b386210e0': Added insecure (chunkless) AEAD option. Add additional param lists to update and finish.
| * | | | | | | am 0e5fca1c: Merge changes Id4bdfdcb,Ib94f3606Shawn Willden2015-02-182-14/+29
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0e5fca1ca4777f5f5d5fa8bd0de139e42077881b': Added insecure (chunkless) AEAD option. Add additional param lists to update and finish.
| | * | | | | | Merge changes Id4bdfdcb,Ib94f3606Shawn Willden2015-02-182-14/+29
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Added insecure (chunkless) AEAD option. Add additional param lists to update and finish.
| | | * | | | | | Added insecure (chunkless) AEAD option.Shawn Willden2015-02-102-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also moved chunk length specification to operation parameter rather than keygen parameter. Change-Id: Id4bdfdcb1c7b64b3f22b4027e037e37c2860ec39
| | | * | | | | | Add additional param lists to update and finish.Shawn Willden2015-02-091-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the moment this is to accommodate associated data for AEAD modes, but there may be other parameters in the future. Change-Id: Ib94f3606e3f714f6fa75bf0d4bd75804d9a8db4e
* | | | | | | | | am f18670b8: am 892ae44c: Merge "Rename KM_TAG_ADDITIONAL_DATA to ↵Shawn Willden2015-02-180-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KM_TAG_ASSOCIATED_DATA" * commit 'f18670b802c85b393995596eee1f171f6d16852b': Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA
| * | | | | | | | am 892ae44c: Merge "Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA"Shawn Willden2015-02-180-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '892ae44c5f805f6ac64e6e756964c79998411742': Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA
| | * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieddd706ee205100719f7e2f9e18b3d9b07c37669
* | | | | | | | | am 87150001: Merge "Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA" ↵Shawn Willden2015-02-180-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev-plus-aosp * commit '871500013a60c052475b219be3da10a8b6a9e66b': Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA
| * | | | | | | | Merge "Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA" into ↵Shawn Willden2015-02-181-2/+2
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | lmp-mr1-dev-plus-aosp
| | * | | | | | | Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATAShawn Willden2015-02-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieddd706ee205100719f7e2f9e18b3d9b07c37669
* | | | | | | | | 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
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieddd706ee205100719f7e2f9e18b3d9b07c37669
* | | | | | | | | hardware: libhardware: introduce new fingerprint HAL 2.0 features.Sasha Levitskiy2015-02-172-32/+101
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4ab0a511417742a4b0b912ebf98a3773ec22bb10 Signed-off-by: Sasha Levitskiy <sanek@google.com>
* | | | | | | | am d7cc04b2: am 6bdaf827: Merge "Add explicit values to keymaster_key_format_t"Shawn Willden2015-02-141-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | / / / | |_|_|_|/ / / |/| | | | | | * commit 'd7cc04b275ea6d1cec863159327281b0ffbc8120': Add explicit values to keymaster_key_format_t
| * | | | | | am 6bdaf827: Merge "Add explicit values to keymaster_key_format_t"Shawn Willden2015-02-141-4/+4
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * commit '6bdaf827ef59975efbf73b2d5b4228fb61c36123': Add explicit values to keymaster_key_format_t
| | * | | | | 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
| | |/ / / / | | | | | | | | | | | | | | | | | | Change-Id: I4113286396b16ca687fbd8bc38b2f16063fc1024
* | | | | | am 4c2059d8: am adbfbb74: Add new SENSOR_TYPE_WRIST_TILT_GESTURE sensor typeNick Vaccaro2015-02-111-0/+16
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '4c2059d8fbefad3d3f3c37079819ea8205809b17': Add new SENSOR_TYPE_WRIST_TILT_GESTURE sensor type
| * | | | | am adbfbb74: Add new SENSOR_TYPE_WRIST_TILT_GESTURE sensor typeNick Vaccaro2015-02-111-0/+16
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| | * commit 'adbfbb747de9fe1efc21fc83f6591e7d13c81c36': Add new SENSOR_TYPE_WRIST_TILT_GESTURE sensor type
| | * | | Add new SENSOR_TYPE_WRIST_TILT_GESTURE sensor typeNick Vaccaro2015-02-051-0/+16
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | Adds a new sensor type for converting the Android Wear defined wrist tilt sensor type into an official android sensor type. Change-Id: If6357aeb463a556a68a19b28931edec04f99a952
* | | | am 2c16d1e0: am a163e491: Merge "gralloc: clarify lock_ycbcr in light of ↵Lajos Molnar2015-02-041-2/+11
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | multimedia codec usage" into lmp-mr1-dev * commit '2c16d1e07d4600f78f40d16137c16c3160a3fdef': gralloc: clarify lock_ycbcr in light of multimedia codec usage
| * | | am a163e491: Merge "gralloc: clarify lock_ycbcr in light of multimedia codec ↵Lajos Molnar2015-02-041-2/+11
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | usage" into lmp-mr1-dev * commit 'a163e491c148468884520d6d331a0f6d19104677': gralloc: clarify lock_ycbcr in light of multimedia codec usage
| | * | Merge "gralloc: clarify lock_ycbcr in light of multimedia codec usage" into ↵Lajos Molnar2015-02-041-2/+11
| | |\ \ | | | | | | | | | | | | | | | lmp-mr1-dev
| | | * | gralloc: clarify lock_ycbcr in light of multimedia codec usageLajos Molnar2015-01-301-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19179927 Change-Id: I53886f8d1a3a998b958f031b04ddd4cbf19aad2c
* | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrap camera_module_t by CameraModule to follow framework interface change. Change-Id: Ief423a1571cf06c7ef80b98b403a33969baf95f6
* | | | | | am efbc9f6d: am 949d6d4b: Merge changes I38700cda,I088e6094Shawn Willden2015-02-031-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | | | | | | * commit 'efbc9f6d0b6cbf890ee894ee66f2a6f8308c1766': Add raw key format, for symmetric key import. Remove "required" label from DSA algorithm.
| * | | | am 949d6d4b: Merge changes I38700cda,I088e6094Shawn Willden2015-02-031-1/+2
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | * commit '949d6d4bfc1cf37a84d5d4ac00a20017941fdeba': Add raw key format, for symmetric key import. Remove "required" label from DSA algorithm.
| | * | | Merge changes I38700cda,I088e6094Shawn Willden2015-02-031-1/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Add raw key format, for symmetric key import. Remove "required" label from DSA algorithm.
| | | * | | Add raw key format, for symmetric key import.Shawn Willden2015-02-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I38700cdafcf1f244584d6e88f8d9540c70a7de56