OSDN Git Service
Shawn Willden [Thu, 12 Mar 2015 01:00:04 +0000 (01:00 +0000)]
am
37467e5b: Merge "Add keymaster_key_param_compare function."
* commit '
37467e5b52a5db5dea0339d60ca1243e45e7a357':
Add keymaster_key_param_compare function.
Shawn Willden [Thu, 12 Mar 2015 00:39:24 +0000 (00:39 +0000)]
Merge "Add keymaster_key_param_compare function."
Andre Eisenbach [Thu, 5 Mar 2015 00:23:07 +0000 (00:23 +0000)]
am
a8d33714: (-s ours) DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (1/4)
* commit '
a8d337147e2e1b834511bbe13a4c4970099bdd25':
DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (1/4)
Andre Eisenbach [Fri, 5 Dec 2014 17:35:57 +0000 (09:35 -0800)]
DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (1/4)
Bug:
18508263
Change-Id: Id7b69a6ed7d817a0f048cb8ebf0889c600171926
Shawn Willden [Wed, 4 Mar 2015 17:00:38 +0000 (10:00 -0700)]
Add keymaster_key_param_compare function.
This provides a reasonable ordering for params.
Change-Id: I1e3b403070d9e7621cc55c03ff9876ea3bbc699f
Shawn Willden [Fri, 27 Feb 2015 00:43:17 +0000 (00:43 +0000)]
am
e05ffdbb: am
17dde875: Merge "Separate keymaster0 and keymaster1 HALs."
* commit '
e05ffdbb306d5e5b615a7e7a65c665010211b9b6':
Separate keymaster0 and keymaster1 HALs.
Shawn Willden [Thu, 26 Feb 2015 23:31:14 +0000 (23:31 +0000)]
am
17dde875: Merge "Separate keymaster0 and keymaster1 HALs."
* commit '
17dde875dda1b96722e6fb07850c268ca716c3d1':
Separate keymaster0 and keymaster1 HALs.
Shawn Willden [Thu, 26 Feb 2015 23:24:41 +0000 (23:24 +0000)]
Merge "Separate keymaster0 and keymaster1 HALs."
Shawn Willden [Tue, 24 Feb 2015 16:17:38 +0000 (09:17 -0700)]
Separate keymaster0 and keymaster1 HALs.
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
Shawn Willden [Tue, 24 Feb 2015 16:17:38 +0000 (09:17 -0700)]
Separate keymaster0 and keymaster1 HALs.
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
Alex Klyubin [Tue, 24 Feb 2015 00:56:30 +0000 (00:56 +0000)]
am
587d8313: am
4f5949b5: Merge "Clarify the meaning of KM_TAG_MAC_LENGTH."
* commit '
587d8313d6d9d9f44ac2d8702676c02c792e1bf3':
Clarify the meaning of KM_TAG_MAC_LENGTH.
Alex Klyubin [Tue, 24 Feb 2015 00:49:44 +0000 (00:49 +0000)]
am
4f5949b5: Merge "Clarify the meaning of KM_TAG_MAC_LENGTH."
* commit '
4f5949b5dda4a2e95d29e1aa3effb22c678df21a':
Clarify the meaning of KM_TAG_MAC_LENGTH.
Alex Klyubin [Tue, 24 Feb 2015 00:43:51 +0000 (00:43 +0000)]
Merge "Clarify the meaning of KM_TAG_MAC_LENGTH."
Alex Klyubin [Sat, 21 Feb 2015 00:42:23 +0000 (16:42 -0800)]
Clarify the meaning of KM_TAG_MAC_LENGTH.
Change-Id: I18478923059783e955613142a8d3352f98f5d7b0
Bill Yi [Fri, 20 Feb 2015 00:23:21 +0000 (00:23 +0000)]
Bill Yi [Thu, 19 Feb 2015 22:31:52 +0000 (14:31 -0800)]
Shawn Willden [Wed, 18 Feb 2015 15:59:37 +0000 (15:59 +0000)]
am
0e5fca1c: Merge changes Id4bdfdcb,Ib94f3606
* commit '
0e5fca1ca4777f5f5d5fa8bd0de139e42077881b':
Added insecure (chunkless) AEAD option.
Add additional param lists to update and finish.
Shawn Willden [Wed, 18 Feb 2015 15:48:03 +0000 (15:48 +0000)]
Merge changes Id4bdfdcb,Ib94f3606
* changes:
Added insecure (chunkless) AEAD option.
Add additional param lists to update and finish.
Shawn Willden [Wed, 18 Feb 2015 06:03:10 +0000 (06:03 +0000)]
am
892ae44c: Merge "Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA"
* commit '
892ae44c5f805f6ac64e6e756964c79998411742':
Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA
Shawn Willden [Wed, 18 Feb 2015 05:50:06 +0000 (05:50 +0000)]
Merge "Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA"
Shawn Willden [Wed, 18 Feb 2015 02:22:47 +0000 (02:22 +0000)]
Merge "Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA" into lmp-mr1-dev-plus-aosp
Shawn Willden [Sat, 7 Feb 2015 00:04:53 +0000 (17:04 -0700)]
Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA
Change-Id: Ieddd706ee205100719f7e2f9e18b3d9b07c37669
Shawn Willden [Sat, 14 Feb 2015 00:53:14 +0000 (00:53 +0000)]
am
6bdaf827: Merge "Add explicit values to keymaster_key_format_t"
* commit '
6bdaf827ef59975efbf73b2d5b4228fb61c36123':
Add explicit values to keymaster_key_format_t
Shawn Willden [Sat, 14 Feb 2015 00:40:41 +0000 (00:40 +0000)]
Merge "Add explicit values to keymaster_key_format_t"
Chad Brubaker [Fri, 13 Feb 2015 21:58:36 +0000 (13:58 -0800)]
Add explicit values to keymaster_key_format_t
Change-Id: I4113286396b16ca687fbd8bc38b2f16063fc1024
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
Shawn Willden [Tue, 10 Feb 2015 21:29:46 +0000 (14:29 -0700)]
Added insecure (chunkless) AEAD option.
Also moved chunk length specification to operation parameter rather than
keygen parameter.
Change-Id: Id4bdfdcb1c7b64b3f22b4027e037e37c2860ec39
Shawn Willden [Sat, 7 Feb 2015 00:04:53 +0000 (17:04 -0700)]
Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA
Change-Id: Ieddd706ee205100719f7e2f9e18b3d9b07c37669
Shawn Willden [Sat, 7 Feb 2015 00:01:53 +0000 (17:01 -0700)]
Add additional param lists to update and finish.
At the moment this is to accommodate associated data for AEAD modes, but
there may be other parameters in the future.
Change-Id: Ib94f3606e3f714f6fa75bf0d4bd75804d9a8db4e
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 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
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.
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: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: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 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)
Elliott Hughes [Fri, 30 Jan 2015 21:16:31 +0000 (21:16 +0000)]
am
ac41815a: Merge "Add missing includes."
* commit '
ac41815a99763b3e59d0f2f9ef2bb3e5a2011336':
Add missing includes.
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 [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 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: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 [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: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: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
Eric Laurent [Sat, 10 Jan 2015 01:03:27 +0000 (17:03 -0800)]
Merge commit '
83b47a68' into manualmerge
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 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
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 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: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:43:50 +0000 (02:43 +0000)]
am
4f1fe2f5: Merge "Fix build in C++11 mode"
* commit '
4f1fe2f59889d88ed026596c1841043db7edbc6f':
Fix build in C++11 mode
Dan Albert [Wed, 17 Dec 2014 02:29:26 +0000 (02:29 +0000)]
Merge "Fix build in C++11 mode"
Ying Wang [Tue, 16 Dec 2014 20:53:38 +0000 (20:53 +0000)]
am
cecfb56c: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
* commit '
cecfb56c5192fe1517a8e1b5910f16961db4a231':
Cleanup Obsolete LOCAL_PRELINK_MODULE.
Ying Wang [Tue, 16 Dec 2014 20:40:03 +0000 (20:40 +0000)]
Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
Ying Wang [Tue, 16 Dec 2014 20:33:37 +0000 (12:33 -0800)]
Cleanup Obsolete LOCAL_PRELINK_MODULE.
Bug:
18675947
Change-Id: I62157cd4bfab0edb445dd6543eb47a981e642848
Bernhard Rosenkränzer [Fri, 12 Dec 2014 21:16:55 +0000 (22:16 +0100)]
Fix build in C++11 mode
Fix build in C++11 mode instead of reverting to C++98 mode.
(Fixes some constructs that were mistaken for C++11 literals and
a use of the std::ostream(NULL) constructor).
Building in C++98 mode causes clang to fall over conflicting definitions
of char16_t.
Change-Id: I66230eeb960f4a894d6c98fe7935ec932569c5a4
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
Haynes Mathew George [Fri, 12 Dec 2014 14:39:15 +0000 (14:39 +0000)]
am
2cbdfa9c: usbaudio: reset profile on device disconnect
* commit '
2cbdfa9c991fc63f52f48831e5509fcc2889db77':
usbaudio: reset profile on device disconnect
Haynes Mathew George [Wed, 3 Dec 2014 22:51:49 +0000 (14:51 -0800)]
usbaudio: reset profile on device disconnect
Reset ALSA device profile on disconnect event. Entries like
supported sample rates, channel counts, formats will be repopulated
on next connect.
CRs-Fixed: 765434
Change-Id: I27d3b7fd7ff22646996f58c53de08547b1a1fb6a
Bug:
18606219
Jean-Michel Trivi [Wed, 10 Dec 2014 22:36:20 +0000 (22:36 +0000)]
am
257fde6e: Reroute submix HAL: fix race condition on output state
* commit '
257fde6eb533b890776c8c45be8b61c48ab04945':
Reroute submix HAL: fix race condition on output state
Jean-Michel Trivi [Wed, 10 Dec 2014 04:20:15 +0000 (20:20 -0800)]
Reroute submix HAL: fix race condition on output state
When reading from a pipe, the output may have been previously
closed, therefore the output state should only be read if it
is still available.
This fixes a race condition observed between in_read() (which
accesses the output stream) and adev_close_output_stream()
(which sets the output reference to NULL).
No issue with out_write() which checks the input reference.
Bug
16009464
Change-Id: I979bc12c8fe91fad9b6f6c9e0be107c1bacae360
Elliott Hughes [Fri, 5 Dec 2014 18:01:52 +0000 (18:01 +0000)]
am
719b8423: Merge "Remove ARCH_X86."
* commit '
719b8423102e469b5a537321f02011415b376dbe':
Remove ARCH_X86.
Elliott Hughes [Fri, 5 Dec 2014 17:47:28 +0000 (17:47 +0000)]
Merge "Remove ARCH_X86."
Elliott Hughes [Fri, 5 Dec 2014 00:20:52 +0000 (16:20 -0800)]
Remove ARCH_X86.
Should have been __GLIBC__, but the code is dead anyway.
Change-Id: I773f296a9c31949fa631cad863b841584c71f0ef