summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | am a7bb3970: Merge "Revert "Added enumeration of legitimate sample rates for ↵Eric Laurent2014-07-151-215/+39
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | input and output."" into lmp-dev * commit 'a7bb39702f8ec4d3e3e631a09361512a201430b0': Revert "Added enumeration of legitimate sample rates for input and output."
| * | | | | | Merge "Revert "Added enumeration of legitimate sample rates for input and ↵Eric Laurent2014-07-151-215/+39
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | output."" into lmp-dev
| | * | | | | | Revert "Added enumeration of legitimate sample rates for input and output."Eric Laurent2014-07-151-215/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0a4f9f6662aad6b97a1877030d5efbcfbd94c03c. Change-Id: I6e7125aecf2ff2e89a4c9206dc669d8e792a6300
* | | | | | | | am 1eb4a8de: Merge "Added enumeration of legitimate sample rates for input ↵Paul McLean2014-07-150-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and output." into lmp-dev * commit '1eb4a8def9f586e5befcbaac5b91caa8f8b84c39': Added enumeration of legitimate sample rates for input and output.
| * | | | | | | Merge "Added enumeration of legitimate sample rates for input and output." ↵Paul McLean2014-07-153-146/+207
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | into lmp-dev
| | * | | | | | Added enumeration of legitimate sample rates for input and output.Paul McLean2014-07-151-39/+215
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib53ec5254bd47761dbce84646a841eb9b32fd62a
* | | | | | | | am 7bd1bd05: Merge "Fix warnings" into lmp-devGlenn Kasten2014-07-152-5/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '7bd1bd0523db5505ddd792c7168a8d22e4efe982': Fix warnings
| * | | | | | | Merge "Fix warnings" into lmp-devGlenn Kasten2014-07-152-5/+5
| |\ \ \ \ \ \ \
| | * | | | | | | Fix warningsGlenn Kasten2014-07-152-5/+5
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | Change-Id: I1ba5c871a1cb44df8c383f595cbe6d75fef02aa3
* | | | | | | | resolved conflicts for merge of 426a9137 to masterPaul McLean2014-07-151-39/+215
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | / / / / / | |_|/ / / / / |/| | | | | | Change-Id: Iac4dc57a15b0306d1f54283752872b32fab74e59
| * | | | | | Support for 32-bit data conversions.Paul McLean2014-07-151-38/+217
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I18d955d9b2df99744ae6211bdb924c679ea7a617 Conflicts: modules/usbaudio/audio_hw.c
* | | | | | Merge "hwcomposer: Allow display configuration selection"Michael Lentine2014-07-142-12/+57
|\ \ \ \ \ \
| * | | | | | hwcomposer: Allow display configuration selectionDan Stoza2014-07-142-12/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge "Added enumeration of legitimate sample rates for input and output."Paul McLean2014-07-141-135/+154
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Added enumeration of legitimate sample rates for input and output.Paul McLean2014-07-141-135/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge "Use the term port_id for HDMI port index across definitions"Jinsuk Kim2014-07-101-3/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Use the term port_id for HDMI port index across definitionsJinsuk Kim2014-07-091-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed various terms like, port, port_num to port_id, and added a description that the id starts from 1. Change-Id: I9229edff7fd75dd15e672e309369e237ca339238
* | | | | | | Update GPS HAL to accept raw data.destradaa2014-07-091-15/+590
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id487c2f9eb4bc95d89dc0fba1332f666ae332ee0
* | | | | | | Merge "camera3: fix some spec issue related with input/bidrectional stream"Zhijun He2014-07-081-6/+9
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | camera3: fix some spec issue related with input/bidrectional streamZhijun He2014-07-081-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13934977 Change-Id: Ibccb80e69ac9da153de6378f1e3b0f00527ce4c9
* | | | | | | sound trigger: update HALEric Laurent2014-07-072-18/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge "Multi-format USB audio input"Paul McLean2014-07-021-42/+119
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Multi-format USB audio inputPaul McLean2014-07-071-42/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I716a9f79dcfea35eacd0aeeda530e3e3c7eb4d32
* | | | | | | Merge "audio: different frame size calculation for input and output"Eric Laurent2014-07-064-20/+62
|\ \ \ \ \ \ \
| * | | | | | | audio: different frame size calculation for input and outputEric Laurent2014-07-034-20/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15000850. Change-Id: I7813e99a0b7ce613cc3b7d7c95be0525cb2d6c81
* | | | | | | | am 611a3b71: am 3e618a6a: Merge "gralloc: let target configure page flipping ↵David Turner2014-07-042-1/+16
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ioctl" * commit '611a3b71431293a123a11af99ff731ab30067632': gralloc: let target configure page flipping ioctl
| * | | | | | | am 3e618a6a: Merge "gralloc: let target configure page flipping ioctl"David Turner2014-07-042-1/+16
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '3e618a6aa10c783d1536f20edfc3347939cfa18e': gralloc: let target configure page flipping ioctl
| | * | | | | | Merge "gralloc: let target configure page flipping ioctl"David Turner2014-07-042-1/+16
| | |\ \ \ \ \ \
| | | * | | | | | gralloc: let target configure page flipping ioctlBernhard Rosenkraenzer2014-06-022-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let vendor choose which framebuffer ioctl (FBIOPUT_VSCREENINFO or FBIOPAN_DISPLAY) is best suited to do page-flip on its target platform. Neither API is well documented about their usage and most of the time it really depends on the respective framebuffer driver implementation. * Default ioctl to do page-flip is FBIOPUT_VSCREENINFO. * Set "TARGET_USE_PAN_DISPLAY=true" in board config file to use FBIOPAN_DISPLAY. Change-Id: Ic3a50bd0f5fe37ac0149e11649c4abdadea85529 Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
* | | | | | | | | Merge "Remove tx_status event in CEC HAL"Jinsuk Kim2014-07-021-14/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Remove tx_status event in CEC HALJinsuk Kim2014-07-031-14/+3
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | am 18cf130c: Fix my-dir issueBrian Carlstrom2014-07-020-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit '18cf130c439982d1eafa7ef5f598ef7f4b945821': Fix my-dir issue
| * | | | | | | Fix my-dir issueBrian Carlstrom2014-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 52f493189b02c44c6dc329c86da3176ac9c22ad3) Change-Id: I3dcca1fc0fb9d58f0d2f3867f8ab89f87a983cc1
* | | | | | | | Merge "audio: fixed channel count determination from channel mask"Eric Laurent2014-07-021-20/+12
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | audio: fixed channel count determination from channel maskEric Laurent2014-07-011-20/+12
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not use popcount() to derive channel count from channel mask. Bug: 15000850. Change-Id: I4d803dc3e1cb680baa0022e539e6f9eab3ffef1a
* | | | | | | Bluetooth: Support MAP Client role on Bluedroid.Hemant Gupta2014-07-012-0/+55
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implementation of MAP Client (MCE) role on Bluedroid stack. Include MAP Client Interface ID. Change-Id: Icdf11b7f09a161e35aa3aa68b9b5fa315e18fd65
* | | | | | Merge "Add WBS support on Bluedroid (4/6)"Matthew Xie2014-06-301-0/+17
|\ \ \ \ \ \
| * | | | | | Add WBS support on Bluedroid (4/6)Mudumba Ananth2014-06-231-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 13764086 Change-Id: I7938758d39aaa1218c38956be41d8402f84c2f49
* | | | | | | Fix my-dir issueBrian Carlstrom2014-06-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9c93a273328ac0c6e96f27870b890a16d18479a5
* | | | | | | Merge "LE Onfound and Onlost feature"Wei Wang2014-06-271-0/+5
|\ \ \ \ \ \ \
| * | | | | | | LE Onfound and Onlost featureSatya Calloji2014-06-301-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Header changes for on found/onlost feature Change-Id: I72d49a1b6560c2c913a3b7016b7504eef9962258
* | | | | | | | Merge "LE ADV Filter changes"Wei Wang2014-06-271-10/+30
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | LE ADV Filter changesSatya Calloji2014-06-301-10/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Header changes for ADV filter feature Change-Id: Ib568f422c4171ed8a3bb42d9e75af5250edf98b6
* | | | | | | | Merge "LE Batch scan feature"Wei Wang2014-06-301-4/+35
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | LE Batch scan featureSatya Calloji2014-06-301-4/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Header changes for LE Batch scan feature Change-Id: I32a51331d7a3a8eedf8577a66a8bdf90732f32db
* | | | | | | | Multi-format USB Audio suportPaul McLean2014-06-301-152/+336
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I2815e1dc38d39a3d88fb0affd52b1b9f50a73b92
* | | | | | | Merge "usb audio: fix capture channel conversion"Eric Laurent2014-06-301-5/+5
|\ \ \ \ \ \ \
| * | | | | | | usb audio: fix capture channel conversionEric Laurent2014-06-271-5/+5
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibdff053bd6ecc4bf2bc8bb51384098911f52f6ef
* | | | | | | [1/2] Bluetooth: Security: Handle authentication rejected error statusHemant Gupta2014-06-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle authentication rejected error status in failure scenario. Change-Id: Ibd59d161ee5481ced2cb078a6ee6f4a6b045bcd4
* | | | | | | LE: Add notification sent and congestion callbacks (1/4)Andre Eisenbach2014-06-252-0/+23
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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