summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* camera: Use project pathmapcm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0cm-11.0Tom Marshall2014-10-061-0/+4
* Merge tag 'android-4.4.3_r1' into HEADcm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505aRicardo Cerqueira2014-06-0312-48/+53
|\
| * Camera3: Clean up ALOGE calls in non-error conditions [DO NOT MERGE]Shuzhen Wang2014-03-0710-41/+39
| * Camera3: Increase retry count when opening cameraShuzhen Wang2014-03-072-2/+2
| * Camera3: Only use Plain Old Data for global variableShuzhen Wang2014-03-061-5/+12
* | Merge tag 'android-4.4.1_r1' into HEADcm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315eaRicardo Cerqueira2013-12-0610-158/+330
|\|
| * Merge "Camera: Increase MAX_EXIF_TABLE_ENTRIES to 17" into klp-devVineeta Srivastava2013-11-142-2/+2
| |\
| | * Camera: Increase MAX_EXIF_TABLE_ENTRIES to 17Sungmin Choi2013-11-142-2/+2
| * | Revert "Camera3: Adjust 3A regions based on FOV crop"Vineeta Srivastava2013-11-142-47/+73
| |/
| * Merge "Camera3: Use Stream Identity instead of Stream type" into klp-devVineeta Srivastava2013-11-146-43/+72
| |\
| | * Camera3: Use Stream Identity instead of Stream typeShuzhen Wang2013-11-136-43/+72
| * | merge in release branch changes (no-op).Ed Heyl2013-11-130-0/+0
| |\ \ | | |/ | |/|
| | * merge in klp-mr1-release history after reset to klp-devThe Android Automerger2013-11-120-0/+0
| | |\
| | | * Revert "Revert "Camera3: Work around for streams with different o/p rates""Zhijun He2013-11-081-1/+1
| * | | Camera3: Adjust 3A regions based on FOV cropShuzhen Wang2013-11-132-73/+47
| |/ /
| * | HAL3: EXIF: Set DATE_TIME_DIGITIZED to match DATE_TIME_ORIGINALEino-Ville Talvala2013-11-121-0/+4
| * | Revert "Revert "Camera3: Work around for streams with different o/p rates""Zhijun He2013-11-081-1/+1
| |/
| * QCamera3: Adding Urgent MetadataShuzhen Wang2013-11-064-101/+228
| * Camera3: Set F_NUMBER in exif headerShuzhen Wang2013-11-012-5/+17
| * Camera3: Reduce log spamShuzhen Wang2013-11-012-6/+6
| * merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
| |\ | |/ |/|
* | merge in klp-release history after reset to klp-devThe Android Automerger2013-10-160-0/+0
|\ \ | |/ |/|
| * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-150-0/+0
| |\
| | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-140-0/+0
| | |\
| | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-130-0/+0
| | | |\
| | | | * Camera3: Reduce the max inflight requests to 4.Shuzhen Wang2013-10-111-1/+1
| | | | * Camera3: Change max inflight requests to 5Shuzhen Wang2013-10-101-1/+1
| | | | * Camera3: Add PASSIVE_UNFOCUSED focus stateShuzhen Wang2013-10-101-1/+2
| | | | * Camera3: Add poll fd in QBUF as asynchronous callShuzhen Wang2013-10-094-5/+14
| | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-060-0/+0
| | | | |\
| | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-030-0/+0
| | | | | |\
| | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-260-0/+0
| | | | | | |\
| | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-250-0/+0
| | | | | | | |\
| | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-240-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-220-0/+0
| | | | | | | | | |\
* | | | | | | | | | | Camera3: Additional hints for callbackMansoor Aftab2013-10-162-1/+31
* | | | | | | | | | | camera: Increase MAX_EXIF_TABLE_ENTRIES to 16Sungmin Choi2013-10-152-2/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge "Camera3: Query camera during initialization" into klp-devVineeta Srivastava2013-10-151-0/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Camera3: Query camera during initializationShuzhen Wang2013-10-141-0/+11
| |/ / / / / / / / /
* | | | | | | | | | Camera3: Validate request rate based on metadata rather than buffersMansoor Aftab2013-10-143-6/+8
* | | | | | | | | | Camera3: Unblock capture_request in correct conditionShuzhen Wang2013-10-142-289/+344
|/ / / / / / / / /
* / / / / / / / / camera: Add EXIF tag information for maker and modelSungmin Choi2013-10-132-0/+39
|/ / / / / / / /
* | | | | | | | Camera3: Handle the way fd stats are sent to frameworksShuzhen Wang2013-10-131-11/+18
* | | | | | | | Camera3: Reduce the max inflight requests to 4.Shuzhen Wang2013-10-111-1/+1
* | | | | | | | Merge "Camera3: Change max inflight requests to 5" into klp-devVineeta Srivastava2013-10-101-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Camera3: Change max inflight requests to 5Shuzhen Wang2013-10-101-1/+1
* | | | | | | | | Camera3: Add PASSIVE_UNFOCUSED focus stateShuzhen Wang2013-10-101-1/+2
|/ / / / / / / /
* | | | | | | | Camera3: Add poll fd in QBUF as asynchronous callShuzhen Wang2013-10-094-5/+14
* | | | | | | | merge in KFS78N (no-op)Ed Heyl2013-10-080-0/+0
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ merge in klp-factoryrom-release history after reset to klp-releaseThe Android Automerger2013-09-160-0/+0
| |\ \ \ \ \ \ \ \