summaryrefslogtreecommitdiffstats
path: root/camera
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r61' into HEADJessica Wagantall2016-08-021-1/+5
|\
| * DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleakEino-Ville Talvala2016-06-231-1/+5
* | camera: Allow devices to load custom CameraParameter codeEthan Chen2015-11-071-1/+15
* | Merge tag 'android-6.0.0_r26' into cm-13.0Ricardo Cerqueira2015-11-052-5/+45
|\ \ | |/
| * CameraService: Notify camera service proxy of device statusEino-Ville Talvala2015-08-211-3/+20
| * Merge "Add experimental camera session prepare API." into mnc-dr-devRuben Brunk2015-08-171-2/+25
| |\
| | * Add experimental camera session prepare API.Ruben Brunk2015-08-141-2/+25
* | | camera: Disable extra HDR frame on QCOM_HARDWARERicardo Cerqueira2015-11-051-0/+8
* | | Camera: Add support for manual 3A.Peng Zhu2015-10-191-0/+2
* | | camera: Don't segfault if we get a NULL parameterSteve Kondik2015-10-171-0/+3
* | | camera: allow device to append camera parametersKonsta2015-10-141-0/+5
* | | Camera: Add support for preview frame fdSusmitha Gummalla2015-10-061-3/+14
|/ /
* | Camera: Add camera type to ICameraService.getNumberOfCameras.Eino-Ville Talvala2015-08-141-2/+9
|/
* CameraMetadata: Add sanity check to avoid accidental memory corruption.Eino-Ville Talvala2015-07-171-0/+11
* Camera: Add hidden experimental tearDown method.Eino-Ville Talvala2015-07-161-1/+23
* camera2: Fix native binder interface and add tests.Ruben Brunk2015-07-067-15/+511
* Merge "Update signature of writeBlob." into mnc-devJeff Brown2015-06-061-1/+1
|\
| * Update signature of writeBlob.Jeff Brown2015-06-051-1/+1
* | Camera: Change error for app ops reject, propagate binder errorsEino-Ville Talvala2015-06-052-7/+17
|/
* Camera2: implement high speed video APIsZhijun He2015-06-031-2/+5
* Merge "camera: Add AIDL interface for CameraServiceProxy." into mnc-devRuben Brunk2015-05-202-0/+56
|\
| * camera: Add AIDL interface for CameraServiceProxy.Ruben Brunk2015-05-202-0/+56
* | Use memset to initialize dynamic array.Chih-Hung Hsieh2015-05-181-1/+2
|/
* camera2: Fix work-profile eviction handling.Ruben Brunk2015-05-141-5/+23
* Revert "Add camera app op - camera"Svetoslav Ganov2015-05-123-18/+19
* Add camera app op - cameraSvet Ganov2015-05-023-19/+18
* Camera2: Add prepare for output streamsEino-Ville Talvala2015-04-152-2/+45
* camera2: add reprocess supportChien-Yu Chen2015-04-132-0/+83
* camera2: Enforce client eviction on user switch.Ruben Brunk2015-03-311-0/+16
* Merge "Camera: fix metadata assertion"Yin-Chia Yeh2015-03-251-1/+1
|\
| * Camera: fix metadata assertionYin-Chia Yeh2015-03-241-1/+1
* | camera2: Remove ProCamera.Ruben Brunk2015-03-208-2227/+8
|/
* Merge "Camera: plumbing rotation field through"Yin-Chia Yeh2015-03-193-20/+92
|\
| * Camera: plumbing rotation field throughYin-Chia Yeh2015-03-183-20/+92
* | Merge "camera2: Add camera client eviction enforcement."Ruben Brunk2015-03-191-0/+4
|\ \ | |/ |/|
| * camera2: Add camera client eviction enforcement.Ruben Brunk2015-03-181-0/+4
* | Camera: Wire up dataSpace, clean up ICameraDeviceUserEino-Ville Talvala2015-03-061-13/+2
|/
* Merge "Camera: Remove RAW_SENSOR in favor of RAW16"Eino-Ville Talvala2015-02-202-2/+2
|\
| * Camera: Remove RAW_SENSOR in favor of RAW16Eino-Ville Talvala2015-02-192-2/+2
* | camera: implement flashlight controlChien-Yu Chen2015-02-123-2/+55
|/
* am 81898637: am 16e8d463: Merge "camera2: fix various BpCameraDeviceUser meth...Eino-Ville Talvala2015-02-031-4/+4
|\
| * camera2: fix various BpCameraDeviceUser methods to return correct result.John Lin2015-02-031-4/+4
* | am ffa3e71e: am bc0f452b: Merge "Camera2: Fix CameraParameters parse segfault...Ruben Brunk2014-11-211-0/+5
|\ \
| * \ Merge "Camera2: Fix CameraParameters parse segfault." into lmp-mr1-devRuben Brunk2014-11-211-0/+5
| |\ \
| | * | Camera2: Fix CameraParameters parse segfault.Ruben Brunk2014-11-201-0/+5
* | | | am c2d88d0b: am f4ea51fd: Merge "camera2: fix an error reading a NULL string"...Chien-Yu Chen2014-11-211-3/+3
|\ \ \ \ | |/ / /
| * | | camera2: fix an error reading a NULL stringChien-Yu Chen2014-11-201-3/+3
| |/ /
* | | resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aospMarco Nelissen2014-11-1710-27/+27
|\ \ \ | | |/ | |/|
| * | Update calls to IInterface::asBinder()Marco Nelissen2014-11-1710-27/+27
* | | am 7b28e4e7: am 9527a598: Merge "Camera: Guard against asBinder() calls on NU...Eino-Ville Talvala2014-11-111-1/+1
|\ \ \ | |/ /