Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Update fingerprint.h for new API" | Jim Miller | 2015-03-25 | 1 | -4/+7 |
|\ | |||||
| * | Update fingerprint.h for new API | Jim Miller | 2015-03-24 | 1 | -4/+7 |
* | | am 92469ed0: am f1babb18: Merge "Add KM_TAG_USER_SECURE_ID." | Shawn Willden | 2015-03-23 | 1 | -14/+19 |
|\ \ | |||||
| * | | Add KM_TAG_USER_SECURE_ID. | Shawn Willden | 2015-03-18 | 1 | -14/+19 |
* | | | Rename keyguard to gatekeeper | Andres Morales | 2015-03-20 | 1 | -19/+19 |
* | | | Merge "Update keyguard API" | Andres Morales | 2015-03-20 | 1 | -4/+10 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Update keyguard API | Andres Morales | 2015-03-19 | 1 | -4/+10 |
* | | | Merge "Camera: Fix tests per camera service interface change" | Yin-Chia Yeh | 2015-03-19 | 1 | -1/+3 |
|\ \ \ | |||||
| * | | | Camera: Fix tests per camera service interface change | Yin-Chia Yeh | 2015-03-16 | 1 | -1/+3 |
* | | | | am 4dfbc5e3: am 6a39dafe: Merge "Use extern "C" rather than BEGIN/END_DECLS." | Shawn Willden | 2015-03-19 | 2 | -4/+12 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Use extern "C" rather than BEGIN/END_DECLS. | Shawn Willden | 2015-03-18 | 2 | -4/+12 |
* | | | | am 6b5b8ba9: am 201e5555: Merge "Add KM_TAG_AUTH_TOKEN and corresponding auth... | Shawn Willden | 2015-03-19 | 2 | -6/+52 |
|\ \ \ \ | |/ / / | |||||
| * | | | Add KM_TAG_AUTH_TOKEN and corresponding auth token structure. | Shawn Willden | 2015-03-18 | 2 | -6/+52 |
* | | | | am 98bf75b4: am 0eadc764: Merge "Add error codes." | Shawn Willden | 2015-03-18 | 1 | -0/+5 |
|\ \ \ \ | |/ / / | |||||
| * | | | Add error codes. | Shawn Willden | 2015-03-11 | 1 | -0/+5 |
* | | | | Merge "initial radio HAL definition" | Eric Laurent | 2015-03-16 | 1 | -0/+298 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | initial radio HAL definition | Eric Laurent | 2015-03-10 | 1 | -0/+298 |
* | | | | am fb69cf20: am 37467e5b: Merge "Add keymaster_key_param_compare function." | Shawn Willden | 2015-03-13 | 1 | -0/+48 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge "Add keymaster_key_param_compare function." | Shawn Willden | 2015-03-12 | 1 | -0/+48 |
| |\ \ \ | |||||
| | * | | | Add keymaster_key_param_compare function. | Shawn Willden | 2015-03-04 | 1 | -0/+48 |
| * | | | | am 17dde875: Merge "Separate keymaster0 and keymaster1 HALs." | Shawn Willden | 2015-02-26 | 4 | -192/+371 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Separate keymaster0 and keymaster1 HALs. | Shawn Willden | 2015-02-24 | 4 | -192/+371 |
* | | | | | Camera3: Add rotation field to camera3_stream_t | Yin-Chia Yeh | 2015-03-12 | 1 | -2/+50 |
* | | | | | Merge "camera2: Update HAL docs on eviction behavior." | Ruben Brunk | 2015-03-12 | 1 | -10/+115 |
|\ \ \ \ \ | |||||
| * | | | | | camera2: Update HAL docs on eviction behavior. | Ruben Brunk | 2015-03-11 | 1 | -10/+115 |
* | | | | | | Merge "Camera3: Add dataspace to camera HAL device stream configuration" | Eino-Ville Talvala | 2015-03-09 | 1 | -0/+34 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Camera3: Add dataspace to camera HAL device stream configuration | Eino-Ville Talvala | 2015-03-09 | 1 | -0/+34 |
| |/ / / / | |||||
* | | | | | Merge "Change payload size to size_t and add uid param" | Andres Morales | 2015-03-09 | 1 | -6/+7 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Change payload size to size_t and add uid param | Andres Morales | 2015-03-09 | 1 | -6/+7 |
* | | | | | camera_common: change torch status callback API | Chien-Yu Chen | 2015-02-27 | 1 | -28/+31 |
| |_|_|/ |/| | | | |||||
* | | | | Separate keymaster0 and keymaster1 HALs. | Shawn Willden | 2015-02-25 | 4 | -192/+371 |
* | | | | am 8840a683: am 587d8313: am 4f5949b5: Merge "Clarify the meaning of KM_TAG_M... | Alex Klyubin | 2015-02-24 | 1 | -1/+1 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | am 4f5949b5: Merge "Clarify the meaning of KM_TAG_MAC_LENGTH." | Alex Klyubin | 2015-02-24 | 1 | -1/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Clarify the meaning of KM_TAG_MAC_LENGTH. | Alex Klyubin | 2015-02-20 | 1 | -1/+1 |
| * | | | Merge commit 'd7cc04b275ea6d1cec863159327281b0ffbc8120' into HEAD | Bill Yi | 2015-02-19 | 9 | -44/+156 |
| |\ \ \ | | |/ / | |/| | | |||||
* | | | | Merge "Add input HAL header." | Michael Wright | 2015-02-23 | 1 | -0/+176 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Add input HAL header. | Michael Wright | 2015-02-23 | 1 | -0/+176 |
* | | | | Merge "camera_common: add -EUSERS to set_torch_mode" | Chien-Yu Chen | 2015-02-19 | 1 | -4/+6 |
|\ \ \ \ | |||||
| * | | | | camera_common: add -EUSERS to set_torch_mode | Chien-Yu Chen | 2015-02-12 | 1 | -4/+6 |
* | | | | | am 66b7b389: am 0e5fca1c: Merge changes Id4bdfdcb,Ib94f3606 | Shawn Willden | 2015-02-18 | 2 | -14/+29 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | am 0e5fca1c: Merge changes Id4bdfdcb,Ib94f3606 | Shawn Willden | 2015-02-18 | 2 | -14/+29 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge changes Id4bdfdcb,Ib94f3606 | Shawn Willden | 2015-02-18 | 2 | -14/+29 |
| | |\ \ \ \ | |||||
| | | * | | | | Added insecure (chunkless) AEAD option. | Shawn Willden | 2015-02-10 | 2 | -10/+13 |
| | | * | | | | Add additional param lists to update and finish. | Shawn Willden | 2015-02-09 | 1 | -5/+17 |
| | * | | | | | Merge "Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA" | Shawn Willden | 2015-02-18 | 1 | -2/+2 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA | Shawn Willden | 2015-02-09 | 1 | -2/+2 |
| * | | | | | | Merge "Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA" into lmp-mr1-... | Shawn Willden | 2015-02-18 | 1 | -2/+2 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| | * | | | | | Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA | Shawn Willden | 2015-02-17 | 1 | -2/+2 |
* | | | | | | | Merge "Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA" | Shawn Willden | 2015-02-18 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA | Shawn Willden | 2015-02-17 | 1 | -2/+2 |
| | |_|_|_|_|/ | |/| | | | | |