summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | Remove "required" label from DSA algorithm.Shawn Willden2015-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I088e6094ec56f434356d11ab2032b1a5b1223334
* | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add TORCH_MODE_STATUS_OFF for the case when HAL has to turn off the torch mode that was turned on by a previous set_torch_mode() call in order to turn on the torch mode for the current set_torch_mode() call. Bug: 2682206 Change-Id: Ia2f717ffaca8c4346ec5fcdf73895160f700f067
* | | | | | | am 9da1cb51: am f3391a93: Merge changes I4ef53a09,I7c3c5bd5Shawn Willden2015-02-022-35/+24
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9da1cb51c6d9ddca81213211aa5168685557a9cc': Remove get_output_size() method from keymaster HAL. Add tag to allow caller-specified nonce.
| * | | | | | am f3391a93: Merge changes I4ef53a09,I7c3c5bd5Shawn Willden2015-02-022-35/+24
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f3391a93188de86f7e15859e613faba94f65cdbc': Remove get_output_size() method from keymaster HAL. Add tag to allow caller-specified nonce.
| | * | | | | Merge changes I4ef53a09,I7c3c5bd5Shawn Willden2015-02-022-35/+24
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | * changes: Remove get_output_size() method from keymaster HAL. Add tag to allow caller-specified nonce.
| | | * | | | Remove get_output_size() method from keymaster HAL.Shawn Willden2015-02-021-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than requiring implementations to be able to predict output sizes, we'll just have the Java layer make a very conservative guess. Change-Id: I4ef53a09d122d4ecf0c80b9dadc9c7a9073561cc
| | | * | | | Add tag to allow caller-specified nonce.Shawn Willden2015-02-021-23/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7c3c5bd5f26a4d465554c998f673e0ee2ab8b86e
* | | | | | | am 3ec7c973: am d5f7dbec: audio: Add audio parameter key for device connectHaynes Mathew George2015-02-021-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '3ec7c973d134dae7e246358d92e6054de911d7b8': audio: Add audio parameter key for device connect
| * | | | | | am d5f7dbec: audio: Add audio parameter key for device connectHaynes Mathew George2015-02-021-0/+1
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | * commit 'd5f7dbec0cac2d0e638025e43f8fb0d611d22bfa': audio: Add audio parameter key for device connect
| | * | | | | audio: Add audio parameter key for device connectHaynes Mathew George2015-01-311-0/+1
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add audio parameter key for device connect. Bug: 17785277 Bug: 19214836 Change-Id: Icd81702634e0bd83645d89c2d65e2b303fc11f8c (cherry picked from commit 55c07c3418a3bc19a72c4935d8ed57a57074c49a)
* | | | | | am cb37e73b: am ee844515: Merge "Fix "error: \'strlen\' was not declared in ↵Elliott Hughes2015-01-311-0/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this scope"." * commit 'cb37e73bb023ca97048a8c4b0155ce6397f84e10': Fix "error: 'strlen' was not declared in this scope".
| * | | | | am ee844515: Merge "Fix "error: \'strlen\' was not declared in this scope"."Elliott Hughes2015-01-311-0/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit 'ee84451582a1ccf3a177726f2848b64670c88437': Fix "error: 'strlen' was not declared in this scope".
| | * | | | 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
| | |/ / / | | | | | | | | | | | | | | | Change-Id: I8ae39a6b3cf4844429e6211b3c909c6f72978832
* | | | | Merge "hardware keyguard HAL"Andres Morales2015-01-311-0/+92
|\ \ \ \ \
| * | | | | hardware keyguard HALAndres Morales2015-01-301-0/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simple API for signing/verifying passwords with a hardware-backed keyguard Change-Id: Ib2e25c7419e113494c2b0a4579ce8264a2335e07
* | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add necessary metadata to the camera_info structure to allow the camera service to determine which devices can be safely opened and used simultaneously without attempting to open camera devices. Change-Id: I4250b4c7e1296ebf4cab07355d6d3be01f17ba1e
* | | | | | | am 06b402dd: am ac41815a: Merge "Add missing includes."Elliott Hughes2015-01-307-1/+8
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | * commit '06b402dd10f6d6d0e2ee0127e9254d0bd7f480fe': Add missing includes.
| * | | | | | am ac41815a: Merge "Add missing includes."Elliott Hughes2015-01-307-1/+8
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | * commit 'ac41815a99763b3e59d0f2f9ef2bb3e5a2011336': Add missing includes.
| | * | | | | Merge "Add missing includes."Elliott Hughes2015-01-307-1/+8
| | |\ \ \ \ \
| | | * | | | | Add missing includes.Elliott Hughes2015-01-297-1/+8
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I91730363386dae6ecb2193ec8f50ba9f8fc0ad60
* | | | | | | camera3: update reprocessing specZhijun He2015-01-292-4/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also bump the HAL version to 3.3 for reprocessing spec update Change-Id: I37eda90970eace23c42ba9106d4db1587df8d1b4
* | | | | | | am 2a96edc3: am b2bc0e51: camera3: update ZSL specZhijun He2015-01-291-31/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '2a96edc36ae1f21bf13842f790c265b134d6e903': camera3: update ZSL spec
| * | | | | | am b2bc0e51: camera3: update ZSL specZhijun He2015-01-291-31/+2
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | * commit 'b2bc0e518278b228d8b4c6bd324f04237feb92c3': camera3: update ZSL spec
| | * | | | | camera3: update ZSL specZhijun He2015-01-291-31/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | INPUT stream is not used by framework-implemented ZSL (HAL3.2), the sample use case description is incorrect. Bug: 19197776 Change-Id: I247ad8755b2197c2a62cc109c151749b42a4bd49
* | | | | | | am 588f7259: am f4530d6e: Merge "Add missing includes."Elliott Hughes2015-01-292-2/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '588f725985ef0757dcf3e1257471b9c91dd4f106': Add missing includes.
| * | | | | | am f4530d6e: Merge "Add missing includes."Elliott Hughes2015-01-292-2/+4
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * commit 'f4530d6eed5fa432fe9283355a265a38aea58bc6': Add missing includes.
| | * | | | | Merge "Add missing includes."Elliott Hughes2015-01-292-2/+4
| | |\ \ \ \ \
| | | * | | | | Add missing includes.Elliott Hughes2015-01-282-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia74cceea707e51195a570eed37d4b334ac413773
* | | | | | | | am fb823c7f: am 1e541c22: Merge changes I85f430fb,I514a136bShawn Willden2015-01-292-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fb823c7f6e34973fbfbee788b2ed658dc4544742': Remove extraneous 'const' on rescope. Rename KM_ERROR_UNSUPPORTED_TAG_LENGTH to KM_ERROR_UNSUPPORTED_MAC_LENGTH.
| * | | | | | | am 1e541c22: Merge changes I85f430fb,I514a136bShawn Willden2015-01-292-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1e541c22d3552b116f0ab3e3a826f458b2821673': Remove extraneous 'const' on rescope. Rename KM_ERROR_UNSUPPORTED_TAG_LENGTH to KM_ERROR_UNSUPPORTED_MAC_LENGTH.
| | * | | | | | Merge changes I85f430fb,I514a136bShawn Willden2015-01-292-2/+2
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Remove extraneous 'const' on rescope. Rename KM_ERROR_UNSUPPORTED_TAG_LENGTH to KM_ERROR_UNSUPPORTED_MAC_LENGTH.
| | | * | | | | | Remove extraneous 'const' on rescope.Shawn Willden2015-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I85f430fb902fad75f7ce272ac5ab420f212a133c
| | | * | | | | | Rename KM_ERROR_UNSUPPORTED_TAG_LENGTH toShawn Willden2015-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KM_ERROR_UNSUPPORTED_MAC_LENGTH. Change-Id: I514a136b5cbdb1ab1df67d44a22d68a09427a711
* | | | | | | | | am 9e9fa066: am 1309477b: Merge "Add missing "const" on add_rng_entropy ↵Shawn Willden2015-01-291-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | / / / | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | argument." * commit '9e9fa066345fd3c17a995f447f07495a0f1eeb13': Add missing "const" on add_rng_entropy argument.
| * | | | | | | am 1309477b: Merge "Add missing "const" on add_rng_entropy argument."Shawn Willden2015-01-291-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '1309477bdaaecc35b468f00045d9b1d005dde377': Add missing "const" on add_rng_entropy argument.
| | * | | | | | Merge "Add missing "const" on add_rng_entropy argument."Shawn Willden2015-01-291-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | / / / / | | | |/ / / / | | |/| | | |
| | | * | | | Add missing "const" on add_rng_entropy argument.Shawn Willden2015-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I584feed0f89f4342e94cc83e165904c78687f610
* | | | | | | am c9832229: am 7b8e44f5: Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-01-261-3/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'c98322296c13617c911cc66f4578aa5daf08aadb': Remove superfluous OpenSSL include paths.
| * | | | | | am 7b8e44f5: Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-01-261-3/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '7b8e44f511fdb5bd2730e29cc88f72305cf7ab16': Remove superfluous OpenSSL include paths.
| | * | | | | Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-01-261-3/+0
| | |\ \ \ \ \
| | | * | | | | Remove superfluous OpenSSL include paths.Adam Langley2015-01-221-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The libcrypto and libssl modules (and their respective static and host versions) use LOCAL_EXPORT_C_INCLUDE_DIRS thus just including the module is sufficient. Change-Id: I9030a3747b8a1f18acd0308746cb2f63d4123f8b
* | | | | | | | am e1d15dda: am 79c255ad: Merge "Change per-boot tag and remove rescope auth ↵Shawn Willden2015-01-241-9/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timeout tag." * commit 'e1d15dda2a6a34215d4ee3d2f070270d787bf7cd': Change per-boot tag and remove rescope auth timeout tag.
| * | | | | | | am 79c255ad: Merge "Change per-boot tag and remove rescope auth timeout tag."Shawn Willden2015-01-231-9/+5
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '79c255ade3ed7ab00db8041dbf7e2a171cbc32b0': Change per-boot tag and remove rescope auth timeout tag.
| | * | | | | | Merge "Change per-boot tag and remove rescope auth timeout tag."Shawn Willden2015-01-231-9/+5
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| / / / / | | | |/ / / /
| | | * | | | Change per-boot tag and remove rescope auth timeout tag.Shawn Willden2015-01-231-9/+5
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the boolean KM_TAG_SINGLE_USE_PER_BOOT to an integer-valued KM_TAG_USES_PER_BOOT. This makes it more flexible without changing implementation complexity. Remove KM_TAG_RESCOPE_AUTH_TIMEOUT because there's no clear use case and it seems unnecessarily complex. Change-Id: Iad1512f5cc80f517e5ea7622288179c162bed2ad
* | | | | | Merge "camera: update HAL module API for external camera"Zhijun He2015-01-231-28/+101
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | camera: update HAL module API for external cameraZhijun He2015-01-231-28/+101
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Update camera module API 2.4 for usb camera support. Change-Id: Id8329e31ad0622bdc06c60e87e97c742a9719b3b