summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* camera: Apply pathmap for other Qualcomm project includesHEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001stable/cm-13.0-ZNH5Ycm-13.0Josue Rivera2016-07-182-2/+2
* Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/ha...staging/cm-13.0+r22stable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2KSteve Kondik2016-03-104-1/+27
|\
| * mm_camera: Retry opening camera for ENODEV errorChien-Yu Chen2016-01-211-1/+7
| * QCamera2: HAL3: replace abort with exitZhijun He2016-01-161-2/+3
| * QCamera2: HAL3: Restart daemon and mediaserver when buffer is lost.Shuzhen Wang2016-01-133-0/+19
* | Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/har...stable/cm-13.0-ZNH0ESteve Kondik2015-12-074-4/+35
|\|
| * Merge "QCamera3: Fail unsupported stream configurations" into mnc-dr-devChien-Yu Chen2015-10-151-1/+20
| |\
| | * QCamera3: Fail unsupported stream configurationsChien-Yu Chen2015-10-141-1/+20
| * | QCamera2/HAL3: Read v4l2_buffer error and notify accordinglyRanjith Kagathi Ananda2015-10-133-3/+15
| |/
* | Merge tag 'android-6.0.0_r26' into cm-13.0Ricardo Cerqueira2015-11-0552-2001/+6744
|\ \
| * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-10-080-0/+0
| |\ \ | | |/ | |/|
| | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-10-050-0/+0
| | |\
| | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-10-040-0/+0
| | | |\
| | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-10-020-0/+0
| | | | |\
| | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-270-0/+0
| | | | | |\
| | | | | | * Camera3: disable the image description exif fieldZhijun He2015-09-261-1/+5
| | | | | | * Camera3: Adding checks for stream handleRanjith Kagathi Ananda2015-09-252-3/+12
| | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-250-0/+0
| | | | | | |\
| | | | | | | * QCamera2/HAL3: Clear mFreeBufferList when buffers are deallocatedRanjith Kagathi Ananda2015-09-231-0/+2
| | | | | | | * Camera3: Increase mOfflineMetaMemory count to account for reprocess pipeliningRanjith Kagathi Ananda2015-09-222-4/+11
| | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-200-0/+0
| | | | | | | |\
| | | | | | | | * camera: update to AU_LINUX_ANDROID_LA.BF64.1.2.9.05.01.00.089.329Shuzhen Wang2015-09-172-29/+76
| | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-160-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-140-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-130-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * camera: update to AU_LINUX_ANDROID_LA.BF64.1.2.9.05.01.00.089.312Guruprasad Gaonkar2015-09-106-70/+326
| | | | | | | | | | | * camera: update to AU_LINUX_ANDROID_LA.BF64.1.2.9.05.01.00.089.309Shuzhen Wang2015-09-095-256/+281
| | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-090-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-080-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-060-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * Camera3: Reduce the max inflight buffer count for BLOBMansoor Aftab2015-09-052-1/+2
| | | | | | | | | | | | | | * camera: update AU_LINUX_ANDROID_LA.BF64.1.2.9.05.01.00.089.297Shuzhen Wang2015-09-031-27/+36
| | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-020-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-010-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-310-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-290-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-290-0/+0
| | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | |/ | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | * | camera: update AU_LINUX_ANDROID_LA.BF64.1.2.9.05.01.00.089.276Ranjith Kagathi Ananda2015-08-2710-237/+428
| | | | | | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-260-0/+0
| | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-220-0/+0
| | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | * | Camera3: Disable CDS for EISMansoor Aftab2015-08-211-2/+4
| | | | | | | | | | | | | | | | | | | * | Camera3: Temporarily disable log error until b/22952640 fixedMansoor Aftab2015-08-201-1/+1
| | | | | | | | | | | | | | | | | | | * | camera: update AU_LINUX_ANDROID_LA.BF64.1.2.9.05.01.00.089.254Zhijun He2015-08-204-4/+29
| | | | | | | | | | | | | | | | | | | * | camera: update AU_LINUX_ANDROID_LA.BF64.1.2.9.05.01.00.089.251Zhijun He2015-08-192-22/+36
| | | | | | | | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-190-0/+0
| | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-180-0/+0
| | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-150-0/+0
| | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | * | camera: update AU_LINUX_ANDROID_LA.BF64.1.2.9.05.01.00.089.237Vineeta Srivastava2015-08-145-17/+42
| | | | | | | | | | | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-120-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-110-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\ \