OSDN Git Service
Chien-Yu Chen [Wed, 11 Feb 2015 19:31:12 +0000 (11:31 -0800)]
camera_common: add -EUSERS to set_torch_mode
To match the public API, seperate camera device in use and other
resources in use errors.
Bug:
2682206
Change-Id: Ie0451931f0c84fc65f3f6294a9f44bec10627afe
Nick Vaccaro [Wed, 11 Feb 2015 02:55:24 +0000 (02:55 +0000)]
am
4c2059d8: am
adbfbb74: Add new SENSOR_TYPE_WRIST_TILT_GESTURE sensor type
* commit '
4c2059d8fbefad3d3f3c37079819ea8205809b17':
Add new SENSOR_TYPE_WRIST_TILT_GESTURE sensor type
Nick Vaccaro [Wed, 11 Feb 2015 00:20:54 +0000 (00:20 +0000)]
am
adbfbb74: Add new SENSOR_TYPE_WRIST_TILT_GESTURE sensor type
* commit '
adbfbb747de9fe1efc21fc83f6591e7d13c81c36':
Add new SENSOR_TYPE_WRIST_TILT_GESTURE sensor type
Nick Vaccaro [Tue, 13 Jan 2015 20:14:28 +0000 (12:14 -0800)]
Add new SENSOR_TYPE_WRIST_TILT_GESTURE sensor type
Adds a new sensor type for converting the Android Wear defined wrist
tilt sensor type into an official android sensor type.
Change-Id: If6357aeb463a556a68a19b28931edec04f99a952
Lajos Molnar [Wed, 4 Feb 2015 18:58:19 +0000 (18:58 +0000)]
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
Lajos Molnar [Wed, 4 Feb 2015 15:49:31 +0000 (15:49 +0000)]
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
Lajos Molnar [Wed, 4 Feb 2015 07:18:02 +0000 (07:18 +0000)]
Merge "gralloc: clarify lock_ycbcr in light of multimedia codec usage" into lmp-mr1-dev
Yin-Chia Yeh [Tue, 3 Feb 2015 23:40:11 +0000 (23:40 +0000)]
Merge "Camera: modify test per framework interface change"
Yin-Chia Yeh [Tue, 3 Feb 2015 00:20:46 +0000 (16:20 -0800)]
Camera: modify test per framework interface change
Wrap camera_module_t by CameraModule to follow
framework interface change.
Change-Id: Ief423a1571cf06c7ef80b98b403a33969baf95f6
Shawn Willden [Tue, 3 Feb 2015 20:47:53 +0000 (20:47 +0000)]
am
efbc9f6d: am
949d6d4b: Merge changes I38700cda,I088e6094
* commit '
efbc9f6d0b6cbf890ee894ee66f2a6f8308c1766':
Add raw key format, for symmetric key import.
Remove "required" label from DSA algorithm.
Shawn Willden [Tue, 3 Feb 2015 20:41:29 +0000 (20:41 +0000)]
am
949d6d4b: Merge changes I38700cda,I088e6094
* commit '
949d6d4bfc1cf37a84d5d4ac00a20017941fdeba':
Add raw key format, for symmetric key import.
Remove "required" label from DSA algorithm.
Shawn Willden [Tue, 3 Feb 2015 20:30:05 +0000 (20:30 +0000)]
Merge changes I38700cda,I088e6094
* changes:
Add raw key format, for symmetric key import.
Remove "required" label from DSA algorithm.
Chien-Yu Chen [Tue, 3 Feb 2015 18:27:53 +0000 (18:27 +0000)]
Merge "camera_common: add TORCH_MODE_STATUS_OFF"
Shawn Willden [Tue, 3 Feb 2015 18:12:20 +0000 (11:12 -0700)]
Add raw key format, for symmetric key import.
Change-Id: I38700cdafcf1f244584d6e88f8d9540c70a7de56
Shawn Willden [Tue, 3 Feb 2015 18:10:48 +0000 (11:10 -0700)]
Remove "required" label from DSA algorithm.
Change-Id: I088e6094ec56f434356d11ab2032b1a5b1223334
Shawn Willden [Mon, 2 Feb 2015 23:43:51 +0000 (23:43 +0000)]
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.
Shawn Willden [Mon, 2 Feb 2015 23:39:20 +0000 (23:39 +0000)]
am
f3391a93: Merge changes I4ef53a09,I7c3c5bd5
* commit '
f3391a93188de86f7e15859e613faba94f65cdbc':
Remove get_output_size() method from keymaster HAL.
Add tag to allow caller-specified nonce.
Shawn Willden [Mon, 2 Feb 2015 23:19:31 +0000 (23:19 +0000)]
Merge changes I4ef53a09,I7c3c5bd5
* changes:
Remove get_output_size() method from keymaster HAL.
Add tag to allow caller-specified nonce.
Shawn Willden [Mon, 2 Feb 2015 18:50:57 +0000 (11:50 -0700)]
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
Shawn Willden [Fri, 30 Jan 2015 13:23:26 +0000 (06:23 -0700)]
Add tag to allow caller-specified nonce.
Change-Id: I7c3c5bd5f26a4d465554c998f673e0ee2ab8b86e
Haynes Mathew George [Mon, 2 Feb 2015 15:37:02 +0000 (15:37 +0000)]
am
3ec7c973: am
d5f7dbec: audio: Add audio parameter key for device connect
* commit '
3ec7c973d134dae7e246358d92e6054de911d7b8':
audio: Add audio parameter key for device connect
Haynes Mathew George [Mon, 2 Feb 2015 15:29:58 +0000 (15:29 +0000)]
am
d5f7dbec: audio: Add audio parameter key for device connect
* commit '
d5f7dbec0cac2d0e638025e43f8fb0d611d22bfa':
audio: Add audio parameter key for device connect
Elliott Hughes [Sat, 31 Jan 2015 08:33:58 +0000 (08:33 +0000)]
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".
Elliott Hughes [Sat, 31 Jan 2015 07:49:22 +0000 (07:49 +0000)]
am
ee844515: Merge "Fix "error: \'strlen\' was not declared in this scope"."
* commit '
ee84451582a1ccf3a177726f2848b64670c88437':
Fix "error: 'strlen' was not declared in this scope".
Elliott Hughes [Sat, 31 Jan 2015 04:41:51 +0000 (04:41 +0000)]
Merge "Fix "error: 'strlen' was not declared in this scope"."
Elliott Hughes [Sat, 31 Jan 2015 04:40:50 +0000 (20:40 -0800)]
Fix "error: 'strlen' was not declared in this scope".
Change-Id: I8ae39a6b3cf4844429e6211b3c909c6f72978832
Haynes Mathew George [Thu, 25 Sep 2014 02:10:12 +0000 (19:10 -0700)]
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)
Andres Morales [Sat, 31 Jan 2015 00:08:56 +0000 (00:08 +0000)]
Merge "hardware keyguard HAL"
Ruben Brunk [Fri, 30 Jan 2015 22:59:39 +0000 (22:59 +0000)]
Merge "camera HAL: Update camera_info with simultaneous access information."
Elliott Hughes [Fri, 30 Jan 2015 21:28:00 +0000 (21:28 +0000)]
am
06b402dd: am
ac41815a: Merge "Add missing includes."
* commit '
06b402dd10f6d6d0e2ee0127e9254d0bd7f480fe':
Add missing includes.
Elliott Hughes [Fri, 30 Jan 2015 21:16:31 +0000 (21:16 +0000)]
am
ac41815a: Merge "Add missing includes."
* commit '
ac41815a99763b3e59d0f2f9ef2bb3e5a2011336':
Add missing includes.
Andres Morales [Thu, 29 Jan 2015 18:53:19 +0000 (10:53 -0800)]
hardware keyguard HAL
simple API for signing/verifying passwords
with a hardware-backed keyguard
Change-Id: Ib2e25c7419e113494c2b0a4579ce8264a2335e07
Lajos Molnar [Fri, 30 Jan 2015 19:01:47 +0000 (11:01 -0800)]
gralloc: clarify lock_ycbcr in light of multimedia codec usage
Bug:
19179927
Change-Id: I53886f8d1a3a998b958f031b04ddd4cbf19aad2c
Elliott Hughes [Fri, 30 Jan 2015 06:25:47 +0000 (06:25 +0000)]
Merge "Add missing includes."
Elliott Hughes [Fri, 30 Jan 2015 05:19:10 +0000 (21:19 -0800)]
Add missing includes.
Change-Id: I91730363386dae6ecb2193ec8f50ba9f8fc0ad60
Zhijun He [Sat, 17 Jan 2015 00:44:40 +0000 (16:44 -0800)]
camera3: update reprocessing spec
Also bump the HAL version to 3.3 for reprocessing spec update
Change-Id: I37eda90970eace23c42ba9106d4db1587df8d1b4
Chien-Yu Chen [Thu, 29 Jan 2015 23:12:47 +0000 (15:12 -0800)]
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
Ruben Brunk [Fri, 16 Jan 2015 22:29:21 +0000 (14:29 -0800)]
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
Zhijun He [Thu, 29 Jan 2015 23:57:02 +0000 (23:57 +0000)]
am
2a96edc3: am
b2bc0e51: camera3: update ZSL spec
* commit '
2a96edc36ae1f21bf13842f790c265b134d6e903':
camera3: update ZSL spec
Zhijun He [Thu, 29 Jan 2015 23:49:04 +0000 (23:49 +0000)]
am
b2bc0e51: camera3: update ZSL spec
* commit '
b2bc0e518278b228d8b4c6bd324f04237feb92c3':
camera3: update ZSL spec
Zhijun He [Thu, 29 Jan 2015 22:44:37 +0000 (14:44 -0800)]
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
Elliott Hughes [Thu, 29 Jan 2015 17:22:55 +0000 (17:22 +0000)]
am
588f7259: am
f4530d6e: Merge "Add missing includes."
* commit '
588f725985ef0757dcf3e1257471b9c91dd4f106':
Add missing includes.
Shawn Willden [Thu, 29 Jan 2015 17:21:35 +0000 (17:21 +0000)]
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.
Shawn Willden [Thu, 29 Jan 2015 17:21:35 +0000 (17:21 +0000)]
am
9e9fa066: am
1309477b: Merge "Add missing "const" on add_rng_entropy argument."
* commit '
9e9fa066345fd3c17a995f447f07495a0f1eeb13':
Add missing "const" on add_rng_entropy argument.
Elliott Hughes [Thu, 29 Jan 2015 05:21:41 +0000 (05:21 +0000)]
am
f4530d6e: Merge "Add missing includes."
* commit '
f4530d6eed5fa432fe9283355a265a38aea58bc6':
Add missing includes.
Elliott Hughes [Thu, 29 Jan 2015 04:59:25 +0000 (04:59 +0000)]
Merge "Add missing includes."
Elliott Hughes [Thu, 29 Jan 2015 03:54:13 +0000 (19:54 -0800)]
Add missing includes.
Change-Id: Ia74cceea707e51195a570eed37d4b334ac413773
Shawn Willden [Thu, 29 Jan 2015 01:00:58 +0000 (01:00 +0000)]
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.
Shawn Willden [Thu, 29 Jan 2015 01:00:57 +0000 (01:00 +0000)]
am
1309477b: Merge "Add missing "const" on add_rng_entropy argument."
* commit '
1309477bdaaecc35b468f00045d9b1d005dde377':
Add missing "const" on add_rng_entropy argument.
Shawn Willden [Thu, 29 Jan 2015 00:45:57 +0000 (00:45 +0000)]
Merge changes I85f430fb,I514a136b
* changes:
Remove extraneous 'const' on rescope.
Rename KM_ERROR_UNSUPPORTED_TAG_LENGTH to KM_ERROR_UNSUPPORTED_MAC_LENGTH.
Shawn Willden [Thu, 29 Jan 2015 00:44:56 +0000 (00:44 +0000)]
Merge "Add missing "const" on add_rng_entropy argument."
Shawn Willden [Mon, 26 Jan 2015 23:19:49 +0000 (16:19 -0700)]
Remove extraneous 'const' on rescope.
Change-Id: I85f430fb902fad75f7ce272ac5ab420f212a133c
Shawn Willden [Mon, 26 Jan 2015 20:04:28 +0000 (13:04 -0700)]
Rename KM_ERROR_UNSUPPORTED_TAG_LENGTH to
KM_ERROR_UNSUPPORTED_MAC_LENGTH.
Change-Id: I514a136b5cbdb1ab1df67d44a22d68a09427a711
Shawn Willden [Mon, 26 Jan 2015 20:03:58 +0000 (13:03 -0700)]
Add missing "const" on add_rng_entropy argument.
Change-Id: I584feed0f89f4342e94cc83e165904c78687f610
Kenny Root [Mon, 26 Jan 2015 19:17:35 +0000 (19:17 +0000)]
am
c9832229: am
7b8e44f5: Merge "Remove superfluous OpenSSL include paths."
* commit '
c98322296c13617c911cc66f4578aa5daf08aadb':
Remove superfluous OpenSSL include paths.
Kenny Root [Mon, 26 Jan 2015 19:12:19 +0000 (19:12 +0000)]
am
7b8e44f5: Merge "Remove superfluous OpenSSL include paths."
* commit '
7b8e44f511fdb5bd2730e29cc88f72305cf7ab16':
Remove superfluous OpenSSL include paths.
Kenny Root [Mon, 26 Jan 2015 18:52:53 +0000 (18:52 +0000)]
Merge "Remove superfluous OpenSSL include paths."
Shawn Willden [Sat, 24 Jan 2015 16:57:19 +0000 (16:57 +0000)]
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.
Zhijun He [Fri, 23 Jan 2015 23:58:17 +0000 (23:58 +0000)]
Merge "camera: update HAL module API for external camera"
Zhijun He [Mon, 12 Jan 2015 22:45:33 +0000 (14:45 -0800)]
camera: update HAL module API for external camera
Update camera module API 2.4 for usb camera support.
Change-Id: Id8329e31ad0622bdc06c60e87e97c742a9719b3b
Shawn Willden [Fri, 23 Jan 2015 22:21:44 +0000 (22:21 +0000)]
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.
Shawn Willden [Fri, 23 Jan 2015 22:04:53 +0000 (22:04 +0000)]
Merge "Change per-boot tag and remove rescope auth timeout tag."
Shawn Willden [Fri, 23 Jan 2015 08:01:21 +0000 (01:01 -0700)]
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
Adam Langley [Fri, 23 Jan 2015 01:16:01 +0000 (17:16 -0800)]
Remove superfluous OpenSSL include paths.
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
Shawn Willden [Thu, 22 Jan 2015 21:41:28 +0000 (21:41 +0000)]
am
bde6c2bb: am
b1a12188: Merge "Define keymaster HAL v0.4."
* commit '
bde6c2bb3fca4bc0665701ac99fa2b5b9673a6d6':
Define keymaster HAL v0.4.
Shawn Willden [Thu, 22 Jan 2015 21:36:14 +0000 (21:36 +0000)]
am
b1a12188: Merge "Define keymaster HAL v0.4."
* commit '
b1a1218845eb32564b2f7f0297096ec43b27e41b':
Define keymaster HAL v0.4.
Shawn Willden [Thu, 22 Jan 2015 21:28:56 +0000 (21:28 +0000)]
Merge "Define keymaster HAL v0.4."
Shawn Willden [Thu, 12 Jun 2014 19:48:46 +0000 (13:48 -0600)]
Define keymaster HAL v0.4.
Change-Id: I040412443bbbe25bce3d44759d710b78eac36caa
Jinsuk Kim [Mon, 19 Jan 2015 02:54:58 +0000 (02:54 +0000)]
am
1d1bf8b5: am
8b7eca86: CEC: Add a new flag for set_option
* commit '
1d1bf8b5f648abad900b16eabdfd0813e5d6a6a2':
CEC: Add a new flag for set_option
Jinsuk Kim [Mon, 19 Jan 2015 02:49:37 +0000 (02:49 +0000)]
am
8b7eca86: CEC: Add a new flag for set_option
* commit '
8b7eca867492d8a08285059492ce5697b68b5821':
CEC: Add a new flag for set_option
Jinsuk Kim [Sun, 18 Jan 2015 22:20:09 +0000 (07:20 +0900)]
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
Zhijun He [Fri, 9 Jan 2015 01:40:00 +0000 (17:40 -0800)]
usbcamera: initial implementation of default usb camera HAL
* Basic skeleton of usb camera hal implementation
* Vendor tag is not supported yet
* Further usb camera hal implementation can be filled into UsbCamera.cpp
* Hot plug thread need to be implemented
Change-Id: Ida63b6d640e32192f5b60a280d9d5106d80e523f
Chien-Yu Chen [Thu, 8 Jan 2015 19:06:38 +0000 (11:06 -0800)]
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
Paul McLean [Tue, 13 Jan 2015 17:37:06 +0000 (09:37 -0800)]
Technical Debt Paydown - move/rename files
Moved audio (alsa actually) utils files to system/core/alsa_utils.
Renamed "audio" utilities to "alsa" to better relect their purpose.
Renamed audio_hw.c -> to audio_hal. c to better reflect its purpose.
Change-Id: I67c7d47ee02abafd3e12c4c99d605a62e0f59122
Eric Laurent [Sat, 10 Jan 2015 01:13:38 +0000 (01:13 +0000)]
am
e6499429: Merge commit \'
83b47a68\' into manualmerge
* commit '
e64994292cb02fae66f04002e1121d29979503d1':
usb audio: Fix incorrect bytes returned for recording
Eric Laurent [Sat, 10 Jan 2015 01:03:27 +0000 (17:03 -0800)]
Merge commit '
83b47a68' into manualmerge
Paul McLean [Fri, 9 Jan 2015 23:11:43 +0000 (23:11 +0000)]
Merge "Multi-USB device support & read device on open."
Pavan Chikkala [Fri, 9 Jan 2015 20:21:13 +0000 (12:21 -0800)]
usb audio: Fix incorrect bytes returned for recording
In a recording session , the number of bytes read is
not updated when pcm_read() fails. This results in
silence/invalid data being added during a device switch
from USB headset to handset.
Fix is to reset the number of bytes read if pcm_read()
returns an error indicating removal of USB headset.
Bug:
18611518
Change-Id: I10d578c3cf1037c90a891e63be2bd1c2b7e6126b
Eric Laurent [Fri, 9 Jan 2015 18:04:14 +0000 (18:04 +0000)]
am
7e9abab1: am
b338957d: Merge "usbaudio: Return 0 bytes on failure in capture"
* commit '
7e9abab1940091b4c4d7589160855870fdda437e':
usbaudio: Return 0 bytes on failure in capture
Eric Laurent [Fri, 9 Jan 2015 17:58:33 +0000 (17:58 +0000)]
am
b338957d: Merge "usbaudio: Return 0 bytes on failure in capture"
* commit '
b338957d02528e5b51a15c5ce21e96fad4ff4a6f':
usbaudio: Return 0 bytes on failure in capture
Eric Laurent [Fri, 9 Jan 2015 17:49:31 +0000 (17:49 +0000)]
Merge "usbaudio: Return 0 bytes on failure in capture"
Viswanath L [Fri, 31 Oct 2014 07:37:39 +0000 (13:07 +0530)]
usbaudio: Return 0 bytes on failure in capture
Return 0 bytes from in_read() in failure conditions so that invalid
data is not recorded.
Change-Id: I9a6294e4162fa642fd7e160a32d1ad16f255ff62
Paul McLean [Tue, 2 Dec 2014 19:36:45 +0000 (12:36 -0700)]
Multi-USB device support & read device on open.
Change-Id: I8b6dd33be1915db764eeaefec5a5da1e9d02dc87
Glenn Kasten [Tue, 30 Dec 2014 18:53:00 +0000 (18:53 +0000)]
Merge "Line length 100"
Glenn Kasten [Tue, 30 Dec 2014 16:32:04 +0000 (08:32 -0800)]
Line length 100
Change-Id: Iaef5bcaec19a9e383432c8c8460bcdf1115f1072
Elliott Hughes [Tue, 30 Dec 2014 12:27:44 +0000 (12:27 +0000)]
am
06fcfc50: am
02e30945: Merge "Fix missing #includes in hardware/libhardware."
* commit '
06fcfc506c44724bbd8089e8971b77aa8edfdde8':
Fix missing #includes in hardware/libhardware.
Elliott Hughes [Tue, 30 Dec 2014 12:21:17 +0000 (12:21 +0000)]
am
02e30945: Merge "Fix missing #includes in hardware/libhardware."
* commit '
02e3094598ced8b05c9614d6070556d20328ef43':
Fix missing #includes in hardware/libhardware.
Elliott Hughes [Mon, 29 Dec 2014 21:17:12 +0000 (21:17 +0000)]
Merge "Fix missing #includes in hardware/libhardware."
Elliott Hughes [Mon, 29 Dec 2014 20:59:11 +0000 (12:59 -0800)]
Fix missing #includes in hardware/libhardware.
Change-Id: If7c72054bf79b89c3d7a544956da671c3b404269
soon1.choi [Thu, 18 Dec 2014 23:22:09 +0000 (23:22 +0000)]
am
7b30900d: (-s ours) am
781bb3f7: DO NOT MERGE - fix: memory leak
* commit '
7b30900df70f34cb24c676e458c322ba9e8525d6':
DO NOT MERGE - fix: memory leak
Eric Laurent [Thu, 18 Dec 2014 23:21:51 +0000 (23:21 +0000)]
am
68be24b1: am
ce0bbb97: Merge "fix: memory leak"
* commit '
68be24b1cc2bad01d9257f76faabd92dbfc6c3e8':
fix: memory leak
soon1.choi [Thu, 18 Dec 2014 21:58:40 +0000 (21:58 +0000)]
am
781bb3f7: DO NOT MERGE - fix: memory leak
* commit '
781bb3f72e2706f07ee8bcc0c140201faf07c35c':
DO NOT MERGE - fix: memory leak
Eric Laurent [Thu, 18 Dec 2014 21:50:36 +0000 (21:50 +0000)]
am
ce0bbb97: Merge "fix: memory leak"
* commit '
ce0bbb97c12b712b75d0df42ce2f6e3f35d8db72':
fix: memory leak
soon1.choi [Thu, 18 Dec 2014 07:03:43 +0000 (16:03 +0900)]
DO NOT MERGE - fix: memory leak
free momory for str_parms to prevent memory leak.
cherry-pcik from aosp
c357157e28dc0ffd069b80aeba9bf8b9eed72c9a
Bug:
18798194.
Change-Id: I7df5567d665554dbd4646c881f0f48b0c568c5fe
Eric Laurent [Thu, 18 Dec 2014 16:42:10 +0000 (16:42 +0000)]
Merge "fix: memory leak"
soon1.choi [Thu, 18 Dec 2014 07:03:43 +0000 (16:03 +0900)]
fix: memory leak
free momory for str_parms to prevent memory leak.
Change-Id: I7df5567d665554dbd4646c881f0f48b0c568c5fe
Jinsuk Kim [Wed, 17 Dec 2014 21:31:28 +0000 (21:31 +0000)]
am
981a952c: am
4b280b0c: CEC: Add a parameter port ID to set_audio_return_channel
* commit '
981a952c5f182727ec306b4e194c50792b303667':
CEC: Add a parameter port ID to set_audio_return_channel
Jinsuk Kim [Wed, 17 Dec 2014 21:24:45 +0000 (21:24 +0000)]
am
4b280b0c: CEC: Add a parameter port ID to set_audio_return_channel
* commit '
4b280b0cd07a380feb4653b911ddcb3a31e73797':
CEC: Add a parameter port ID to set_audio_return_channel
Jinsuk Kim [Wed, 17 Dec 2014 07:22:54 +0000 (16:22 +0900)]
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
Dan Albert [Wed, 17 Dec 2014 02:48:22 +0000 (02:48 +0000)]
am
6bafdcb5: am
4f1fe2f5: Merge "Fix build in C++11 mode"
* commit '
6bafdcb5083b81d295676ee0ff75f62b31214150':
Fix build in C++11 mode
OSDN Git Service
