summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | | | | | am 0bb54549: Ignore camera.flash_off system property for user buildJames Dong2011-11-181-2/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | Ignore camera.flash_off system property for user buildJames Dong2011-11-171-2/+8
* | | | | | | | | | | | | | | | | | | | | am 8d18af6d: am e4639448: CameraHAL: clean up logsIliyan Malchev2011-11-176-14/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | am e4639448: CameraHAL: clean up logsIliyan Malchev2011-11-176-14/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | CameraHAL: clean up logsIliyan Malchev2011-11-176-14/+16
* | | | | | | | | | | | | | | | | | | | | am 205f5527: am 78dac813: CameraHAL: Do not return error if AF failsIliyan Malchev2011-11-172-15/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | am 78dac813: CameraHAL: Do not return error if AF failsIliyan Malchev2011-11-172-15/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | CameraHAL: Do not return error if AF failsIliyan Malchev2011-11-172-15/+24
| | | |_|/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | am b5375cf2: am 05ea07df: CameraHal: Use Different Timeout for Video ModeTyler Luu2011-11-171-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am 05ea07df: CameraHal: Use Different Timeout for Video ModeTyler Luu2011-11-161-3/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | CameraHal: Use Different Timeout for Video ModeTyler Luu2011-11-161-3/+7
* | | | | | | | | | | | | | | | | | | | am 4da78f38: am 0d086089: am c0cf33c9: Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am 0d086089: am c0cf33c9: Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | am c0cf33c9: Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-160-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-160-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3f940b7f: am 07a53e09: Reconcile with ics-mr0-releaseThe Android Open Source Project2011-11-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | / / / / / / / / / / / / | |_|_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | am 07a53e09: Reconcile with ics-mr0-releaseThe Android Open Source Project2011-11-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-11-160-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / | | | |/| | / / / / / / / / / / / / / / | | | |_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-160-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-110-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 499aad98: am 53613f8e: am 6014a8f2: When camera.flash_off is 1, disable ca...James Dong2011-11-161-1/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | / / / / / / / / / / / | |_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | am 53613f8e: am 6014a8f2: When camera.flash_off is 1, disable camera flash. T...James Dong2011-11-161-1/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | am 6014a8f2: When camera.flash_off is 1, disable camera flash. This is for te...James Dong2011-11-161-1/+24
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | | | | | | / / / / / / / / / / / / | | | |_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | When camera.flash_off is 1, disable camera flash.James Dong2011-11-151-1/+24
| | | |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | am bf97da4d: am a3be7d18: am cb1183d6: videosnapshot memory corruption fixes.Akwasi Boateng2011-11-112-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | am a3be7d18: am cb1183d6: videosnapshot memory corruption fixes.Akwasi Boateng2011-11-112-2/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | am cb1183d6: videosnapshot memory corruption fixes.Akwasi Boateng2011-11-112-2/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | videosnapshot memory corruption fixes.Akwasi Boateng2011-11-112-2/+8
* | | | | | | | | | | | | | | | | am 0b07b86b: am f56f504a: am ac22c209: Revert "CameraHAL: Fix preview not sta...James Dong2011-11-110-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | am f56f504a: am ac22c209: Revert "CameraHAL: Fix preview not starting after s...James Dong2011-11-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | am ac22c209: Revert "CameraHAL: Fix preview not starting after surface is abd...James Dong2011-11-110-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | Revert "CameraHAL: Fix preview not starting after surface is abdandoned"James Dong2011-11-101-5/+4
* | | | | | | | | | | | | | | | | am 477533bc: am 7f0c0d4b: am b8bac933: Merge "HWC: Only invalidate on idle wh...Jamie Gennis2011-11-110-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | am 7f0c0d4b: am b8bac933: Merge "HWC: Only invalidate on idle when blending" ...Jamie Gennis2011-11-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | am b8bac933: Merge "HWC: Only invalidate on idle when blending" into ics-mr0Jamie Gennis2011-11-110-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | Merge "HWC: Only invalidate on idle when blending" into ics-mr0Jamie Gennis2011-11-101-9/+27
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | HWC: Only invalidate on idle when blendingJamie Gennis2011-11-091-9/+27
* | | | | | | | | | | | | | | | | | am c24cc17f: am eb1fc89d: Revert "CameraHAL: Fix preview not starting after s...James Dong2011-11-111-5/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am eb1fc89d: Revert "CameraHAL: Fix preview not starting after surface is abd...James Dong2011-11-111-5/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | Revert "CameraHAL: Fix preview not starting after surface is abdandoned"James Dong2011-11-111-5/+4
* | | | | | | | | | | | | | | | | | am 2f9d236b: am b1c5d8ef: HWC: Only invalidate on idle when blendingJamie Gennis2011-11-111-9/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am b1c5d8ef: HWC: Only invalidate on idle when blendingJamie Gennis2011-11-111-9/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | HWC: Only invalidate on idle when blendingJamie Gennis2011-11-111-9/+27
| | | | | | | | | | | | | | | | | |
| \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
*-. \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Reconcile with ics-mr0-release ics-mr1-releaseThe Android Open Source Project2011-11-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | / / / / / / / / / / / | | | |_|_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-090-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-080-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8a2c7a2d: am 8eedae16: am 50f5c8a3: CameraHal: WA for green thumbnail for ...Tyler Luu2011-11-101-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | am 8eedae16: am 50f5c8a3: CameraHal: WA for green thumbnail for video snapshotTyler Luu2011-11-101-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |