summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-03-11am 3a18bccc: (-s ours) am 431cd416: (-s ours) Reconcile with jb-mr1-release ↵jb-mr1.1-devJean-Baptiste Queru
- do not merge * commit '3a18bcccb201b37e5b0cdff76febafb214cb8b90':
2013-03-11am 431cd416: (-s ours) Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru
* commit '431cd41604208d7c30788d6e3c6655a34fd3e157':
2013-03-11Reconcile with jb-mr1-release - do not mergejb-mr1-devJean-Baptiste Queru
2012-11-20Fix HWC documentation.android-cts-4.2_r2android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1jb-mr1.1-releaseMathias Agopian
Specify more clearly the behavior of compositionType and hints. Change-Id: I9abdccedd904b2fba783381bf9e2f8975ede8d67
2012-11-06Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project
Change-Id: Ibadcd642e060d8b828b13f7c748f0dfddf751906
2012-10-31merge in jb-mr1-release history after reset to jb-mr1-devandroid-cts-4.2_r1android-4.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1jb-mr1-releaseThe Android Automerger
2012-10-30Shutdown audio pipe when closing input streamandroid-sdk-support_r11Jean-Michel Trivi
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
2012-10-11merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger
2012-10-11merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger
2012-10-10Support querying active record sourcesJean-Michel Trivi
Add support for querying whether there is currently a recording underway from the specified audio source. Bug 7314859 Change-Id: I270f27eff4dcf1cc179089859a4c690140825ad1
2012-10-10merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger
2012-10-10merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger
2012-10-09merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger
2012-10-09merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger
2012-10-08hwcomposer: Specify set() call error behavior.Jamie Gennis
Bug: 7308829 Change-Id: Ibab6f0d2929860f02c17d6ffadb326fc0c333c4d
2012-10-02merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger
2012-10-01Merge "NFC HAL: Use a separate callback for data." into jb-mr1-devMartijn Coenen
2012-09-30merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger
2012-09-30Merge "bug 7253033 Add "exiting" state to remote audio submix module" into ↵Jean-Michel Trivi
jb-mr1-dev
2012-09-30bug 7253033 Add "exiting" state to remote audio submix moduleJean-Michel Trivi
Support receiving a parameter that sets the remote audio submix module in a state where the audio pipe will unblock any current write operation and not block anymore. Change-Id: Ia3119cd79972afff0de24187dae627855a468ebf
2012-09-30NFC HAL: Use a separate callback for data.Martijn Coenen
Bug: 7258325 Change-Id: I02d8ea1bdcb8ea6a9430e3dc286f5c2647277f72
2012-09-30merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger
2012-09-27Camera2: Change JPEG transport headerAlex Ray
The way buffers are passed to JPEG encoders makes it difficult to account for a header offset. This explains moving the header to the end, and clarifies the required header packing. Bug: 7108816 Change-Id: I569cd0cde37bd6fd7110fbc95d7fced9a55cff9c
2012-09-22merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger
2012-09-21Merge "Camera2: Add JPEG transport header" into jb-mr1-devEino-Ville Talvala
2012-09-21merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger
2012-09-20Merge "Document reentrancy and error conditions" into jb-mr1-devJesse Hall
2012-09-19Document reentrancy and error conditionsJesse Hall
The hotplug callback is non-reentrant. The display config functions return an error if called for a disconnected display type. Change-Id: I52d11a53f9b30a7c39e98b0a9b07eb97a3d2becd
2012-09-19Camera2: Add JPEG transport headerEino-Ville Talvala
To simplify passing compressed JPEG data between the HAL and the camera service, add a transport header for use with JPEG streams. Bug: 7108816 Change-Id: I91060051f59032e66eaaab3ee9f651badd1f2ac0
2012-09-19merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger
2012-09-18Initial Bluetooth open source releaseAndre Eisenbach
Change-Id: I27bb95db854806d7deedaf6c622b17cb09f62f16
2012-09-18merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger
2012-09-17Remote submix: fix sink/source reference count handlingJean-Michel Trivi
The reference count on the strong pointers to the audio sink and source should be done on the object retrieved from the device structure, not by accessing the corresponding fields, as they can be cleared while reading or writing audio data. Change-Id: I446a2c7bdcb0758b4013b0ad75450a15203fb9da
2012-09-17Turn off logs in remote submix audio moduleJean-Michel Trivi
Change-Id: I61cd15534b1cd764b06f615569cdf02edbba909c
2012-09-17Remote audio submix: blocking writes and sleeping reads.Jean-Michel Trivi
Change how the remote audio submix is handling piping audio through the pipe: - use a MonoPipe as audio sink for blocking writes, - use a MonoPipeReader as audio source for non blocking reads, and keep track of when recording started to align the time at which the in_read() call should return with the projected time of the recording duration. Change-Id: I8b0f8c56a0486806101e272dfbf9c6d2d1c11112
2012-09-16merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger
2012-09-15Delete headers that have been movedJean-Baptiste Queru
Change-Id: I72e81a3ea789fe15d5a6cea281ebe43f82220669
2012-09-14Merge "Layer flags won't change between prepare and set" into jb-mr1-devMathias Agopian
2012-09-14Layer flags won't change between prepare and setJesse Hall
Change-Id: I0f25766976e4f783066e5b6fd917d1769906e43e
2012-09-14merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger
2012-09-14Initial NFC HAL for NCI controllers.Martijn Coenen
Bug: 7123942 Change-Id: Ic64aa6477f2eb65b489b3be5d49ad21ccce63e2d
2012-09-14merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger
2012-09-13Camera2: Add CAMERA2_HAL_PIXEL_FORMAT_ZSL temporarily.Eino-Ville Talvala
Until all HAL implementations move to the new gralloc format selection scheme, define FORMAT_ZSL for indicating ZSL streams. Bug: 6243944 Change-Id: I90249beaaca5da80c9464eedd6aa9d3648bb56cc
2012-09-13Merge "Remote submix audio module: sleep less, log errors" into jb-mr1-devJean-Michel Trivi
2012-09-13Remote submix audio module: sleep less, log errorsJean-Michel Trivi
Neither write nor read are blocking, but write simulates timing by checking the clock between two writes and computing how long the next sleep should last. Change-Id: I495ae6d44b0cf75a24fe4b70662cfac679049c67
2012-09-13merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger
2012-09-12Add outbuf fields for HWC 1.2 virtual displaysJesse Hall
Also rename HWC_DISPLAY_RESOLUTION_* to HWC_DISPLAY_WIDTH and HWC_DISPLAY_HEIGHT for consistency. Change-Id: Iabe6db0816f6f6eaaac24c3c9ae554177bcabf1d
2012-09-11merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger
2012-09-10update audio remote submix API revisionEric Laurent
Update remote submix audio HAL API revision to 2.0 (new audio device enums). Change-Id: I61d5faf498144002929e570ee50375b059fb17c5
2012-09-09merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger