OSDN Git Service
Greg Hackmann [Thu, 24 Jul 2014 23:51:41 +0000 (23:51 +0000)]
am
47aadaec: update struct-offset.cpp test for hwc 1.4
* commit '
47aadaec2850744046f50eebd8dd40fcfe2b9b02':
update struct-offset.cpp test for hwc 1.4
Greg Hackmann [Thu, 24 Jul 2014 23:51:40 +0000 (23:51 +0000)]
am
26eae603: Merge "gralloc: add GRALLOC_USAGE_CURSOR flag" into lmp-dev
* commit '
26eae603d336d8ef649566c4bb699d50e8eda681':
gralloc: add GRALLOC_USAGE_CURSOR flag
Greg Hackmann [Thu, 24 Jul 2014 20:27:07 +0000 (13:27 -0700)]
update struct-offset.cpp test for hwc 1.4
Change-Id: I882a1741ad473492d4acc58918a54d944ac382c3
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Riley Andrews [Thu, 24 Jul 2014 20:00:16 +0000 (20:00 +0000)]
am
805da7f1: Add interface for doing asynchonous cursor layer updates to hwcomposer
* commit '
805da7f1ef2409d37addd4dfcf9ba96de4907064':
Add interface for doing asynchonous cursor layer updates to hwcomposer
destradaa [Thu, 24 Jul 2014 20:00:16 +0000 (20:00 +0000)]
am
6944165c: Merge "Fix typo in sensor type using an already defined constant." into lmp-dev
* commit '
6944165cc834282f0e6021922cc4868b92734f3e':
Fix typo in sensor type using an already defined constant.
Greg Hackmann [Thu, 24 Jul 2014 19:05:40 +0000 (19:05 +0000)]
Merge "gralloc: add GRALLOC_USAGE_CURSOR flag" into lmp-dev
Riley Andrews [Mon, 30 Jun 2014 22:55:55 +0000 (15:55 -0700)]
Add interface for doing asynchonous cursor layer updates to hwcomposer
Change-Id: If2ab523b400cfb586c8e1fed98f2ebe3538c0419
Greg Hackmann [Wed, 9 Jul 2014 20:58:44 +0000 (13:58 -0700)]
gralloc: add GRALLOC_USAGE_CURSOR flag
On many devices, hardware cursors have stricter layout constraints than
other overlays. GRALLOC_USAGE_CURSOR indicates a buffer may be used as
a cursor; byte order and padding should be chosen accordingly.
GRALLOC_USAGE_CURSOR must not cause allocation failure. If the requested
properties (dimensions, format, other usage flags, etc.) aren't compatible with
the device's cursor hardware, the implementation must allocate the buffer
anyway, acting as if GRALLOC_USAGE_CURSOR were not specified.
Change-Id: I7d66e8d7c953421d996c5def3257d408f91962f4
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Satya Calloji [Wed, 23 Jul 2014 19:12:15 +0000 (19:12 +0000)]
am
5d8cc2c0: LE energy info feature
* commit '
5d8cc2c0b0a2436871e985ae5429066be8ee9050':
LE energy info feature
Satya Calloji [Thu, 3 Jul 2014 17:59:16 +0000 (10:59 -0700)]
LE energy info feature
Header changes for energy info feature
Change-Id: Ic341ad9089b444960c36beff726fa9ddb5c901a2
destradaa [Wed, 23 Jul 2014 23:24:14 +0000 (23:24 +0000)]
Merge "Fix typo in sensor type using an already defined constant." into lmp-dev
destradaa [Tue, 22 Jul 2014 17:42:33 +0000 (17:42 +0000)]
am
9bc3756e: Add uncertainty for GPS received tow field. b/
16463499
* commit '
9bc3756e1e56e0d8c14e4b519777d905b067294b':
Add uncertainty for GPS received tow field. b/
16463499
destradaa [Tue, 22 Jul 2014 01:13:42 +0000 (18:13 -0700)]
Add uncertainty for GPS received tow field.
b/
16463499
Change-Id: Ib8ddd092f3da8295345524846e3ea0bcce59ccc2
Jungshik Jang [Mon, 21 Jul 2014 23:38:28 +0000 (23:38 +0000)]
am
e2951ce5: Merge "Update comment for send message." into lmp-dev
* commit '
e2951ce533b62f7db757dd8a034c31a39ae14255':
Update comment for send message.
destradaa [Mon, 21 Jul 2014 22:12:21 +0000 (15:12 -0700)]
Fix typo in sensor type using an already defined constant.
Change-Id: I209d9191456dc6c1ef2eb695c9a8348a18504a8d
destradaa [Mon, 21 Jul 2014 19:24:32 +0000 (19:24 +0000)]
am
25e30568: Merge "Update GPS measurement HAL definition." into lmp-dev
* commit '
25e30568ef1a405f231085ae8bcdea2d711130d4':
Update GPS measurement HAL definition.
Wonsik Kim [Mon, 21 Jul 2014 18:28:54 +0000 (18:28 +0000)]
am
49dba7f6: Reorder hardware types & remove verbose comments
* commit '
49dba7f665da5002686e7616845dde35ef393b69':
Reorder hardware types & remove verbose comments
Jeff Brown [Mon, 21 Jul 2014 18:28:53 +0000 (18:28 +0000)]
am
70228784: Add new HWC_POWER_MODE_DOZE_SUSPEND power state.
* commit '
70228784ecfc0b23148c8d9659aafdffd6d4f240':
Add new HWC_POWER_MODE_DOZE_SUSPEND power state.
destradaa [Mon, 21 Jul 2014 18:17:42 +0000 (18:17 +0000)]
Merge "Update GPS measurement HAL definition." into lmp-dev
Wonsik Kim [Sat, 19 Jul 2014 07:01:57 +0000 (16:01 +0900)]
Reorder hardware types & remove verbose comments
Reorder hardware types so that older types comes first roughly. This
would make it more natural to add newer hardware types as they come.
In addition, remove verbose comments where the meaning is obvious from
the name.
Change-Id: I275e9e608c8c2392e3f7ec2c5d81743059f2d36b
Jeff Brown [Fri, 18 Jul 2014 03:01:59 +0000 (20:01 -0700)]
Add new HWC_POWER_MODE_DOZE_SUSPEND power state.
Change-Id: Ice194315bc51ca25732c9e30c809bd6b39f3718f
Andre Eisenbach [Fri, 18 Jul 2014 19:39:00 +0000 (19:39 +0000)]
am
3c36ecd3: Merge "LE: Add connection parameter update request API (1/4)" into lmp-dev
* commit '
3c36ecd3fa2379d89f86048d84d71ab2c012d1a3':
LE: Add connection parameter update request API (1/4)
Paul McLean [Fri, 18 Jul 2014 19:38:59 +0000 (19:38 +0000)]
am
5cf82940: Merge "Move channel expansion/contraction functions to audio_utils/channels.h/.c" into lmp-dev
* commit '
5cf829402a4e5d1e3d88210267c6452bc21fb52f':
Move channel expansion/contraction functions to audio_utils/channels.h/.c
Jeff Brown [Fri, 18 Jul 2014 03:23:59 +0000 (03:23 +0000)]
am
5a5d0d0b: Add glance gesture for doze mode.
* commit '
5a5d0d0b13bf838791e4a6320ffd414a59f14921':
Add glance gesture for doze mode.
destradaa [Thu, 17 Jul 2014 21:04:50 +0000 (14:04 -0700)]
Update GPS measurement HAL definition.
b/
16374800
Change-Id: I39602e4b7dedeca5de866cdb996887ae53d5aa9d
Jeff Brown [Thu, 17 Jul 2014 22:11:51 +0000 (15:11 -0700)]
Add glance gesture for doze mode.
Change-Id: I2daa13e74d2183247c314c15ee283b7a6c20bc22
Aravind Akella [Thu, 17 Jul 2014 23:53:25 +0000 (23:53 +0000)]
am
522f0a8d: Merge "Define SENSOR_TYPE_PICK_UP_GESTURE." into lmp-dev
* commit '
522f0a8d8da95b27a04af50efde8ab95f1e3be53':
Define SENSOR_TYPE_PICK_UP_GESTURE.
Paul McLean [Fri, 18 Jul 2014 19:27:07 +0000 (19:27 +0000)]
Merge "Move channel expansion/contraction functions to audio_utils/channels.h/.c" into lmp-dev
Jungshik Jang [Mon, 21 Jul 2014 23:23:11 +0000 (23:23 +0000)]
Merge "Update comment for send message." into lmp-dev
Jungshik Jang [Mon, 21 Jul 2014 09:06:01 +0000 (18:06 +0900)]
Update comment for send message.
HAL should not handle retransmission because it's handled by
hdmi control service.
Change-Id: I0daf1baf6f87805e2049ff84c6f8c2cace76dba2
Aravind Akella [Thu, 17 Jul 2014 21:39:48 +0000 (21:39 +0000)]
Merge "Define SENSOR_TYPE_PICK_UP_GESTURE." into lmp-dev
Aravind Akella [Thu, 17 Jul 2014 19:40:54 +0000 (12:40 -0700)]
Define SENSOR_TYPE_PICK_UP_GESTURE.
Change-Id: I122f37f5625a2acc3912ad37bdf8717ae2f31b6f
Andre Eisenbach [Fri, 18 Jul 2014 19:29:36 +0000 (19:29 +0000)]
Merge "LE: Add connection parameter update request API (1/4)" into lmp-dev
Andre Eisenbach [Thu, 17 Jul 2014 05:58:36 +0000 (22:58 -0700)]
LE: Add connection parameter update request API (1/4)
Change-Id: I90955b5e1640f7025e864ac9227af6ad8ba5ca77
Glenn Kasten [Thu, 17 Jul 2014 14:12:48 +0000 (14:12 +0000)]
am
8baaa51e: Add audio_input_flags_t to HAL open_input_stream
* commit '
8baaa51e7d22af3eca4a0170a66401af3ea863e7':
Add audio_input_flags_t to HAL open_input_stream
Paul McLean [Wed, 16 Jul 2014 20:46:07 +0000 (13:46 -0700)]
Move channel expansion/contraction functions to audio_utils/channels.h/.c
Change-Id: I967a062f6c1cb5ae6acb6e92f4f3df00a0336733
Glenn Kasten [Tue, 15 Jul 2014 18:10:38 +0000 (11:10 -0700)]
Add audio_input_flags_t to HAL open_input_stream
Change-Id: I3519bfa45809e064d19473ebe6489c5249d306a8
Paul McLean [Wed, 16 Jul 2014 16:51:53 +0000 (16:51 +0000)]
am
bb47e9dd: Marking invalid PCM formats with PCM_FORMAT_INVALID, shrinking format table.
* commit '
bb47e9dd3bd963d9bbe29317e9702aafd4727043':
Marking invalid PCM formats with PCM_FORMAT_INVALID, shrinking format table.
Paul McLean [Wed, 16 Jul 2014 15:40:00 +0000 (08:40 -0700)]
Marking invalid PCM formats with PCM_FORMAT_INVALID, shrinking format table.
Change-Id: I57da4ed85fe128e88e63c03be4fe836f8de76ac8
Paul McLean [Wed, 16 Jul 2014 00:48:08 +0000 (00:48 +0000)]
am
03c60efb: Support for 32-bit data conversions.
* commit '
03c60efbbd3010496c0a3a404faf737a93d45bbf':
Support for 32-bit data conversions.
Paul McLean [Fri, 11 Jul 2014 23:29:41 +0000 (16:29 -0700)]
Support for 32-bit data conversions.
Change-Id: I18d955d9b2df99744ae6211bdb924c679ea7a617
Eric Laurent [Tue, 15 Jul 2014 23:28:09 +0000 (23:28 +0000)]
am
a7bb3970: Merge "Revert "Added enumeration of legitimate sample rates for input and output."" into lmp-dev
* commit '
a7bb39702f8ec4d3e3e631a09361512a201430b0':
Revert "Added enumeration of legitimate sample rates for input and output."
Paul McLean [Tue, 15 Jul 2014 23:17:50 +0000 (23:17 +0000)]
am
1eb4a8de: Merge "Added enumeration of legitimate sample rates for input and output." into lmp-dev
* commit '
1eb4a8def9f586e5befcbaac5b91caa8f8b84c39':
Added enumeration of legitimate sample rates for input and output.
Glenn Kasten [Tue, 15 Jul 2014 23:17:48 +0000 (23:17 +0000)]
am
7bd1bd05: Merge "Fix warnings" into lmp-dev
* commit '
7bd1bd0523db5505ddd792c7168a8d22e4efe982':
Fix warnings
Paul McLean [Tue, 15 Jul 2014 21:57:22 +0000 (14:57 -0700)]
resolved conflicts for merge of
426a9137 to master
Change-Id: Iac4dc57a15b0306d1f54283752872b32fab74e59
Eric Laurent [Tue, 15 Jul 2014 23:15:33 +0000 (23:15 +0000)]
Merge "Revert "Added enumeration of legitimate sample rates for input and output."" into lmp-dev
Eric Laurent [Tue, 15 Jul 2014 23:15:05 +0000 (23:15 +0000)]
Revert "Added enumeration of legitimate sample rates for input and output."
This reverts commit
0a4f9f6662aad6b97a1877030d5efbcfbd94c03c.
Change-Id: I6e7125aecf2ff2e89a4c9206dc669d8e792a6300
Paul McLean [Tue, 15 Jul 2014 19:35:06 +0000 (12:35 -0700)]
Added enumeration of legitimate sample rates for input and output.
Change-Id: Ib53ec5254bd47761dbce84646a841eb9b32fd62a
Paul McLean [Tue, 15 Jul 2014 23:07:19 +0000 (23:07 +0000)]
Merge "Added enumeration of legitimate sample rates for input and output." into lmp-dev
Glenn Kasten [Tue, 15 Jul 2014 23:00:47 +0000 (23:00 +0000)]
Merge "Fix warnings" into lmp-dev
Glenn Kasten [Tue, 15 Jul 2014 18:11:01 +0000 (11:11 -0700)]
Fix warnings
Change-Id: I1ba5c871a1cb44df8c383f595cbe6d75fef02aa3
Paul McLean [Fri, 11 Jul 2014 23:29:41 +0000 (16:29 -0700)]
Support for 32-bit data conversions.
Change-Id: I18d955d9b2df99744ae6211bdb924c679ea7a617
Conflicts:
modules/usbaudio/audio_hw.c
Michael Lentine [Tue, 15 Jul 2014 00:11:50 +0000 (00:11 +0000)]
Merge "hwcomposer: Allow display configuration selection"
Dan Stoza [Tue, 6 May 2014 22:56:59 +0000 (15:56 -0700)]
hwcomposer: Allow display configuration selection
Adds two functions to the HWC interface: one for querying the current
display configuration, and one for setting a new configuration. This
will enable DisplayManager to change the mode on demand.
Bug:
14320401
Change-Id: I556c509192b877b38b2103a78f937b3687f35546
Paul McLean [Mon, 14 Jul 2014 22:22:02 +0000 (22:22 +0000)]
Merge "Added enumeration of legitimate sample rates for input and output."
Paul McLean [Fri, 11 Jul 2014 22:14:19 +0000 (15:14 -0700)]
Added enumeration of legitimate sample rates for input and output.
Added device_profile to enable refactoring of query methods.
Refactored query methods (in_get_parameters/out_getParameters)
in terms of device_get_parameters.
Freeing ALSA parameter structures (pcm_params_free)
Eliminated unnecessay input & output card/device (to support
other changes).
Change-Id: I771cf4681a628f87ca6d6ee3f85f76ae4d7f1504
Jinsuk Kim [Fri, 11 Jul 2014 02:39:35 +0000 (02:39 +0000)]
Merge "Use the term port_id for HDMI port index across definitions"
destradaa [Tue, 29 Apr 2014 17:50:22 +0000 (10:50 -0700)]
Update GPS HAL to accept raw data.
Change-Id: Id487c2f9eb4bc95d89dc0fba1332f666ae332ee0
Jinsuk Kim [Wed, 9 Jul 2014 08:17:24 +0000 (17:17 +0900)]
Use the term port_id for HDMI port index across definitions
Renamed various terms like, port, port_num to port_id, and
added a description that the id starts from 1.
Change-Id: I9229edff7fd75dd15e672e309369e237ca339238
Zhijun He [Wed, 9 Jul 2014 01:21:24 +0000 (01:21 +0000)]
Merge "camera3: fix some spec issue related with input/bidrectional stream"
Zhijun He [Mon, 30 Jun 2014 17:35:58 +0000 (10:35 -0700)]
camera3: fix some spec issue related with input/bidrectional stream
Bug:
13934977
Change-Id: Ibccb80e69ac9da153de6378f1e3b0f00527ce4c9
Eric Laurent [Sun, 6 Jul 2014 23:08:45 +0000 (16:08 -0700)]
sound trigger: update HAL
New start_recognition() prototype with recognition
configuration structure specifying:
- List of keyphrases to listen to.
- Recognition mode for each keyphrase
- List of users and min confidence levels for each users
New recognition event format with confidence level and user ID
for each user.
Bug:
12378680.
Change-Id: I95e998c735321ceb5c27f477d894b574a6eca860
Eric Laurent [Sun, 6 Jul 2014 17:07:22 +0000 (17:07 +0000)]
Merge "audio: different frame size calculation for input and output"
David Turner [Fri, 4 Jul 2014 13:34:54 +0000 (13:34 +0000)]
am
611a3b71: am
3e618a6a: Merge "gralloc: let target configure page flipping ioctl"
* commit '
611a3b71431293a123a11af99ff731ab30067632':
gralloc: let target configure page flipping ioctl
David Turner [Fri, 4 Jul 2014 13:30:22 +0000 (13:30 +0000)]
am
3e618a6a: Merge "gralloc: let target configure page flipping ioctl"
* commit '
3e618a6aa10c783d1536f20edfc3347939cfa18e':
gralloc: let target configure page flipping ioctl
David Turner [Fri, 4 Jul 2014 13:20:55 +0000 (13:20 +0000)]
Merge "gralloc: let target configure page flipping ioctl"
Eric Laurent [Wed, 2 Jul 2014 20:45:32 +0000 (13:45 -0700)]
audio: different frame size calculation for input and output
Bug:
15000850.
Change-Id: I7813e99a0b7ce613cc3b7d7c95be0525cb2d6c81
Brian Carlstrom [Wed, 2 Jul 2014 23:13:30 +0000 (23:13 +0000)]
am
18cf130c: Fix my-dir issue
* commit '
18cf130c439982d1eafa7ef5f598ef7f4b945821':
Fix my-dir issue
Jinsuk Kim [Fri, 4 Jul 2014 05:10:34 +0000 (05:10 +0000)]
Merge "Remove tx_status event in CEC HAL"
Jinsuk Kim [Thu, 3 Jul 2014 00:30:42 +0000 (09:30 +0900)]
Remove tx_status event in CEC HAL
Removes tx_status event type which turns out not in actual use.
This changes makes send_message() work in sychrnonous fashion
when called by HdmiControlService. HdmiControlService has io thread
dedicated to interact with HAL, hence no need to introduce
another async flow for HAL.
Change-Id: I8ae21b1149cd36bfd0f9da215c4f23b30f0c8d30
Paul McLean [Mon, 7 Jul 2014 16:43:45 +0000 (16:43 +0000)]
Merge "Multi-format USB audio input"
Paul McLean [Wed, 2 Jul 2014 14:27:41 +0000 (07:27 -0700)]
Multi-format USB audio input
Change-Id: I716a9f79dcfea35eacd0aeeda530e3e3c7eb4d32
Brian Carlstrom [Mon, 30 Jun 2014 22:15:45 +0000 (15:15 -0700)]
Fix my-dir issue
(cherry picked from commit
52f493189b02c44c6dc329c86da3176ac9c22ad3)
Change-Id: I3dcca1fc0fb9d58f0d2f3867f8ab89f87a983cc1
Eric Laurent [Wed, 2 Jul 2014 16:47:15 +0000 (16:47 +0000)]
Merge "audio: fixed channel count determination from channel mask"
Eric Laurent [Wed, 2 Jul 2014 03:32:28 +0000 (20:32 -0700)]
audio: fixed channel count determination from channel mask
Do not use popcount() to derive channel count from channel mask.
Bug:
15000850.
Change-Id: I4d803dc3e1cb680baa0022e539e6f9eab3ffef1a
Hemant Gupta [Fri, 18 Apr 2014 06:55:24 +0000 (12:25 +0530)]
Bluetooth: Support MAP Client role on Bluedroid.
Implementation of MAP Client (MCE) role on
Bluedroid stack. Include MAP Client Interface ID.
Change-Id: Icdf11b7f09a161e35aa3aa68b9b5fa315e18fd65
Matthew Xie [Mon, 30 Jun 2014 22:45:59 +0000 (22:45 +0000)]
Merge "Add WBS support on Bluedroid (4/6)"
Brian Carlstrom [Mon, 30 Jun 2014 22:15:45 +0000 (15:15 -0700)]
Fix my-dir issue
Change-Id: I9c93a273328ac0c6e96f27870b890a16d18479a5
Wei Wang [Mon, 30 Jun 2014 21:29:49 +0000 (21:29 +0000)]
Merge "LE Onfound and Onlost feature"
Satya Calloji [Sun, 15 Jun 2014 18:51:38 +0000 (11:51 -0700)]
LE Onfound and Onlost feature
Header changes for on found/onlost feature
Change-Id: I72d49a1b6560c2c913a3b7016b7504eef9962258
Satya Calloji [Thu, 12 Jun 2014 05:53:12 +0000 (22:53 -0700)]
LE ADV Filter changes
Header changes for ADV filter feature
Change-Id: Ib568f422c4171ed8a3bb42d9e75af5250edf98b6
Satya Calloji [Sun, 11 May 2014 06:37:11 +0000 (23:37 -0700)]
LE Batch scan feature
Header changes for LE Batch scan feature
Change-Id: I32a51331d7a3a8eedf8577a66a8bdf90732f32db
Eric Laurent [Mon, 30 Jun 2014 14:45:24 +0000 (14:45 +0000)]
Merge "usb audio: fix capture channel conversion"
Hemant Gupta [Wed, 31 Jul 2013 13:44:02 +0000 (19:14 +0530)]
[1/2] Bluetooth: Security: Handle authentication rejected error status
Handle authentication rejected error status in failure scenario.
Change-Id: Ibd59d161ee5481ced2cb078a6ee6f4a6b045bcd4
Eric Laurent [Sat, 28 Jun 2014 01:39:21 +0000 (18:39 -0700)]
usb audio: fix capture channel conversion
Change-Id: Ibdff053bd6ecc4bf2bc8bb51384098911f52f6ef
Wei Wang [Mon, 30 Jun 2014 21:29:27 +0000 (21:29 +0000)]
Merge "LE ADV Filter changes"
Wei Wang [Mon, 30 Jun 2014 21:29:11 +0000 (21:29 +0000)]
Merge "LE Batch scan feature"
Paul McLean [Wed, 25 Jun 2014 17:42:07 +0000 (10:42 -0700)]
Multi-format USB Audio suport
Change-Id: I2815e1dc38d39a3d88fb0affd52b1b9f50a73b92
Andre Eisenbach [Fri, 28 Mar 2014 21:53:33 +0000 (14:53 -0700)]
LE: Add notification sent and congestion callbacks (1/4)
This change introduces two new callbacks for applications to better
handle LE notification flow control and transport congestion. The
notification callback is invoked when the remote platform confirms an
indication or when a local notification has been passed to the
controller. No new notifications should be sent until a callback is
received.
Congestion callbacks are triggered when a GATT operation cannot be sent
to the local Bluetooth controller. Repeatedly calling
writeCharacteristic() for example will eventually trigger a congestion
callback. Applications cannot send additional data until a further
callback is received, indicating that the congestion has cleared up.
Change-Id: I613cbf968770921f853a407888bb8308849039f3
Mudumba Ananth [Mon, 28 Apr 2014 04:04:35 +0000 (21:04 -0700)]
Add WBS support on Bluedroid (4/6)
Bug
13764086
Change-Id: I7938758d39aaa1218c38956be41d8402f84c2f49
Andre Eisenbach [Fri, 20 Jun 2014 22:18:04 +0000 (22:18 +0000)]
Merge "LE: Add is_connected() function (1/3)"
Paul McLean [Thu, 19 Jun 2014 19:35:28 +0000 (12:35 -0700)]
Implement minimal buffer size for playback
This will enable low-latency playback in mixer/audioflinger.
Change-Id: I415aa1b92e3c6f945a48be7b626527f0b02a82d7
Andre Eisenbach [Wed, 18 Jun 2014 19:18:34 +0000 (12:18 -0700)]
LE: Add is_connected() function (1/3)
Change-Id: I1b94ab0c8b0ff2e1026a4f5bbe95dca25be3d104
Jim Miller [Tue, 17 Jun 2014 20:20:48 +0000 (20:20 +0000)]
Merge "Minor cleanup of HAL fingerprint API"
Eric Laurent [Tue, 17 Jun 2014 18:26:43 +0000 (18:26 +0000)]
Merge "usb audio: fix usb capture configuration"
Jim Miller [Tue, 17 Jun 2014 00:59:40 +0000 (17:59 -0700)]
Minor cleanup of HAL fingerprint API
Change-Id: I7a4b1caadfe499d2394c8645e45903759b672e8b
Nick Vaccaro [Wed, 11 Jun 2014 19:53:01 +0000 (19:53 +0000)]
am
c384b186: Don\'t pass up bad sensor event packets to Sensor Services
* commit '
c384b1863768d424116c1bcc7f26f5764c35c330':
Don't pass up bad sensor event packets to Sensor Services
Eric Laurent [Wed, 11 Jun 2014 19:00:16 +0000 (12:00 -0700)]
usb audio: fix usb capture configuration
Capture configuration was using cached_output_hardware_config
instead of cached_input_hardware_config.
Also enable mono capture by rejecting first attempt to open
an input stream in mono with -EINVAL error: AudioFlinger will reopen in
stereo and do the channel conversion.
Change-Id: Ibdf53be4aa88d47091745bc71daa1dec002535f8
Nick Vaccaro [Wed, 11 Jun 2014 01:33:07 +0000 (18:33 -0700)]
Don't pass up bad sensor event packets to Sensor Services
If an event packet is read containing an unknown sensor handle,
don't pass it on to Sensor Services. Drop it on the floor instead
as it's causing Sensor Services to crash.
Moved read of queue size in sensors_poll_context_t::poll() to post
queue mutex grab for safety.
Bug:
15285345
Change-Id: I2ebc0f8591a1ae60f09bf9599b8321c5a3dfae69
Wonsik Kim [Mon, 16 Jun 2014 01:52:47 +0000 (01:52 +0000)]
Merge "tv_input: Add HDMI port ID"