summaryrefslogtreecommitdiffstats
path: root/services/camera
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | libcameraservice: fix 64-bit print format warningsColin Cross2014-03-2119-69/+80
| | | |_|_|_|_|/ | | |/| | | | |
* | | | | | | | Merge "CameraService: Add support for burst capture and repeating burst."Jianing Wei2014-03-227-3/+259
|\ \ \ \ \ \ \ \
| * | | | | | | | CameraService: Add support for burst capture and repeating burst.Jianing Wei2014-03-217-3/+259
* | | | | | | | | camera: Fix setParameters for Preview FPS single/range valuesIgor Murashkin2014-03-201-41/+116
* | | | | | | | | Merge "Remove deprecated BufferQueue constructor"Dan Stoza2014-03-186-18/+30
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove deprecated BufferQueue constructorDan Stoza2014-03-126-18/+30
| |/ / / / / / / /
* | | | | | | | | am 557847ee: am a6ca0acf: am bd3e2e03: camera2: Fix segfault when using null ...Igor Murashkin2014-03-181-0/+10
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | am a6ca0acf: am bd3e2e03: camera2: Fix segfault when using null availability ...Igor Murashkin2014-03-181-0/+10
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | am bd3e2e03: camera2: Fix segfault when using null availability listenerIgor Murashkin2014-03-171-0/+10
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | camera2: Fix segfault when using null availability listenerIgor Murashkin2014-03-171-0/+10
| | | | |_|_|_|/ | | | |/| | | |
* | | | | | | | camera3: Remove old vendor tag ops dependencies.Ruben Brunk2014-03-172-15/+0
* | | | | | | | camera2: Don't log vendor tag errors when camera HAL too oldIgor Murashkin2014-03-171-1/+1
* | | | | | | | resolved conflicts for merge of 3c780188 to masterGlenn Kasten2014-03-141-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 089affb6: Merge "mediaserver and associated services are 32-bit only"Glenn Kasten2014-03-141-0/+1
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | mediaserver and associated services are 32-bit onlyGlenn Kasten2014-03-121-0/+1
| | | |_|_|/ / | | |/| | | |
| * | | | | | am f0fb921c: am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when ...Zhijun He2014-03-111-0/+16
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when preview size ...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
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | |
| | * | | am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-devEino-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
* | | | | Merge "camera3: Pass vendor tags through binder."Ruben Brunk2014-03-135-49/+111
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | camera3: Pass vendor tags through binder.Ruben Brunk2014-03-135-49/+111
* | | | | 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-118-13/+15
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Make frameworks/av 64-bit compatibleKévin PETIT2014-02-118-13/+15
| | |/ / | |/| |
* | | | Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made avail...Andreas Huber2014-02-051-1/+2
|\ \ \ \
| * | | | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to...Andreas Huber2014-02-041-1/+2
* | | | | camera3: Update maxRegions tag.Ruben Brunk2014-02-042-9/+38
|/ / / /
* | | | Camera: fix focusArea wrong indexing issueZhijun He2014-01-291-14/+14
* | | | camera3: Delete output stream of bi-directional streamZhijun He2014-01-271-3/+7
* | | | 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-272-1/+17
|\ \ \ \ \ | |/ / / /
| * | | | Camera3: Flush device before ZSL reprocessZhijun He2014-01-232-1/+17
* | | | | 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
* | | | | am a2949165: am 3eccdde9: am c7614eb7: Merge "libcameraservice: Fix build in ...Eino-Ville Talvala2014-01-151-5/+5
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge "libcameraservice: Fix build in ISO C++11 mode"Eino-Ville Talvala2014-01-151-5/+5
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | libcameraservice: Fix build in ISO C++11 modeBernhard Rosenkraenzer2013-07-301-5/+5
* | | | | Camera2 API: fix front facing camera flip issueZhijun He2013-12-261-17/+47
| |_|_|/ |/| | |
* | | | camera2/3: Add protection for still capture pathZhijun He2013-11-261-35/+44
* | | | Merge "Camera3: Remove request from InFlightMap for error case"Zhijun He2013-11-211-2/+4
|\ \ \ \
| * | | | Camera3: Remove request from InFlightMap for error caseZhijun He2013-11-211-2/+4
* | | | | Merge "Camera3: add systraces for hal open/close"Zhijun He2013-11-191-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | Camera3: add systraces for hal open/closeZhijun He2013-11-191-0/+4