summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | 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
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | |