summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add delete_all to keymaster APIKenny Root2012-03-262-0/+55
* add support for setting the background colorMathias Agopian2012-03-241-35/+80
* Use frameworks/native copy of UniquePtr.hKenny Root2012-03-222-2/+1
* Fix camera2.h header.Eino-Ville Talvala2012-03-221-6/+6
* Merge "Reorganize camera HAL, and add versioning support."Eino-Ville Talvala2012-03-223-41/+444
|\
| * Reorganize camera HAL, and add versioning support.Eino-Ville Talvala2012-03-213-41/+444
* | Merge remote-tracking branch 'goog/ics-aah-exp'Mike Lockwood2012-03-210-0/+0
|\ \ | |/ |/|
| * am a9b677fc: Merge "improve h/w composer documentation" into ics-mr1Mathias Agopian2011-11-281-0/+5
| |\
| * \ am 29ead941: Gralloc: add a usage bit for video encodingJamie Gennis2011-11-221-21/+23
| |\ \
| * \ \ am fb410365: improve hw composer documentationMathias Agopian2011-11-161-0/+5
| |\ \ \
| * \ \ \ am e9eaf372: improve sensor HAL documentationMathias Agopian2011-11-091-49/+42
| |\ \ \ \
| * \ \ \ \ resolved conflicts for merge of 45065f97 to ics-aahMartijn Coenen2011-11-074-1/+192
| |\ \ \ \ \
| * \ \ \ \ \ am 15879d89: change sensor HAL documentation to allow setting polling rate fo...Mathias Agopian2011-11-041-6/+9
| |\ \ \ \ \ \
| * \ \ \ \ \ \ keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl2011-10-280-0/+0
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ undo reset to ics-mr1 until we have a better methodEd Heyl2011-10-260-0/+0
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ reset to ics-mr1, but keep historyEd Heyl2011-10-260-0/+0
| | | |\ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | am 7567eba2: (-s ours) Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGESteve Block2011-10-260-0/+0
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ am cf209523: am 7bd7dd5d: am 3c935eda: resolved conflicts for merge of 33fddf...David 'Digit' Turner2011-09-271-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | * | | | | | | | | am cc3f6a34: improve sensor HAL testMathias Agopian2011-09-261-49/+49
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Modifications to audio_hal for Android@Home Tungsten.Mike J. Chen2011-08-252-0/+31
| | * | | | | | | | | | Add a HAL representing a system-wide local time counter.Mike J. Chen2011-08-254-1/+261
| * | | | | | | | | | | Modifications to audio_hal for Android@Home Tungsten.Mike J. Chen2011-10-282-0/+31
| * | | | | | | | | | | Add a HAL representing a system-wide local time counter.Mike J. Chen2011-10-284-1/+261
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | hardware: add hardware_device_api_version() macroDima Zavin2012-03-211-1/+6
* | | | | | | | | | | Merge "libhardware: add current HAL version and a module version macro"Dima Zavin2012-03-211-0/+23
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | libhardware: add current HAL version and a module version macroDima Zavin2012-03-201-0/+23
* | | | | | | | | | | | Merge changes Ie543d3a9,I3e33e5a9Dima Zavin2012-03-201-6/+57
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | hardware: provide temp version defines for source compatibilityDima Zavin2012-03-201-0/+7
| * | | | | | | | | | | hardware: rename version_major/minor to module/hal api versionDima Zavin2012-03-201-6/+50
* | | | | | | | | | | | Add tests for keymaster APIKenny Root2012-03-192-0/+784
|/ / / / / / / / / / /
* | | | | | | | | | | Merge "Update keymaster API to final signing spec"Kenny Root2012-03-131-23/+100
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update keymaster API to final signing specKenny Root2012-03-131-23/+100
* | | | | | | | | | | | am 6d2bc4fc: am 4cbd62c2: add i2c_device_address member to nfc_pn544_device_tRakesh Goyal2012-03-092-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am 4cbd62c2: add i2c_device_address member to nfc_pn544_device_tRakesh Goyal2012-03-092-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | add i2c_device_address member to nfc_pn544_device_tRakesh Goyal2012-03-092-0/+6
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
* | | | | | | | | | | | | audio policy: use audio_devices_t when appropriateEric Laurent2012-03-082-2/+2
* | | | | | | | | | | | | audio HAL : added string for A2DP addressEric Laurent2012-03-071-0/+3
| |_|/ / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Update comments to reflect audio channel mask type name changeJean-Michel Trivi2012-03-051-2/+2
* | | | | | | | | | | | Merge "HWComposer: update the hwc_layer::handle docs"Mathias Agopian2012-02-201-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | HWComposer: update the hwc_layer::handle docsJamie Gennis2011-12-201-2/+6
* | | | | | | | | | | | | Merge "Power HAL: Add initial header file and default/legacy implementation"Todd Poynor2012-02-174-1/+185
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Power HAL: Add initial header file and default/legacy implementationTodd Poynor2012-02-174-1/+185
* | | | | | | | | | | | | | Add hardware API for key handlingKenny Root2012-02-161-0/+102
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Modifications to audio_hal for Android@Home.Mike J. Chen2012-02-103-1/+32
* | | | | | | | | | | | | Add a HAL representing a system-wide local time counter.Mike J. Chen2012-02-104-1/+261
* | | | | | | | | | | | | Merge "Effect UUID inputs passed by pointer are const"Glenn Kasten2012-02-081-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Effect UUID inputs passed by pointer are constGlenn Kasten2012-01-301-2/+2
* | | | | | | | | | | | | | Merge "Use audio_in_acoustics_t consistently"Glenn Kasten2012-02-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Use audio_in_acoustics_t consistentlyGlenn Kasten2012-01-271-1/+1
* | | | | | | | | | | | | | Use audio_source_t consistentlyGlenn Kasten2012-01-262-3/+3
|/ / / / / / / / / / / / /