summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | am bde6c2bb: am b1a12188: Merge "Define keymaster HAL v0.4."Shawn Willden2015-01-222-166/+1140
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | * commit 'bde6c2bb3fca4bc0665701ac99fa2b5b9673a6d6': Define keymaster HAL v0.4.
| * | | am b1a12188: Merge "Define keymaster HAL v0.4."Shawn Willden2015-01-222-166/+1140
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'b1a1218845eb32564b2f7f0297096ec43b27e41b': Define keymaster HAL v0.4.
| | * | Merge "Define keymaster HAL v0.4."Shawn Willden2015-01-222-166/+1140
| | |\ \
| | | * | Define keymaster HAL v0.4.Shawn Willden2015-01-222-166/+1140
| | | | | | | | | | | | | | | | | | | | Change-Id: I040412443bbbe25bce3d44759d710b78eac36caa
* | | | | am 1d1bf8b5: am 8b7eca86: CEC: Add a new flag for set_optionJinsuk Kim2015-01-191-0/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '1d1bf8b5f648abad900b16eabdfd0813e5d6a6a2': CEC: Add a new flag for set_option
| * | | | am 8b7eca86: CEC: Add a new flag for set_optionJinsuk Kim2015-01-191-0/+9
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit '8b7eca867492d8a08285059492ce5697b68b5821': CEC: Add a new flag for set_option
| | * | | CEC: Add a new flag for set_optionJinsuk Kim2015-01-191-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a flag to pass system language information to HAL so that it can respond to <Get Menu Language> in standby mode. Bug: 19054079 Change-Id: Iada00307202f5c9429944184b62b6456b624125a
* | | | | usbcamera: initial implementation of default usb camera HALZhijun He2015-01-1514-1/+1877
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Basic skeleton of usb camera hal implementation * Vendor tag is not supported yet * Further usb camera hal implementation can be filled into UsbCamera.cpp * Hot plug thread need to be implemented Change-Id: Ida63b6d640e32192f5b60a280d9d5106d80e523f
* | | | | camera_common: add torch mode APIs for flashlightChien-Yu Chen2015-01-153-6/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add torch mode APIs to support flashlight without opening any camera devices. Bug: 2682206 Change-Id: Ida46bb878962caf305f3e97051b15e0465fe8c02
* | | | | Technical Debt Paydown - move/rename filesPaul McLean2015-01-1310-1096/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved audio (alsa actually) utils files to system/core/alsa_utils. Renamed "audio" utilities to "alsa" to better relect their purpose. Renamed audio_hw.c -> to audio_hal. c to better reflect its purpose. Change-Id: I67c7d47ee02abafd3e12c4c99d605a62e0f59122
* | | | | am e6499429: Merge commit \'83b47a68\' into manualmergeEric Laurent2015-01-101-2/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'e64994292cb02fae66f04002e1121d29979503d1': usb audio: Fix incorrect bytes returned for recording
| * | | | Merge commit '83b47a68' into manualmergeEric Laurent2015-01-091-2/+4
| |\ \ \ \ | | |/ / /
| | * | | usb audio: Fix incorrect bytes returned for recordingPavan Chikkala2015-01-091-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a recording session , the number of bytes read is not updated when pcm_read() fails. This results in silence/invalid data being added during a device switch from USB headset to handset. Fix is to reset the number of bytes read if pcm_read() returns an error indicating removal of USB headset. Bug: 18611518 Change-Id: I10d578c3cf1037c90a891e63be2bd1c2b7e6126b
* | | | | Merge "Multi-USB device support & read device on open."Paul McLean2015-01-092-34/+63
|\ \ \ \ \
| * | | | | Multi-USB device support & read device on open.Paul McLean2015-01-082-34/+63
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8b6dd33be1915db764eeaefec5a5da1e9d02dc87
* | | | | | am 7e9abab1: am b338957d: Merge "usbaudio: Return 0 bytes on failure in capture"Eric Laurent2015-01-091-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | * commit '7e9abab1940091b4c4d7589160855870fdda437e': usbaudio: Return 0 bytes on failure in capture
| * | | | am b338957d: Merge "usbaudio: Return 0 bytes on failure in capture"Eric Laurent2015-01-091-0/+4
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit 'b338957d02528e5b51a15c5ce21e96fad4ff4a6f': usbaudio: Return 0 bytes on failure in capture
| | * | | Merge "usbaudio: Return 0 bytes on failure in capture"Eric Laurent2015-01-091-0/+4
| | |\ \ \
| | | * | | usbaudio: Return 0 bytes on failure in captureViswanath L2015-01-091-0/+4
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return 0 bytes from in_read() in failure conditions so that invalid data is not recorded. Change-Id: I9a6294e4162fa642fd7e160a32d1ad16f255ff62
* | | | | Merge "Line length 100"Glenn Kasten2014-12-302-9/+12
|\ \ \ \ \
| * | | | | Line length 100Glenn Kasten2014-12-302-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaef5bcaec19a9e383432c8c8460bcdf1115f1072
* | | | | | am 06fcfc50: am 02e30945: Merge "Fix missing #includes in hardware/libhardware."Elliott Hughes2014-12-301-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | * commit '06fcfc506c44724bbd8089e8971b77aa8edfdde8': Fix missing #includes in hardware/libhardware.
| * | | | am 02e30945: Merge "Fix missing #includes in hardware/libhardware."Elliott Hughes2014-12-301-0/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '02e3094598ced8b05c9614d6070556d20328ef43': Fix missing #includes in hardware/libhardware.
| | * | | Merge "Fix missing #includes in hardware/libhardware."Elliott Hughes2014-12-291-0/+2
| | |\ \ \
| | | * | | Fix missing #includes in hardware/libhardware.Elliott Hughes2014-12-291-0/+2
| | |/ / / | | | | | | | | | | | | | | | Change-Id: If7c72054bf79b89c3d7a544956da671c3b404269
* | | | | am 7b30900d: (-s ours) am 781bb3f7: DO NOT MERGE - fix: memory leaksoon1.choi2014-12-180-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '7b30900df70f34cb24c676e458c322ba9e8525d6': DO NOT MERGE - fix: memory leak
| * | | | am 781bb3f7: DO NOT MERGE - fix: memory leaksoon1.choi2014-12-180-0/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit '781bb3f72e2706f07ee8bcc0c140201faf07c35c': DO NOT MERGE - fix: memory leak
| | * | | DO NOT MERGE - fix: memory leaksoon1.choi2014-12-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | free momory for str_parms to prevent memory leak. cherry-pcik from aosp c357157e28dc0ffd069b80aeba9bf8b9eed72c9a Bug: 18798194. Change-Id: I7df5567d665554dbd4646c881f0f48b0c568c5fe
* | | | | am 68be24b1: am ce0bbb97: Merge "fix: memory leak"Eric Laurent2014-12-181-0/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '68be24b1cc2bad01d9257f76faabd92dbfc6c3e8': fix: memory leak
| * | | | am ce0bbb97: Merge "fix: memory leak"Eric Laurent2014-12-181-0/+2
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit 'ce0bbb97c12b712b75d0df42ce2f6e3f35d8db72': fix: memory leak
| | * | | Merge "fix: memory leak"Eric Laurent2014-12-181-0/+2
| | |\ \ \
| | | * | | fix: memory leaksoon1.choi2014-12-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | free momory for str_parms to prevent memory leak. Change-Id: I7df5567d665554dbd4646c881f0f48b0c568c5fe
* | | | | | am 981a952c: am 4b280b0c: CEC: Add a parameter port ID to ↵Jinsuk Kim2014-12-171-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set_audio_return_channel * commit '981a952c5f182727ec306b4e194c50792b303667': CEC: Add a parameter port ID to set_audio_return_channel
| * | | | | am 4b280b0c: CEC: Add a parameter port ID to set_audio_return_channelJinsuk Kim2014-12-171-1/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | * commit '4b280b0cd07a380feb4653b911ddcb3a31e73797': CEC: Add a parameter port ID to set_audio_return_channel
| | * | | | CEC: Add a parameter port ID to set_audio_return_channelJinsuk Kim2014-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL addresses the cases where TV has more than one ARC-supported HDMI ports. Bug: 18781204 Change-Id: I4eaeb755caf2552b826a7322d19ee671407ee43f
* | | | | | am 6bafdcb5: am 4f1fe2f5: Merge "Fix build in C++11 mode"Dan Albert2014-12-173-8/+7
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '6bafdcb5083b81d295676ee0ff75f62b31214150': Fix build in C++11 mode
| * | | | | am 4f1fe2f5: Merge "Fix build in C++11 mode"Dan Albert2014-12-173-8/+7
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit '4f1fe2f59889d88ed026596c1841043db7edbc6f': Fix build in C++11 mode
| | * | | | Merge "Fix build in C++11 mode"Dan Albert2014-12-173-8/+7
| | |\ \ \ \
| | | * | | | Fix build in C++11 modeBernhard Rosenkränzer2014-12-123-8/+7
| | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build in C++11 mode instead of reverting to C++98 mode. (Fixes some constructs that were mistaken for C++11 literals and a use of the std::ostream(NULL) constructor). Building in C++98 mode causes clang to fall over conflicting definitions of char16_t. Change-Id: I66230eeb960f4a894d6c98fe7935ec932569c5a4 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | | am 14a4dd89: am cecfb56c: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."Ying Wang2014-12-161-1/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '14a4dd8907557760cc0d7d72246444a21e9ddfe1': Cleanup Obsolete LOCAL_PRELINK_MODULE.
| * | | | | am cecfb56c: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."Ying Wang2014-12-161-1/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'cecfb56c5192fe1517a8e1b5910f16961db4a231': Cleanup Obsolete LOCAL_PRELINK_MODULE.
| | * | | | Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."Ying Wang2014-12-161-1/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Cleanup Obsolete LOCAL_PRELINK_MODULE.Ying Wang2014-12-161-1/+0
| | |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 18675947 Change-Id: I62157cd4bfab0edb445dd6543eb47a981e642848
* | | | | Renaming generic-sounding filenames to indicate "audio".Paul McLean2014-12-158-14/+14
| | | | | | | | | | | | | | | | | | | | Change-Id: Iba6403a3493379c39d22d23b438f028efc2e15b7
* | | | | Technical debt paydownPaul McLean2014-12-153-87/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed unused function. Removed unused data table. Cleaned up TAG strings. Change-Id: I4c5dbd72f7363dd0a7a60eb2498e122adda43211
* | | | | am 5c8b899d: am 2cbdfa9c: usbaudio: reset profile on device disconnectHaynes Mathew George2014-12-121-3/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '5c8b899d7c80f012599b984143cb31334ee61372': usbaudio: reset profile on device disconnect
| * | | | am 2cbdfa9c: usbaudio: reset profile on device disconnectHaynes Mathew George2014-12-121-3/+8
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit '2cbdfa9c991fc63f52f48831e5509fcc2889db77': usbaudio: reset profile on device disconnect
| | * | | usbaudio: reset profile on device disconnectHaynes Mathew George2014-12-111-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset ALSA device profile on disconnect event. Entries like supported sample rates, channel counts, formats will be repopulated on next connect. CRs-Fixed: 765434 Change-Id: I27d3b7fd7ff22646996f58c53de08547b1a1fb6a Bug: 18606219
* | | | | am de148628: am 257fde6e: Reroute submix HAL: fix race condition on output stateJean-Michel Trivi2014-12-101-3/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'de148628b9850492fad26c801d0eb663d14400cb': Reroute submix HAL: fix race condition on output state
| * | | | am 257fde6e: Reroute submix HAL: fix race condition on output stateJean-Michel Trivi2014-12-101-3/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '257fde6eb533b890776c8c45be8b61c48ab04945': Reroute submix HAL: fix race condition on output state