summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | | | | Merge "DO NOT MERGE Add heart rate monitor, stringType and requiredPermission...Aravind Akella2014-04-111-4/+99
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | DO NOT MERGE Add heart rate monitor, stringType and requiredPermissions to se...Aravind Akella2014-04-081-4/+99
* | | | | | | | | | | | | | | | | | | | | Merge "tv_input: add buffer producer profile"Wonsik Kim2014-04-112-7/+108
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | tv_input: add buffer producer profileWonsik Kim2014-04-092-7/+108
* | | | | | | | | | | | | | | | | | | | | Camera2 test: fix build break due to change in camera service.Jianing Wei2014-04-103-7/+9
* | | | | | | | | | | | | | | | | | | | | Merge "Remove deprecated BufferQueue constructor"Dan Stoza2014-04-083-15/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Remove deprecated BufferQueue constructorDan Stoza2014-04-073-15/+25
* | | | | | | | | | | | | | | | | | | | | Hardware: Fingerprint: Add current version.Sasha Levitskiy2014-04-071-1/+1
* | | | | | | | | | | | | | | | | | | | | Hardware: Fingerprint: Introducing Fingerprint HALSasha Levitskiy2014-04-077-1/+332
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | am e6bee250: (-s ours) am 71a50543: Merge "Revert "Add heart rate monitor, st...Etienne Le Grand2014-04-050-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am 71a50543: Merge "Revert "Add heart rate monitor, stringType and requiredPe...Etienne Le Grand2014-04-051-99/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | Merge "Revert "Add heart rate monitor, stringType and requiredPermissions to ...Etienne Le Grand2014-04-051-99/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | Revert "Add heart rate monitor, stringType and requiredPermissions to sensors.h"Etienne Le Grand2014-04-051-99/+4
* | | | | | | | | | | | | | | | | | | | am 66fad0e3: (-s ours) am 61c78d98: Merge "Add heart rate monitor, stringType...Etienne Le Grand2014-04-050-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am 61c78d98: Merge "Add heart rate monitor, stringType and requiredPermission...Etienne Le Grand2014-04-051-4/+99
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | Merge "Add heart rate monitor, stringType and requiredPermissions to sensors....Etienne Le Grand2014-04-051-4/+99
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | Add heart rate monitor, stringType and requiredPermissions to sensors.hEtienne Le Grand2014-04-031-4/+99
* | | | | | | | | | | | | | | | | | | | Merge "Revert "Fix Merge conflict (Add heart rate monitor ...to sensors.h)""JP Abgrall2014-04-050-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Revert "Fix Merge conflict (Add heart rate monitor ...to sensors.h)"JP Abgrall2014-04-051-99/+4
* | | | | | | | | | | | | | | | | | | | | Merge "Revert "Fix Merge conflict (Add heart rate monitor ...to sensors.h)""Etienne Le Grand2014-04-051-99/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Revert "Fix Merge conflict (Add heart rate monitor ...to sensors.h)"Etienne Le Grand2014-04-051-99/+4
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge "Revert "Remove offset checks for reserved fields in sensor_t and senso...Etienne Le Grand2014-04-051-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | / / / / / / / / / / / / / / / / | | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Revert "Remove offset checks for reserved fields in sensor_t and sensors_even...Etienne Le Grand2014-04-051-0/+2
* | | | | | | | | | | | | | | | | | | | Fix Merge conflict (Add heart rate monitor ...to sensors.h)JP Abgrall2014-04-041-4/+99
* | | | | | | | | | | | | | | | | | | | Merge "Remove offset checks for reserved fields in sensor_t and sensors_event...Aravind Akella2014-04-051-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Remove offset checks for reserved fields in sensor_t and sensors_event_t.Aravind Akella2014-04-041-2/+0
* | | | | | | | | | | | | | | | | | | | Merge "Initial implementation of usb audio I/O"Paul McLean2014-04-011-55/+711
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Initial implementation of usb audio I/OPaul McLean2014-03-311-55/+711
* | | | | | | | | | | | | | | | | | | | | am ec580a3f: am 925855b5: Merge "LE: Add API to configure MTU for a given con...Zhihai Xu2014-03-311-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | am 925855b5: Merge "LE: Add API to configure MTU for a given connection (1/4)...Zhihai Xu2014-03-311-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge "LE: Add API to configure MTU for a given connection (1/4)" into klp-mo...Zhihai Xu2014-03-311-0/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | LE: Add API to configure MTU for a given connection (1/4)Andre Eisenbach2014-03-251-0/+7
* | | | | | | | | | | | | | | | | | | | | | Merge "hal3: Update documentation regarding hardware block operating modes."Ruben Brunk2014-03-311-0/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | hal3: Update documentation regarding hardware block operating modes.Ruben Brunk2014-03-271-0/+27
| | |_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | am b9254286: am 3bc29d3e: Merge "Added message_abort and operand enums" into ...Jinsuk Kim2014-03-311-7/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | am 3bc29d3e: Merge "Added message_abort and operand enums" into klp-modular-devJinsuk Kim2014-03-311-7/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "Added message_abort and operand enums" into klp-modular-devJinsuk Kim2014-03-311-7/+22
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Added message_abort and operand enumsJinsuk Kim2014-03-241-7/+22
| | | | |_|/ / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | am ab140462: am 37de84bc: Merge "Camera2 Test: fix test criteria for exposure...Eino-Ville Talvala2014-03-291-6/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | am 37de84bc: Merge "Camera2 Test: fix test criteria for exposure time"Eino-Ville Talvala2014-03-291-6/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge "Camera2 Test: fix test criteria for exposure time"Eino-Ville Talvala2014-03-291-6/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Camera2 Test: fix test criteria for exposure timeGaurav Batra2014-03-281-6/+9
| | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge "Add audio_alsaops.h"Andy Hung2014-03-281-0/+102
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Add audio_alsaops.hAndy Hung2014-03-271-0/+102
| | |_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | am 286c139b: am 93bf9964: Fix sensor multi hal crash when sub-HAL reports an ...Nick Vaccaro2014-03-251-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | am 93bf9964: Fix sensor multi hal crash when sub-HAL reports an errorNick Vaccaro2014-03-251-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Fix sensor multi hal crash when sub-HAL reports an errorNick Vaccaro2014-03-171-2/+5
| | | |_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Initial commit of TV input HALWonsik Kim2014-03-214-1/+398
| |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | am 9f7332d4: am 5106ad0c: Merge "Audio HALs are 32-bit only"Glenn Kasten2014-03-143-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am 5106ad0c: Merge "Audio HALs are 32-bit only"Glenn Kasten2014-03-133-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |