summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice/api1
Commit message (Expand)AuthorAgeFilesLines
* am 7fd1af85: am c36fbcdf: am f02f06c4: Merge "camera: check Intent entry coun...Eino-Ville Talvala2014-05-121-0/+3
|\
| * am f02f06c4: Merge "camera: check Intent entry count before reading it"Eino-Ville Talvala2014-05-121-0/+3
| |\
| | * camera: check Intent entry count before reading itYuvraj Pasi2014-05-121-0/+3
| * | am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS single/r...Igor Murashkin2014-03-252-44/+121
| |\ \
| | * | DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range valuesIgor Murashkin2014-03-252-44/+121
| * | | resolved conflicts for merge of 3d7c5002 to klp-dev-plus-aospColin Cross2014-03-218-34/+40
| |\ \ \ | | | |/ | | |/|
| * | | am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when preview size ...Zhijun He2014-03-101-0/+16
| |\ \ \ | | | |/ | | |/|
| * | | am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-devEino-Ville Talvala2014-03-073-55/+66
| |\ \ \
* | | | | Camera: don't dereference timestamp if it is missingZhijun He2014-04-141-6/+9
* | | | | CameraService: trigger appropriate callbacks for burst capture.Jianing Wei2014-04-108-23/+26
* | | | | Camera3: fix HAL3.x version check issueZhijun He2014-03-271-1/+3
* | | | | Revert "camera: Fix setParameters for Preview FPS single/range values"Eino-Ville Talvala2014-03-261-116/+41
* | | | | am 5c679d41: resolved conflicts for merge of 3d7c5002 to klp-modular-dev-plus...Colin Cross2014-03-248-34/+40
|\ \ \ \ \
| * \ \ \ \ resolved conflicts for merge of 3d7c5002 to klp-modular-dev-plus-aospColin Cross2014-03-218-34/+40
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | libcameraservice: fix 64-bit print format warningsColin Cross2014-03-218-34/+40
| | |/ / /
| * | | | am f0fb921c: am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when ...Zhijun He2014-03-111-0/+16
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | DO NOT MERGE: Camera: delete preview callback when preview size is changedZhijun He2014-03-101-0/+16
| | | |/ | | |/|
| * | | am 47ef192f: am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into kl...Eino-Ville Talvala2014-03-073-55/+66
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * DO NOT MERGE: Camera: fix focusArea wrong indexing issueZhijun He2014-03-051-14/+14
| | * DO NOT MERGE: camera2: Fix race with stream deletion during disconnect.Ruben Brunk2014-03-051-6/+8
| | * DO NOT MERGE: camera2/3: Add protection for still capture pathZhijun He2014-03-051-35/+44
* | | camera: Fix setParameters for Preview FPS single/range valuesIgor Murashkin2014-03-201-41/+116
* | | Remove deprecated BufferQueue constructorDan Stoza2014-03-124-12/+20
* | | Merge "camera2: Fix race with stream deletion during disconnect."Ruben Brunk2014-02-241-6/+8
|\ \ \
| * | | camera2: Fix race with stream deletion during disconnect.Ruben Brunk2013-12-051-6/+8
* | | | resolved conflicts for merge of 566be7c3 to masterNarayan Kamath2014-02-114-4/+5
|\ \ \ \ | | |/ / | |/| |
| * | | Make frameworks/av 64-bit compatibleKévin PETIT2014-02-114-4/+5
| | |/ | |/|
* | | camera3: Update maxRegions tag.Ruben Brunk2014-02-042-9/+38
* | | Camera: fix focusArea wrong indexing issueZhijun He2014-01-291-14/+14
* | | Merge "Camera: delete preview callback when preview size is changed"Zhijun He2014-01-271-0/+16
|\ \ \
| * | | Camera: delete preview callback when preview size is changedZhijun He2014-01-241-0/+16
* | | | Merge "Camera3: Flush device before ZSL reprocess"Zhijun He2014-01-271-0/+9
|\ \ \ \ | |/ / /
| * | | Camera3: Flush device before ZSL reprocessZhijun He2014-01-231-0/+9
* | | | Merge "Camera: delete zsl stream for video mode"Zhijun He2014-01-241-0/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Camera: delete zsl stream for video modeZhijun He2013-11-011-0/+2
* | | | camera3: Update sceneMode tag spec.Ruben Brunk2014-01-172-10/+10
| |_|/ |/| |
* | | camera2/3: Add protection for still capture pathZhijun He2013-11-261-35/+44
| |/ |/|
* | Camera2: Rework the FPS range vs. FPS single setting detectionEino-Ville Talvala2013-11-142-33/+20
* | Camera HAL3/API1: Add support for the partial result quirk.Eino-Ville Talvala2013-11-065-78/+158
|/
* Camera: don't do hw support check for ZSLZhijun He2013-10-161-13/+5
* Merge "Camera: Skip AE precapture when possible" into klp-devZhijun He2013-10-111-0/+12
|\
| * Camera: Skip AE precapture when possibleZhijun He2013-10-111-0/+12
* | Merge "Camera2/3: Add more tracing for API1" into klp-devEino-Ville Talvala2013-10-116-1/+56
|\ \ | |/ |/|
| * Camera2/3: Add more tracing for API1Eino-Ville Talvala2013-10-106-1/+56
* | Camera: Save 1 frame time for takePicture callZhijun He2013-10-091-1/+1
|/
* Camera API 2, Device 2/3: Implement idle and shutter callbacksEino-Ville Talvala2013-10-026-7/+7
* Camera: drop stale callback bufferZhijun He2013-09-301-0/+10
* Camera: Set default thumbnail size with matched aspect ratioZhijun He2013-09-302-3/+41
* Merge "Camera2/3: Support new PASSIVE_UNFOCUSED AF state" into klp-devEino-Ville Talvala2013-09-251-0/+3
|\
| * Camera2/3: Support new PASSIVE_UNFOCUSED AF stateEino-Ville Talvala2013-09-201-0/+3