summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | am c2a0b248: Merge "Update HDMI-CEC HAL interface definition" into klp-modula...Jinsuk Kim2014-04-291-25/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "Update HDMI-CEC HAL interface definition" into klp-modular-devJinsuk Kim2014-04-291-25/+17
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | Update HDMI-CEC HAL interface definitionJinsuk Kim2014-04-131-25/+17
* | | | | | | | | | | | | | | | | | | Merge "Add symbol AUDIO_PARAMETER_KEY_BT_SCO_WB"Glenn Kasten2014-04-291-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Add symbol AUDIO_PARAMETER_KEY_BT_SCO_WBGlenn Kasten2014-04-291-0/+3
* | | | | | | | | | | | | | | | | | | | Merge "Activity Recognition HAL."Aravind Akella2014-04-291-0/+186
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Activity Recognition HAL.Aravind Akella2014-04-281-0/+186
* | | | | | | | | | | | | | | | | | | | | Merge "USB HAL: 64-bit compile issues"Mark Salyzyn2014-04-291-29/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | USB HAL: 64-bit compile issuesMark Salyzyn2014-04-281-29/+30
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge "camera3: Update camera3_jpeg_blob_t for max jpeg size change"Zhijun He2014-04-291-11/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | camera3: Update camera3_jpeg_blob_t for max jpeg size changeZhijun He2014-04-281-11/+12
* | | | | | | | | | | | | | | | | | | | | Added support for 1-channel capture sources (like a microphone)Paul McLean2014-04-281-18/+55
| |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge "USB HAL Capture Implementation"Paul McLean2014-04-251-199/+408
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | USB HAL Capture ImplementationPaul McLean2014-04-241-199/+408
* | | | | | | | | | | | | | | | | | | | Hardware: Fingerprint: Fix structure name.Sasha Levitskiy2014-04-241-2/+2
* | | | | | | | | | | | | | | | | | | | Merge "Define new wake_up sensors in sensors.h"Aravind Akella2014-04-242-7/+136
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Define new wake_up sensors in sensors.hAravind Akella2014-04-232-7/+136
* | | | | | | | | | | | | | | | | | | | | Merge "Hardware: Fingerprint: Fix the remove() argument, typos."Sasha Levitskiy2014-04-232-8/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Hardware: Fingerprint: Fix the remove() argument, typos.Sasha Levitskiy2014-04-232-8/+8
* | | | | | | | | | | | | | | | | | | | | | Camera: HAL: 64-bit warning fixit.Sasha Levitskiy2014-04-237-74/+98
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge "Hardware: Fingerprint: Move the HAL to an async model, add some vendor...Sasha Levitskiy2014-04-223-47/+79
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Hardware: Fingerprint: Move the HAL to an async model, add some vendor reques...Sasha Levitskiy2014-04-223-47/+79
| |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Camera2: Tests: 64-bit warning fixitSasha Levitskiy2014-04-212-14/+16
* | | | | | | | | | | | | | | | | | | | am 6322562d: am c070bad4: Merge changes I672d4ee8,I6a2183b5,If0c0135eColin Cross2014-04-214-10/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | am c070bad4: Merge changes I672d4ee8,I6a2183b5,If0c0135eColin Cross2014-04-214-10/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge changes I672d4ee8,I6a2183b5,If0c0135eColin Cross2014-04-194-10/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | usbaudio: allow compiling for 64-bitColin Cross2014-04-181-1/+1
| | | * | | | | | | | | | | | | | | | | audio_remote_submix: allow compiling for 64-bitColin Cross2014-04-182-7/+8
| | | * | | | | | | | | | | | | | | | | audio: allow compiling for 64-bitColin Cross2014-04-181-2/+2
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | am 2131c7c5: am cb3a62ea: Merge "keymaster: add flags indicating feature supp...Kenny Root2014-04-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | am cb3a62ea: Merge "keymaster: add flags indicating feature support"Kenny Root2014-04-181-2/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | Merge "keymaster: add flags indicating feature support"Kenny Root2014-04-181-2/+29
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | keymaster: add flags indicating feature supportKenny Root2013-10-251-2/+29
* | | | | | | | | | | | | | | | | | | keymaster: add flags indicating feature supportKenny Root2014-04-181-2/+29
* | | | | | | | | | | | | | | | | | | am dbcec633: am dd6e1a01: Merge "Reduced most MultiHal ALOGI to ALOGV, reduci...Aaron Whyte2014-04-161-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | am dd6e1a01: Merge "Reduced most MultiHal ALOGI to ALOGV, reducing bootup log...Aaron Whyte2014-04-161-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "Reduced most MultiHal ALOGI to ALOGV, reducing bootup logspam." into k...Aaron Whyte2014-04-161-7/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | Reduced most MultiHal ALOGI to ALOGV, reducing bootup logspam.Aaron Whyte2014-04-151-7/+7
* | | | | | | | | | | | | | | | | | | | am 311c8922: (-s ours) am 40208a8b: DO NOT MERGE Fix PAN control callback ...Ariel Gertzenstein2014-04-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am 40208a8b: DO NOT MERGE Fix PAN control callback definition to match wha...Ariel Gertzenstein2014-04-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | DO NOT MERGE Fix PAN control callback definition to match what bluedroid i...Ariel Gertzenstein2014-04-161-2/+2
| | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | am da38fb2d: am 4d7ac52d: Fixed multihal handling of nonexistent sensor handles.Aaron Whyte2014-04-151-17/+65
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | am 4d7ac52d: Fixed multihal handling of nonexistent sensor handles.Aaron Whyte2014-04-151-17/+65
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | Fixed multihal handling of nonexistent sensor handles.Aaron Whyte2014-04-151-17/+65
| | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge "Remove offset checks for reserved fields in sensor_t and sensors_event...Aravind Akella2014-04-111-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Remove offset checks for reserved fields in sensor_t and sensors_event_t.Aravind Akella2014-04-111-2/+0
* | | | | | | | | | | | | | | | | | | Merge "Add heart rate monitor, stringType and requiredPermissions to sensors.h"Aravind Akella2014-04-111-4/+99
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Add heart rate monitor, stringType and requiredPermissions to sensors.hAravind Akella2014-04-101-4/+99
* | | | | | | | | | | | | | | | | | | | am 7e027537: (-s ours) am d5b3c73d: Merge "DO NOT MERGE Add heart rate monito...Aravind Akella2014-04-110-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | am d5b3c73d: Merge "DO NOT MERGE Add heart rate monitor, stringType and requi...Aravind Akella2014-04-111-4/+99
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |