summaryrefslogtreecommitdiffstats
path: root/services/camera
Commit message (Expand)AuthorAgeFilesLines
* Merge "Camera2/3: Don't release recording buffer when stream is active"Zhijun He2014-06-201-4/+7
|\
| * Camera2/3: Don't release recording buffer when stream is activeZhijun He2014-06-181-4/+7
* | libcameraservice: 64-bit compile warningsMark Salyzyn2014-06-201-2/+2
* | camera: Let #connectLegacy calls through with unspecified HAL versionIgor Murashkin2014-06-201-1/+8
* | cameraservice: Implement HAL1 and higher HAL API coexistenceZhijun He2014-06-194-27/+126
|/
* Merge "camera: Add #getLegacyParameters, #supportsCameraApi to ICameraService"Igor Murashkin2014-06-172-23/+145
|\
| * camera: Add #getLegacyParameters, #supportsCameraApi to ICameraServiceIgor Murashkin2014-06-172-23/+145
* | CameraService: Fix permissions check issuesEino-Ville Talvala2014-06-171-4/+5
|/
* Merge "camera2: Add jpeg sizes to legacy mode static characteristics."Ruben Brunk2014-06-161-9/+20
|\
| * camera2: Add jpeg sizes to legacy mode static characteristics.Ruben Brunk2014-06-121-9/+20
* | Merge "Camera3: Separate the video and preview size filtering"Zhijun He2014-06-102-14/+36
|\ \ | |/ |/|
| * Camera3: Separate the video and preview size filteringZhijun He2014-06-102-14/+36
* | am 3416f9ac: Merge "Camera2: Add null check to createStream" into lmp-preview...Yin-Chia Yeh2014-06-111-0/+4
|\ \
| * | Camera2: Add null check to createStreamYin-Chia Yeh2014-06-101-0/+4
| |/
* | resolved conflicts for merge of f285c91e to masterElliott Hughes2014-05-221-2/+2
|\ \ | |/ |/|
| * am d5516339: Merge "Move frameworks/av from fdprintf to POSIX dprintf."Calin Juravle2014-05-221-2/+2
| |\
| | * Move frameworks/av from fdprintf to POSIX dprintf.Elliott Hughes2014-05-221-2/+2
* | | camera2: Update CameraService for HAL1 shim.Ruben Brunk2014-05-215-89/+295
* | | 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
| |\ \ | | |/
| | * 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
| * | | Merge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEADBill Yi2014-04-295-99/+213
| |\ \ \ | | |/ / | |/| |
| | * | am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS single/r...Igor Murashkin2014-03-252-44/+121
| | |\ \
| | * \ \ am 4f53fe74: Merge "CameraService: deadlock fix"Eino-Ville Talvala2014-03-251-0/+1
| | |\ \ \ | | | | |/ | | | |/|
| | * | | resolved conflicts for merge of 3d7c5002 to klp-dev-plus-aospColin Cross2014-03-2120-70/+80
| | |\ \ \
| | * \ \ \ am bd3e2e03: camera2: Fix segfault when using null availability listenerIgor Murashkin2014-03-171-0/+10
| | |\ \ \ \
| | * \ \ \ \ am 089affb6: Merge "mediaserver and associated services are 32-bit only"Glenn Kasten2014-03-141-0/+1
| | |\ \ \ \ \
| | * \ \ \ \ \ 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
| | |\ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ Merge "Camera3: fix missing string in logging code"Zhijun He2014-05-061-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Camera3: fix missing string in logging codeZhijun He2014-05-061-1/+1
* | | | | | | | | | | Merge "camera3: Update CameraMetadata vendor tag handling."Ruben Brunk2014-05-051-1/+14
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | camera3: Update CameraMetadata vendor tag handling.Ruben Brunk2014-05-021-1/+14
| |/ / / / / / / / / /
* | | | | | | | | | | Merge "NULL check in ConnectPro"Natalie Silvanovich2014-05-051-0/+5
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | NULL check in ConnectProNatalie Silvanovich2014-05-051-0/+5
* | | | | | | | | | | Merge "Revert "camera3: Update CameraMetadata vendor tag handling.""Ruben Brunk2014-05-031-14/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Revert "camera3: Update CameraMetadata vendor tag handling."Ruben Brunk2014-05-031-14/+1
* | | | | | | | | | | | Merge "camera3: Update CameraMetadata vendor tag handling."Ruben Brunk2014-05-021-1/+14
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | camera3: Update CameraMetadata vendor tag handling.Ruben Brunk2014-05-021-1/+14
| |/ / / / / / / / / /
* | | | | | | | | | | Camera3: Don't notifyError for non-fatal errorsZhijun He2014-05-011-3/+0
|/ / / / / / / / / /
* | | | | | | | | | Camera3: scale the max jpeg buffer size based on resolutionsZhijun He2014-04-252-2/+67
* | | | | | | | | | camera3: Don't hold mLock during flush callZhijun He2014-04-211-2/+6
* | | | | | | | | | Merge "CameraService: fix waitUntilIdle bug revealed by TestingCamera2."Jianing Wei2014-04-212-4/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | CameraService: fix waitUntilIdle bug revealed by TestingCamera2.Jianing Wei2014-04-212-4/+7
* | | | | | | | | | | am dae621c2: am 95006625: Merge "camera: set mNeedConfig after creating ZSL s...Eino-Ville Talvala2014-04-211-0/+2
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am 95006625: Merge "camera: set mNeedConfig after creating ZSL stream"Eino-Ville Talvala2014-04-211-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | camera: set mNeedConfig after creating ZSL streamYuvraj Pasi2014-04-151-0/+2
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| * | | | | | | | | | am 65550a0e: am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview...Igor Murashkin2014-03-252-44/+121
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS single/r...Igor Murashkin2014-03-252-44/+121
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |