Commit graph

794 commits

Author SHA1 Message Date
Lajos Molnar
3a274b66d3 am 2c16d1e0: am a163e491: Merge "gralloc: clarify lock_ycbcr in light of multimedia codec usage" into lmp-mr1-dev
* commit '2c16d1e07d4600f78f40d16137c16c3160a3fdef':
  gralloc: clarify lock_ycbcr in light of multimedia codec usage
2015-02-04 18:58:19 +00:00
Lajos Molnar
2c16d1e07d am a163e491: Merge "gralloc: clarify lock_ycbcr in light of multimedia codec usage" into lmp-mr1-dev
* commit 'a163e491c148468884520d6d331a0f6d19104677':
  gralloc: clarify lock_ycbcr in light of multimedia codec usage
2015-02-04 15:49:31 +00:00
Lajos Molnar
a163e491c1 Merge "gralloc: clarify lock_ycbcr in light of multimedia codec usage" into lmp-mr1-dev 2015-02-04 07:18:04 +00:00
Shawn Willden
26581a4008 am efbc9f6d: am 949d6d4b: Merge changes I38700cda,I088e6094
* commit 'efbc9f6d0b6cbf890ee894ee66f2a6f8308c1766':
  Add raw key format, for symmetric key import.
  Remove "required" label from DSA algorithm.
2015-02-03 20:47:53 +00:00
Shawn Willden
efbc9f6d0b am 949d6d4b: Merge changes I38700cda,I088e6094
* commit '949d6d4bfc1cf37a84d5d4ac00a20017941fdeba':
  Add raw key format, for symmetric key import.
  Remove "required" label from DSA algorithm.
2015-02-03 20:41:29 +00:00
Shawn Willden
949d6d4bfc Merge changes I38700cda,I088e6094
* changes:
  Add raw key format, for symmetric key import.
  Remove "required" label from DSA algorithm.
2015-02-03 20:30:05 +00:00
Chien-Yu Chen
a40a7cebcd Merge "camera_common: add TORCH_MODE_STATUS_OFF" 2015-02-03 18:27:54 +00:00
Shawn Willden
e1b7636ca1 Add raw key format, for symmetric key import.
Change-Id: I38700cdafcf1f244584d6e88f8d9540c70a7de56
2015-02-03 11:12:20 -07:00
Shawn Willden
f7745ac27e Remove "required" label from DSA algorithm.
Change-Id: I088e6094ec56f434356d11ab2032b1a5b1223334
2015-02-03 11:10:48 -07:00
Shawn Willden
901349a66b am 9da1cb51: am f3391a93: Merge changes I4ef53a09,I7c3c5bd5
* commit '9da1cb51c6d9ddca81213211aa5168685557a9cc':
  Remove get_output_size() method from keymaster HAL.
  Add tag to allow caller-specified nonce.
2015-02-02 23:43:51 +00:00
Shawn Willden
9da1cb51c6 am f3391a93: Merge changes I4ef53a09,I7c3c5bd5
* commit 'f3391a93188de86f7e15859e613faba94f65cdbc':
  Remove get_output_size() method from keymaster HAL.
  Add tag to allow caller-specified nonce.
2015-02-02 23:39:20 +00:00
Shawn Willden
f3391a9318 Merge changes I4ef53a09,I7c3c5bd5
* changes:
  Remove get_output_size() method from keymaster HAL.
  Add tag to allow caller-specified nonce.
2015-02-02 23:19:32 +00:00
Shawn Willden
e57b65c454 Remove get_output_size() method from keymaster HAL.
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
2015-02-02 11:52:36 -07:00
Shawn Willden
41e91e9fa3 Add tag to allow caller-specified nonce.
Change-Id: I7c3c5bd5f26a4d465554c998f673e0ee2ab8b86e
2015-02-02 11:52:14 -07:00
Haynes Mathew George
a4d1653900 am 3ec7c973: am d5f7dbec: audio: Add audio parameter key for device connect
* commit '3ec7c973d134dae7e246358d92e6054de911d7b8':
  audio: Add audio parameter key for device connect
2015-02-02 15:37:02 +00:00
Haynes Mathew George
3ec7c973d1 am d5f7dbec: audio: Add audio parameter key for device connect
* commit 'd5f7dbec0cac2d0e638025e43f8fb0d611d22bfa':
  audio: Add audio parameter key for device connect
2015-02-02 15:29:58 +00:00
Elliott Hughes
0baa8dae5e am cb37e73b: am ee844515: Merge "Fix "error: \'strlen\' was not declared in this scope"."
* commit 'cb37e73bb023ca97048a8c4b0155ce6397f84e10':
  Fix "error: 'strlen' was not declared in this scope".
2015-01-31 08:33:58 +00:00
Elliott Hughes
cb37e73bb0 am ee844515: Merge "Fix "error: \'strlen\' was not declared in this scope"."
* commit 'ee84451582a1ccf3a177726f2848b64670c88437':
  Fix "error: 'strlen' was not declared in this scope".
2015-01-31 07:49:22 +00:00
Elliott Hughes
360956c4b0 Fix "error: 'strlen' was not declared in this scope".
Change-Id: I8ae39a6b3cf4844429e6211b3c909c6f72978832
2015-01-30 20:40:50 -08:00
Haynes Mathew George
d5f7dbec0c audio: Add audio parameter key for device connect
Add audio parameter key for device connect.

Bug: 17785277
Bug: 19214836
Change-Id: Icd81702634e0bd83645d89c2d65e2b303fc11f8c
(cherry picked from commit 55c07c3418a3bc19a72c4935d8ed57a57074c49a)
2015-01-31 01:42:31 +00:00
Andres Morales
4fc22e94c9 Merge "hardware keyguard HAL" 2015-01-31 00:08:57 +00:00
Ruben Brunk
c65319643a Merge "camera HAL: Update camera_info with simultaneous access information." 2015-01-30 22:59:40 +00:00
Andres Morales
3b48ae5a64 hardware keyguard HAL
simple API for signing/verifying passwords
with a hardware-backed keyguard

Change-Id: Ib2e25c7419e113494c2b0a4579ce8264a2335e07
2015-01-30 12:18:10 -08:00
Lajos Molnar
811677e68d gralloc: clarify lock_ycbcr in light of multimedia codec usage
Bug: 19179927
Change-Id: I53886f8d1a3a998b958f031b04ddd4cbf19aad2c
2015-01-30 11:02:58 -08:00
Zhijun He
ebdf1286e7 camera3: update reprocessing spec
Also bump the HAL version to 3.3 for reprocessing spec update

Change-Id: I37eda90970eace23c42ba9106d4db1587df8d1b4
2015-01-29 16:42:23 -08:00
Chien-Yu Chen
46edf1ac47 camera_common: add TORCH_MODE_STATUS_OFF
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
2015-01-29 16:26:24 -08:00
Ruben Brunk
0388bcd7b3 camera HAL: Update camera_info with simultaneous access information.
- 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
2015-01-29 16:17:37 -08:00
Zhijun He
b1a0d14cc2 am 2a96edc3: am b2bc0e51: camera3: update ZSL spec
* commit '2a96edc36ae1f21bf13842f790c265b134d6e903':
  camera3: update ZSL spec
2015-01-29 23:57:02 +00:00
Zhijun He
2a96edc36a am b2bc0e51: camera3: update ZSL spec
* commit 'b2bc0e518278b228d8b4c6bd324f04237feb92c3':
  camera3: update ZSL spec
2015-01-29 23:49:04 +00:00
Zhijun He
b2bc0e5182 camera3: update ZSL spec
INPUT stream is not used by framework-implemented ZSL (HAL3.2), the sample
use case description is incorrect.

Bug: 19197776
Change-Id: I247ad8755b2197c2a62cc109c151749b42a4bd49
2015-01-29 14:44:37 -08:00
Shawn Willden
244cee7b1c am fb823c7f: am 1e541c22: Merge changes I85f430fb,I514a136b
* commit 'fb823c7f6e34973fbfbee788b2ed658dc4544742':
  Remove extraneous 'const' on rescope.
  Rename KM_ERROR_UNSUPPORTED_TAG_LENGTH to KM_ERROR_UNSUPPORTED_MAC_LENGTH.
2015-01-29 17:21:35 +00:00
Shawn Willden
5d773f3584 am 9e9fa066: am 1309477b: Merge "Add missing "const" on add_rng_entropy argument."
* commit '9e9fa066345fd3c17a995f447f07495a0f1eeb13':
  Add missing "const" on add_rng_entropy argument.
2015-01-29 17:21:35 +00:00
Shawn Willden
fb823c7f6e am 1e541c22: Merge changes I85f430fb,I514a136b
* commit '1e541c22d3552b116f0ab3e3a826f458b2821673':
  Remove extraneous 'const' on rescope.
  Rename KM_ERROR_UNSUPPORTED_TAG_LENGTH to KM_ERROR_UNSUPPORTED_MAC_LENGTH.
2015-01-29 01:00:58 +00:00
Shawn Willden
9e9fa06634 am 1309477b: Merge "Add missing "const" on add_rng_entropy argument."
* commit '1309477bdaaecc35b468f00045d9b1d005dde377':
  Add missing "const" on add_rng_entropy argument.
2015-01-29 01:00:57 +00:00
Shawn Willden
611a695c24 Remove extraneous 'const' on rescope.
Change-Id: I85f430fb902fad75f7ce272ac5ab420f212a133c
2015-01-26 16:19:49 -07:00
Shawn Willden
6b424bea80 Rename KM_ERROR_UNSUPPORTED_TAG_LENGTH to
KM_ERROR_UNSUPPORTED_MAC_LENGTH.

Change-Id: I514a136b5cbdb1ab1df67d44a22d68a09427a711
2015-01-26 13:04:28 -07:00
Shawn Willden
59d2578b52 Add missing "const" on add_rng_entropy argument.
Change-Id: I584feed0f89f4342e94cc83e165904c78687f610
2015-01-26 13:03:58 -07:00
Shawn Willden
c59d85a89f am e1d15dda: am 79c255ad: Merge "Change per-boot tag and remove rescope auth timeout tag."
* commit 'e1d15dda2a6a34215d4ee3d2f070270d787bf7cd':
  Change per-boot tag and remove rescope auth timeout tag.
2015-01-24 16:57:19 +00:00
Zhijun He
e4193b8c1c Merge "camera: update HAL module API for external camera" 2015-01-23 23:58:18 +00:00
Zhijun He
94e23b297c camera: update HAL module API for external camera
Update camera module API 2.4 for usb camera support.

Change-Id: Id8329e31ad0622bdc06c60e87e97c742a9719b3b
2015-01-23 15:37:24 -08:00
Shawn Willden
e1d15dda2a am 79c255ad: Merge "Change per-boot tag and remove rescope auth timeout tag."
* commit '79c255ade3ed7ab00db8041dbf7e2a171cbc32b0':
  Change per-boot tag and remove rescope auth timeout tag.
2015-01-23 22:21:44 +00:00
Shawn Willden
dc0007bdb4 Change per-boot tag and remove rescope auth timeout tag.
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
2015-01-23 13:47:59 -07:00
Shawn Willden
e3b89a9c43 am bde6c2bb: am b1a12188: Merge "Define keymaster HAL v0.4."
* commit 'bde6c2bb3fca4bc0665701ac99fa2b5b9673a6d6':
  Define keymaster HAL v0.4.
2015-01-22 21:41:28 +00:00
Shawn Willden
bde6c2bb3f am b1a12188: Merge "Define keymaster HAL v0.4."
* commit 'b1a1218845eb32564b2f7f0297096ec43b27e41b':
  Define keymaster HAL v0.4.
2015-01-22 21:36:14 +00:00
Shawn Willden
9d645a003b Define keymaster HAL v0.4.
Change-Id: I040412443bbbe25bce3d44759d710b78eac36caa
2015-01-22 10:54:31 -07:00
Jinsuk Kim
53e64c2cbe am 1d1bf8b5: am 8b7eca86: CEC: Add a new flag for set_option
* commit '1d1bf8b5f648abad900b16eabdfd0813e5d6a6a2':
  CEC: Add a new flag for set_option
2015-01-19 02:54:58 +00:00
Jinsuk Kim
8b7eca8674 CEC: Add a new flag for set_option
Added a flag to pass system language information to HAL so that it can
respond to <Get Menu Language> in standby mode.

Bug: 19054079

Change-Id: Iada00307202f5c9429944184b62b6456b624125a
2015-01-19 10:46:39 +09:00
Chien-Yu Chen
301591776f camera_common: add torch mode APIs for flashlight
Add torch mode APIs to support flashlight without opening any
camera devices.

Bug: 2682206
Change-Id: Ida46bb878962caf305f3e97051b15e0465fe8c02
2015-01-15 10:35:07 -08:00
Glenn Kasten
6b6f19d0a8 Line length 100
Change-Id: Iaef5bcaec19a9e383432c8c8460bcdf1115f1072
2014-12-30 08:32:04 -08:00
Jinsuk Kim
4b280b0cd0 CEC: Add a parameter port ID to set_audio_return_channel
This CL addresses the cases where TV has more than one ARC-supported
HDMI ports.

Bug: 18781204

Change-Id: I4eaeb755caf2552b826a7322d19ee671407ee43f
2014-12-17 17:35:14 +09:00