summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Qualcomm Camera Hal: add 12.8MP and 13MP camera resolutions.cm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1Seth Shelnutt2013-07-231-0/+2
* camera.$(TARGET_DEVICE): FPSRange gets defined twice for devices whichcm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0Seth Shelnutt2013-04-101-0/+2
* Merge remote-tracking branch 'aosp/jb-mr1.1-release' into HEADcm-10.1-M3Ricardo Cerqueira2013-04-062-24/+28
|\
| * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-040-0/+0
| |\
| | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-160-0/+0
| | |\
| | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-140-0/+0
| | | |\
| | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-060-0/+0
| | | | |\
| * | | | | Camera: Don't run continuous autofocus in startPreview2.Shuzhen Wang2012-12-031-14/+0
| | | | | |
| | \ \ \ \
| *-. \ \ \ \ Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-270-0/+0
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | camera: enhancement af functionalityinsup.choi2012-10-162-0/+16
| | * | | | | use pthread_cond_timedwait() in poll threadIliyan Malchev2012-10-161-5/+23
| | * | | | | camera: Changes to match ZSL snapshot match issue.Azam Sadiq Pasha Kapatrala Syed2012-10-164-23/+36
| | * | | | | merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-150-0/+0
| | |\ \ \ \ \
| | | * \ \ \ \ merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-120-0/+0
| | | |\ \ \ \ \
| | | | * \ \ \ \ merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-120-0/+0
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-110-0/+0
| | | | | |\ \ \ \ \
| | | | | | * \ \ \ \ merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-100-0/+0
| | | | | | |\ \ \ \ \
| * | | | | | | | | | | camera: disallow opening multiple camera instancesAzam Sadiq Pasha Kapatrala Syed2012-11-141-10/+28
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Revert "Camera: Fix compile if BOARD_USES_CAMERA_FAST_AUTOFOCUS is not defined"Ricardo Cerqueira2013-04-061-4/+0
* | | | | | | | | | | Camera: add TARGET_PROVIDES_CAMERA_HALcm-10.1-M2mr1.1-stagingh8rift2013-01-211-0/+2
* | | | | | | | | | | use standard qcom naming for msm7x27a variantssakindia1232013-01-131-4/+4
* | | | | | | | | | | Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/ha...cm-10.1-M1Steve Kondik2012-12-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-11-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-11-050-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | / | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | | * | | | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-310-0/+0
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-300-0/+0
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-290-0/+0
| | | | | |\ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-260-0/+0
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-260-0/+0
| | | | | | | |\ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-250-0/+0
| | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-240-0/+0
| | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | * \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-230-0/+0
| | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | * \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-230-0/+0
| | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | * \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-220-0/+0
| | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-200-0/+0
| | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | * \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-190-0/+0
| | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | * \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-190-0/+0
| | | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | | * \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-180-0/+0
| | | | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | * \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-170-0/+0
| | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-160-0/+0
| | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-160-0/+0
| | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-150-0/+0
| | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | |/| | | | | |
| | | | | | | | | | | | | | | | | | | | | * | | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-120-0/+0
| | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | |/| | | | |
| | | | | | | | | | | | | | | | | | | | | | * | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-110-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | |/| | | |
| | | | | | | | | | | | | | | | | | | | | | | * | | | camera: Fix for testRecorderRandomAction CTS test case.Azam Sadiq Pasha Kapatrala Syed2012-10-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | * | | | camera: Stop dispatching prev frames when takepicture() is invoked.Azam Sadiq Pasha Kapatrala Syed2012-10-103-3/+13
| | | | | | | | | | | | | | | | | | | | | | | * | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-100-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | |_|/ / | | | | | | | | | | | | | | | | | | | | | | | |/| | / | | | | | | | | | | | | | | | | | | | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | | | | | | | * | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-090-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-050-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | * | camera: Changes to fix videoLiveSnapshot issueAzam Sadiq Pasha Kapatrala Syed2012-10-043-0/+29