summaryrefslogtreecommitdiffstats
path: root/services/camera
Commit message (Expand)AuthorAgeFilesLines
* am 0fd52ac2: am 6eac9e2f: Merge "Camera2Client: flush requests in stopPreview...Chien-Yu Chen2014-12-161-0/+9
|\
| * Camera2Client: flush requests in stopPreviewLRuchit Sharma2014-12-151-0/+9
* | am 61697a5c: am 9cea7aa4: Merge "Camera3Device: support shutter after result"...Chien-Yu Chen2014-12-102-141/+234
|\ \ | |/
| * Merge "Camera3Device: support shutter after result" into lmp-mr1-devChien-Yu Chen2014-12-092-141/+234
| |\
| | * Camera3Device: support shutter after resultChien-Yu Chen2014-12-092-141/+234
* | | Merge commit '2340e5a8' into manualmergeRuben Brunk2014-12-092-4/+81
|\ \ \ | |/ /
| * | Merge "Camera2: Round unsupported surface sizes in configure." into lmp-mr1-devRuben Brunk2014-12-092-4/+81
| |\ \ | | |/ | |/|
| | * Camera2: Round unsupported surface sizes in configure.Ruben Brunk2014-12-052-4/+81
* | | am 668b0550: am 597ce69a: Merge "Camera: Add support for SCENE_MODE_HDR for n...Eino-Ville Talvala2014-12-081-0/+6
|\ \ \ | |/ /
| * | Merge "Camera: Add support for SCENE_MODE_HDR for newer HALs" into lmp-mr1-devEino-Ville Talvala2014-12-051-0/+6
| |\ \
| | * | Camera: Add support for SCENE_MODE_HDR for newer HALsEino-Ville Talvala2014-12-051-0/+6
* | | | am 07e19019: am 9257000c: camera: fix logging in ZslProcessor to avoid spamRuchit Sharma2014-12-081-1/+1
|\ \ \ \ | |/ / /
| * | | camera: fix logging in ZslProcessor to avoid spamRuchit Sharma2014-12-051-1/+1
| |/ /
* | | am ec7b26f0: am 512dd849: Merge "camera: fix frame deletion logic in mInFligh...Zhijun He2014-11-261-2/+6
|\ \ \ | |/ /
| * | camera: fix frame deletion logic in mInFlightMapRuchit Sharma2014-11-251-2/+6
* | | am ffa3e71e: am bc0f452b: Merge "Camera2: Fix CameraParameters parse segfault...Ruben Brunk2014-11-211-0/+1
|\ \ \ | |/ /
| * | Camera2: Fix CameraParameters parse segfault.Ruben Brunk2014-11-201-0/+1
| |/
* | am 902dc42d: am 07715ac3: Merge "C++11 compatibility."Dan Albert2014-11-202-3/+5
|\ \
| * | C++11 compatibility.Dan Albert2014-11-202-3/+5
* | | am cb79b3db: am 03181012: Merge "Camera2Client: remove recording stream if ne...Yin-Chia Yeh2014-11-193-7/+56
|\ \ \ | | |/ | |/|
| * | Merge "Camera2Client: remove recording stream if necessary" into lmp-mr1-devYin-Chia Yeh2014-11-193-7/+56
| |\ \
| | * | Camera2Client: remove recording stream if necessaryYin-Chia Yeh2014-11-183-7/+56
* | | | am 771a362d: am 3171f4e1: Merge "CameraService: normalize face rectangles pro...Chien-Yu Chen2014-11-173-73/+90
|\ \ \ \ | |/ / /
| * | | Merge "CameraService: normalize face rectangles properly" into lmp-mr1-devChien-Yu Chen2014-11-173-73/+90
| |\ \ \ | | |/ / | |/| |
| | * | CameraService: normalize face rectangles properlyChien-Yu Chen2014-11-133-73/+90
* | | | resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aospMarco Nelissen2014-11-178-24/+24
|\ \ \ \ | | |_|/ | |/| |
| * | | Update calls to IInterface::asBinder()Marco Nelissen2014-11-178-24/+24
* | | | am 06ce4cf5: Merge "Camera2Device: fix camera metadata leaks" into lmp-mr1-de...Chien-Yu Chen2014-11-122-15/+5
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "Camera2Device: fix camera metadata leaks" into lmp-mr1-devChien-Yu Chen2014-11-122-15/+5
| |\ \ \ | | |_|/ | |/| |
| | * | Camera2Device: fix camera metadata leaksChien-Yu Chen2014-11-102-15/+5
* | | | am 7b28e4e7: am 9527a598: Merge "Camera: Guard against asBinder() calls on NU...Eino-Ville Talvala2014-11-116-16/+26
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Camera: Guard against asBinder() calls on NULL interfacesEino-Ville Talvala2014-11-076-16/+26
* | | Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-devDan Stoza2014-11-0712-13/+13
|\ \ \
| * | | Add a BufferItem parameter to onFrameAvailableDan Stoza2014-11-0412-13/+13
| | |/ | |/|
* | | CameraService: API1: fix picture FOVChien-Yu Chen2014-10-281-0/+14
|/ /
* | CameraService: Disconnect: Release mutex while waiting for joins.Eino-Ville Talvala2014-10-221-6/+14
|/
* Camera2Client: avoid two consecutive sets of configure_streams callsZhijun He2014-10-141-0/+4
* CameraService: API1: Reallocate JPEG ashmem heap if size changesEino-Ville Talvala2014-09-291-1/+14
* Camera2Client: Revert HALv2 device behavior back to MR2Eino-Ville Talvala2014-09-282-47/+69
* CameraService: API1: Fix flash modeEino-Ville Talvala2014-09-271-1/+1
* Camera1 shim: If there's no flash, the keys need to be null.Eino-Ville Talvala2014-09-251-10/+13
* camera: add traces for KPI measurementRuchit Sharma2014-09-252-2/+16
* Camera2Client: log an error when autoFocus is called in wrong stateZhijun He2014-09-231-0/+2
* Merge "API1: ZSL buffers should be skipped for manual AF mode" into lmp-devZhijun He2014-09-201-0/+5
|\
| * API1: ZSL buffers should be skipped for manual AF modeZhijun He2014-09-191-0/+5
* | CameraService: Add client name/pid to device open/close logging.Eino-Ville Talvala2014-09-182-2/+10
|/
* CameraService: Fix dump methods for two clientsEino-Ville Talvala2014-09-182-7/+19
* Merge "Camera2: handle one more videosnapshot failure" into lmp-devYin-Chia Yeh2014-09-151-13/+7
|\
| * Camera2: handle one more videosnapshot failureYin-Chia Yeh2014-09-151-13/+7
* | Merge "Camera3Device: Treat failure to idle as an error" into lmp-devEino-Ville Talvala2014-09-151-0/+4
|\ \ | |/ |/|