summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-4.2.2_r1' of ↵Steve Kondik2013-02-121-13/+45
|\ | | | | | | | | | | https://android.googlesource.com/platform/hardware/libhardware into 1.1 Android 4.2.2 release 1
| * Fix HWC documentation.Mathias Agopian2012-11-201-13/+45
| | | | | | | | | | | | | | Specify more clearly the behavior of compositionType and hints. Change-Id: I9abdccedd904b2fba783381bf9e2f8975ede8d67
| *-. Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| |\ \ | | | | | | | | | | | | Change-Id: Ibadcd642e060d8b828b13f7c748f0dfddf751906
| | * \ merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-110-0/+0
| | |\ \
| | | * \ merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-100-0/+0
| | | |\ \
* | | | \ \ Merge "FM Radio: Add support for FM Radio in Android" into cm-10.1Jef Oliver2013-01-301-0/+172
|\ \ \ \ \ \
| * | | | | | FM Radio: Add support for FM Radio in AndroidJohan Palmaeus2013-01-211-0/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creating interface and framework for using FM Radio RX and TX from different vendors. Change-Id: I1a71aed01bfffdddfabf1cdfbfa3707cb1ed016b Signed-off-by: Benn Porscke <benn.porscke@stericsson.com>
* | | | | | | hwcomposer: Add HWC_BLIT compositiontype valueArun Kumar K.R2013-01-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - HWC_BLIT this layer will be handled in the HWC, using a blit engine - setting this will inform Surfaceflinger to flip FB_TARGET Change-Id: I25d19ec41b57863d451c3e390109c912faf1381c
* | | | | | | Add gralloc_perform enums definitionsRamkumar Radhakrishnan2013-01-231-0/+5
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define enums for gralloc_perform function use cases. Change-Id: I127ee7486b74d68b2f97e1670d9550144d6b7a3a
* | | | | | Revert "Change-Id: Ie2dcf87494c71d6da9493eddad8fe0a59ac5f0f9"Steve Kondik2012-12-221-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1966e40a05a795cdfdfa6160468cdcb8e46dd619.
* | | | | | audio: add support for VOIPMingming Yin2012-12-201-13/+6
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5dbddd245c0b20b15505dabd65c5f6d3084115cd
* | | | | | Change-Id: Ie2dcf87494c71d6da9493eddad8fe0a59ac5f0f9Shareef Ali2012-11-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | libhardware-qcom: disable a set of qcom api that don't exist
* | | | | | exynos4: gralloc: add camera and nonecache usagecodeworkx2012-11-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I53a7dfc8355a05aeae007e7d61c4d95cce125bfd
* | | | | | Extend ICS_AUDIO_BLOB back-compat to the 4.2 APIRicardo Cerqueira2012-11-231-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id58a2eb715c86f6c022e0ef625ce498661d7d29c
* | | | | | Merge branch 'jb-mr1-release' of ↵Steve Kondik2012-11-1838-427/+5399
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/hardware/libhardware into HEAD Conflicts: include/hardware/fb.h include/hardware/hwcomposer.h modules/audio/audio_hw.c Change-Id: Ib37d49cb600bf0cd062847f9c0eb3841bae13f74
| * | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-310-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-110-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-100-0/+0
| | | |\ \ \ | | | | |/ / | | | |/| / | | | | |/
| | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-090-0/+0
| | | | |\
| | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-090-0/+0
| | | | | |\ | | | | |/ / | | | |/| / | | | | |/
| | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-020-0/+0
| | | | |\
| | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-300-0/+0
| | | | | |\
| | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-300-0/+0
| | | | | | |\
| | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-220-0/+0
| | | | | | | |\
| | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-210-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-190-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-180-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-160-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-140-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-140-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-130-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-110-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-090-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-050-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-030-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-280-0/+0
| | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-270-0/+0
| | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-230-0/+0
| | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-220-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-210-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-200-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-140-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Revert "Add multi-display and flip fence to HWC"Jesse Hall2012-07-312-69/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1d51b2b9fc713da6de18117bc19508ecdfde4f23 Change-Id: I1ae46d8cae1cb3064800cd24df56347b05eb6059
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shutdown audio pipe when closing input streamJean-Michel Trivi2012-10-301-2/+16
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Writing to the audio pipe for the remote submix is blocking, unless the audio output pipe is in shutdown mode. The playback thread could stay blocked on the write if the input stream has already been closed. The change consists in shutting down the pipe also when the input stream gets closed. When the pipe is in this state, simulate timing in the write operation so we don't drain the output faster than realtime. Bug 7424646 Change-Id: I5feb3be642b0ee7eef10dee0141308684ee9c811
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Support querying active record sourcesJean-Michel Trivi2012-10-101-0/+3
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for querying whether there is currently a recording underway from the specified audio source. Bug 7314859 Change-Id: I270f27eff4dcf1cc179089859a4c690140825ad1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | hwcomposer: Specify set() call error behavior.Jamie Gennis2012-10-081-3/+10
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7308829 Change-Id: Ibab6f0d2929860f02c17d6ffadb326fc0c333c4d
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "NFC HAL: Use a separate callback for data." into jb-mr1-devMartijn Coenen2012-10-012-23/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |