summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | am 5f3b7da7: Merge "camera3: Update FULL/LIMITED operational modes" into ↵Zhijun He2014-05-291-51/+41
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-preview-dev * commit '5f3b7da796c638591c27dfdf04f2c1cd85791d5b': camera3: Update FULL/LIMITED operational modes
| * | | | | | | | | | | Merge "camera3: Update FULL/LIMITED operational modes" into lmp-preview-devZhijun He2014-05-281-51/+41
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | camera3: Update FULL/LIMITED operational modesZhijun He2014-05-281-51/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2a76361868a2ab3cc1dafb08905d5f5d53052a6d
* | | | | | | | | | | | | am 060a115f: (-s ours) DO NOT MERGE - audio: audio HAL extension for routing ↵Eric Laurent2014-05-290-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and volume control * commit '060a115f44bb458a73e6540bcd890b5ab44bd7bc': DO NOT MERGE - audio: audio HAL extension for routing and volume control
| * | | | | | | | | | | | DO NOT MERGE - audio: audio HAL extension for routing and volume controlEric Laurent2014-05-282-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added audio HAL functions to control audio routing and audio gain. Audio HALs above version 3.0 must implement these functions. These functions will be used by the framework instead of out_set_parameters("routing"=XXX) for device selection on an output or input stream. They will also allow direct connection of input devices to output devices as well as gain control on devices or streams. The gain or routing capabilities are exposed in audio_polciy.conf file. Change-Id: Ic293fd41d492e38e86bdc35e3ad93aa5deb0b48f
* | | | | | | | | | | | | am a906a33d: (-s ours) DO NOT MERGE - audio HAL: add minimum supported versionEric Laurent2014-05-290-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a906a33d3045019cbc1502c3e53686b06d6302d9': DO NOT MERGE - audio HAL: add minimum supported version
| * | | | | | | | | | | | DO NOT MERGE - audio HAL: add minimum supported versionEric Laurent2014-05-281-0/+2
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a definition for the minimum audio HAL version supported by the audio framework. Change-Id: Id7df440cc9fcc23b27b61c81bacb569599a20c13
* | | | | | | | | | | | Merge "Update starting gravity of tilt definition"Etienne Le Grand2014-05-281-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | / / / / / / / | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Update starting gravity of tilt definitionEtienne Le Grand2014-05-281-2/+3
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9be79fe264b8a751757a2b6840b7ff928679028d
* | | | | | | | | | audio: add AUDIO_PARAMETER_A2DP_SOURCE_ADDRESS parameter nameMike Lockwood2014-05-281-0/+3
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6eedc25ed16be82a7a875d13774f31a47f0f9443
* | | | | | | | | am ec9236ef: am ef2c616c: Merge "Update definition of the heart rate monitor ↵Etienne Le Grand2014-05-271-10/+26
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to include confidence" into klp-modular-dev * commit 'ec9236ef18e13b40a1b28aa05b4d5f483cc6ab74': Update definition of the heart rate monitor to include confidence
| * | | | | | | | am ef2c616c: Merge "Update definition of the heart rate monitor to include ↵Etienne Le Grand2014-05-271-10/+26
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | confidence" into klp-modular-dev * commit 'ef2c616c4e45eaa1e621aa69bffb7438b1c64755': Update definition of the heart rate monitor to include confidence
| | * | | | | | | Merge "Update definition of the heart rate monitor to include confidence" ↵Etienne Le Grand2014-05-271-10/+26
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-modular-dev
| | | * | | | | | | Update definition of the heart rate monitor to include confidenceEtienne Le Grand2014-05-231-10/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I88a8cddf647f77588a283c16d37f3f99ecda3115
* | | | | | | | | | Revert "bt: add interface function to provide wakelock access"Matthew Xie2014-05-231-5/+0
| |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 19f3696f852d6787076b70a7d31f5684ad2aa93f.
* | | | | | | | | am b752c08d: am 19f3696f: bt: add interface function to provide wakelock accessDmitry Grinberg2014-05-231-0/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | / / / / | |_|_|_|/ / / / |/| | | | | | | * commit 'b752c08d1366155783894accf75fd65548b101ff': bt: add interface function to provide wakelock access
| * | | | | | | am 19f3696f: bt: add interface function to provide wakelock accessDmitry Grinberg2014-05-231-0/+5
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '19f3696f852d6787076b70a7d31f5684ad2aa93f': bt: add interface function to provide wakelock access
| | * | | | | | bt: add interface function to provide wakelock accessDmitry Grinberg2014-05-221-0/+5
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I7ea173aee49ae7fdfe81a24a9b3666efc1c29ed4
* | | | | | | am f1ee67e1: camera3: Update the HAL spec for raw cropping behaviorZhijun He2014-05-231-1/+6
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | * commit 'f1ee67e1ea6d55e4621bbd418c15fdc1aac32a84': camera3: Update the HAL spec for raw cropping behavior
| * | | | | | camera3: Update the HAL spec for raw cropping behaviorZhijun He2014-05-221-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15168075 Change-Id: I035fc833cb122a7caa4cf47a1d5be574d4727345
* | | | | | | audio: audio HAL extension for routing and volume controlEric Laurent2014-05-222-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added audio HAL functions to control audio routing and audio gain. Audio HALs above version 3.0 must implement these functions. These functions will be used by the framework instead of out_set_parameters("routing"=XXX) for device selection on an output or input stream. They will also allow direct connection of input devices to output devices as well as gain control on devices or streams. The gain or routing capabilities are exposed in audio_polciy.conf file. Change-Id: Ic293fd41d492e38e86bdc35e3ad93aa5deb0b48f
* | | | | | | audio HAL: add minimum supported versionEric Laurent2014-05-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a definition for the minimum audio HAL version supported by the audio framework. Change-Id: Id7df440cc9fcc23b27b61c81bacb569599a20c13
* | | | | | | Switch libhardware to POSIX dprintf.Elliott Hughes2014-05-222-14/+14
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15022164 Change-Id: Ie4c93318c2e7a947a57e16b220a6abceec59e6aa
* | | | | | Merge "Added basic resampling of submix data on read from the input stream."Stewart Miles2014-05-201-6/+124
|\ \ \ \ \ \
| * | | | | | Added basic resampling of submix data on read from the input stream.Stewart Miles2014-05-191-6/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As described in If592270a17e08c5852b00b730bb9c5166c746ad2 the audio mixer doesn't work correctly when sending data to an output device that supports a sample rate that is more than 2x different to the source data rate. This modifies the remote submix module to resample data from the pipe when it's read from the input stream. Bug: 11273000 Change-Id: I9c4b3710bcebf3a2df045965dfdafdd9855b0b25
* | | | | | | Revert "Revert "LE Multi ADV feature""Wei Wang2014-05-191-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit cbeca51023839d0ef4315cfced4b2d68618f5f0e. Change-Id: I3f2130217ffd616099a017db2f26d3d112f2c1ea
* | | | | | | Merge "Update HDMI-CEC HAL interface for TV"Jinsuk Kim2014-05-201-22/+130
|\ \ \ \ \ \ \
| * | | | | | | Update HDMI-CEC HAL interface for TVJinsuk Kim2014-05-201-22/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a few more API: - is_connected - get_port_info - set_option - set_audio_return_channel Also added another event type (tx_status) that reports the status of transmission. The status is reported in asynchronous fashion since the send operation can take longer due to bus conflict. Change-Id: I75decb8451a23f8a8eda0895d58f22c45227c0b3
* | | | | | | | Revert "LE Multi ADV feature"Wei Wang2014-05-201-34/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2d17c28b4f820d6edd11aecdbd172cd65e934c2f. Change-Id: I3abe730817a5b1714b0403f387a3ed416ded63f3
* | | | | | | | LE Multi ADV featureSatya Calloji2014-05-191-1/+34
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Header changes for LE Multi ADV feature Change-Id: I24a18a2f30ab1618875d3ac9ca1e9f5e5064f62d
* | | | | | | Merge "Add optional logging of input and output streams to the submix HAL."Stewart Miles2014-05-201-0/+50
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add optional logging of input and output streams to the submix HAL.Stewart Miles2014-05-191-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to aid debugging of issues with streaming data in the submix HAL this change introduces a compile time option to log the input and output streams to files for offline inspection. Bug: 11273000 Change-Id: Ib2d929d7ba66f63b719e6996df9016f73c9080aa
* | | | | | | Merge "Libhardware: HAL: Fingerprint: Add template collection progress hint; ↵Sasha Levitskiy2014-05-191-6/+30
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | remove match confidence."
| * | | | | | | Libhardware: HAL: Fingerprint: Add template collection progress hint; remove ↵Sasha Levitskiy2014-05-161-6/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | match confidence. Change-Id: I62ce57054b7e0cfda8aa260176e504113677d993 Signed-off-by: Sasha Levitskiy <sanek@google.com>
* | | | | | | | Merge "Activity Recognition HAL."Aravind Akella2014-05-191-33/+37
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Activity Recognition HAL.Aravind Akella2014-05-191-33/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add separate methods for enabling/disabling activities and rename activity constants. Change-Id: I5986f6cf6ceb12a88f3d881ac5ccb6b9b50a2e58
* | | | | | | | Implemented mono->stereo, stereo->mono channel conversion in submix HAL.Stewart Miles2014-05-161-11/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The AudioFlinger service currently will only open stereo streams from mono AudioTracks since all mixing is performed in stereo and then sent to the HAL stream. In order to allow a process to record a mono stream from the submix HAL, this change implements channel conversion in the submix HAL so that it's possible to open the output stream in stereo and the input stream in mono. Bug: 11273000 Change-Id: I840ce0be3cf7e5bc8a4c6de63a70d5408d60b716
* | | | | | | | Modified submix HAL to drop data to the output stream if the pipe could block.Stewart Miles2014-05-161-0/+19
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since it's possible to open an output stream on the submix HAL before the input stream is open, writes to the output stream that fill the shared pipe result in indefinitely blocking the thread writing to the stream. This change modifies the behavior of writes to a submix output stream such that if a write would result in blocking the thread and an input isn't open, the pipe is flushed of the appropriate amount of data such that the write will not block. Bug: 11273000 Change-Id: Ic81c50e4b44b777273191a1bc8cdf52181c3d2a0
* | | | | | | Merge "Modify submix HAL to allow either input or output streams create the ↵Stewart Miles2014-05-161-141/+232
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | pipe."
| * | | | | | | Modify submix HAL to allow either input or output streams create the pipe.Stewart Miles2014-05-161-141/+232
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is primarily being made as a short term solution to allow an input audio stream received over the network to be fed into an audio input stream (e.g the MIC stream) when a physical audio input device isn't present. This makes both the input and output streams owners of the pipe so that creation order no longer matters. In addition, it works around a memory leak caused by applications that never close input streams. Bug: 11273000 Change-Id: I5a3fb0b6f2148c113b2f3050b72ff2a8979a3e6d
* | | | | | | | Add ARC commandsJungshik Jang2014-05-161-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ARC, Audio Return Channel is newly introduced in HDMI CEC 1.4. Here is a list of new command <Initiate ARC> <Report ARC Initiated> <Report ARC Terminated> <Request ARC Initiation> <Request ARC Termination> <Terminate ARC> Along with it replaced <Get OSD Name> with <Give OSD Name> which is renamed in CEC 1.4. Change-Id: I6a03b30cf90a8f6dca54831355be05682a6df96c
* | | | | | | | am f8cbc9e6: am ad70dc48: add /system/vendor/lib as valid search path for ↵Nick Vaccaro2014-05-151-3/+5
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sensor HALs * commit 'f8cbc9e65cd67da20167a88daaa9e99bf32de8b9': add /system/vendor/lib as valid search path for sensor HALs
| * | | | | | | am ad70dc48: add /system/vendor/lib as valid search path for sensor HALsNick Vaccaro2014-05-151-3/+5
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit 'ad70dc482f044b1ef03ef1aa74b6e2c5a446d32b': add /system/vendor/lib as valid search path for sensor HALs
| | * | | | | | add /system/vendor/lib as valid search path for sensor HALsNick Vaccaro2014-05-151-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MultiHal will now accept sensor HALs listed in the hals.conf file that reside in either /system/lib/hw or /system/vendor/lib. Bug: 14994424 Change-Id: I13f17352b97c36b97cfbcee8c9b6a0d2e1ed6dc3
* | | | | | | | LE: Add API to set scan interval and window (1/4)Prerepa Viswanadham2014-05-151-1/+4
| |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Delete client_if from scan api's Change-Id: If24cb134ae7204de69c8c89664ce34f9d59da76a
* | | | | | | Allow submix module streams to use any NBAIO format.Stewart Miles2014-05-141-43/+211
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This modifies the submix module to allow the internal buffer to be any NBAIO format. This is useful when sending audio of arbitrary formats between processes. AudioFlinger continues to enforce format restrictions as specified by the device specific audio_policy.conf so the submix streams will have the same restrictions as before. Bug: 11273000 Change-Id: I2cd4ff383c5c75e491ab22bc1949c835f04e230f
* | | | | | | Modified submix buffer size accessors to use the pipe configuration.Stewart Miles2014-05-141-45/+87
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change stores the period size (fraction of the pipe buffer size) in the submix device's configuration which is then used to calculate the input and output stream buffer size. In addition, accessors for the input / output stream format have been modified to use the pipe format in the device configuration rather than returning hard coded values. Bug: 11273000 Change-Id: I9c14f8d549f4b4a6d7f77a9aeab4edfa5ba6bd1a
* | | | | | Implemented accessors for derived submix HAL objects.Stewart Miles2014-05-131-65/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change cleans up casting from contained to container structures. Such that if.. struct child { struct parent; int child_data; }; is changed to... struct child { int child_data; struct parent; }; functions that cast from "parent" to "child" will continue to function correctly. Change-Id: I88d70930d4d4df2e291239e562971b07d8b92f94
* | | | | | Described restrictions for common HAL object methods in nfc.h.Stewart Miles2014-05-121-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up from change Ibe4300275286ef275b2097534c84f1029d761d87 which extends comments to the nfc_nci_module_t and nfc_nci_device_t structures. Change-Id: I060bda450912ff3fc041027faa8f03c24e310870
* | | | | | Merge "Described restrictions for common HAL object methods."Jinsuk Kim2014-05-1214-2/+140
|\ \ \ \ \ \