summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 25a2979c: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT ME...Qiwen Zhao2015-03-230-0/+0
|\
| * reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.Qiwen Zhao2015-03-200-0/+0
| |\
| | * am 9d283076: am 06b23bb5: Merge "Camera2: Update for camera2 API changes" int...Eino-Ville Talvala2015-03-200-0/+0
| | |\
| | * \ am 2ad38174: am 9f57c438: Merge "portability: Fix a bug where long AF callbac...Rachad Alao2015-03-200-0/+0
| | |\ \
| | * \ \ am e46a8378: am 25ee73ac: Let CameraProxy support setJpegOrientation.Senpo Hu2015-03-200-0/+0
| | |\ \ \
| | * \ \ \ am 6c2fa7f2: am ca507f86: Merge "Log null returns from Camera.getParameters" ...Alan Newberger2015-03-200-0/+0
| | |\ \ \ \
| | * \ \ \ \ am 46637f4b: am d5205c26: Merge "portability: Fix incorrect comparison betwee...Igor Murashkin2015-03-200-0/+0
| | |\ \ \ \ \
| | * \ \ \ \ \ am 3d63c611: am bb013aa3: Camera2: Renames for API consistencyEino-Ville Talvala2015-03-200-0/+0
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ am 320ae7b7: am 3b7da912: ex: Avoid exception if HDR_SCENE_MODE name changes.Ruben Brunk2015-03-200-0/+0
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ am 0497ec6e: am 9fb7e160: Merge "camera2: Add HDR vendor tag for legacy mode....Ruben Brunk2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ am df8bf90c: am 58774cf3: Merge "camera2-portability: Touch-to-focus accounti...Igor Murashkin2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ am 5537c7c1: am f73c6cf2: Add ability to reset focus and metering regions usi...Andy Huibers2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ am 25c45cca: am 415cf3ee: camera2-portability: Allow disabling the shutter so...Sol Boucher2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ am d500784b: am 47a01cf0: Merge "camera2-portability: Fix and document obscur...Sol Boucher2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ am 3a89cdf5: am 7d717032: camera2-portability: Fix camera2 takePicture AE reg...Sol Boucher2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ am ec891dde: am 7c8d6957: Merge "camera2-portability: Fix zoom occasionally n...Sol Boucher2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 444909d9: am 984a0864: camera2-portability: Optimize out some camera2 AE p...Sol Boucher2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c192e279: am f27e71f9: Merge "camera2-portability: Switch to ratio-based z...Sol Boucher2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am bfed64d0: am 336f88ed: Merge "camera2-api: Tag camera2 JPEGs with any prov...Sol Boucher2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d90959c9: am d6a52ce7: Merge "camera2-api: Work around invalid camera2 API...Sol Boucher2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 18aa7840: resolved conflicts for merge of 1870c071 to lmp-dev-plus-aospStephen Hines2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | am 46ca918d: am 482fc563: Merge "Make WebP in FrameSequence optional"Chris Craik2015-02-2417-19/+30
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | am 482fc563: Merge "Make WebP in FrameSequence optional"Chris Craik2015-02-2417-19/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Make WebP in FrameSequence optional"Chris Craik2015-02-2417-19/+30
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | Make WebP in FrameSequence optionalChris Craik2015-02-2317-19/+30
| | |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Camera2: Portability: Remove HDR hack.Eino-Ville Talvala2015-01-074-60/+5
* | | | | | | | | | | | | | | | | | | | | | | am f924719d: am 7158b670: Fix StaleDataExceptionsJay Shrauner2015-01-051-2/+9
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | am 7158b670: Fix StaleDataExceptionsJay Shrauner2015-01-051-2/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Fix StaleDataExceptionsJay Shrauner2014-12-191-2/+9
* | | | | | | | | | | | | | | | | | | | | | | am b39a8a0b: am 6765631b: Merge "Remove apache dependency from android-common."Narayan Kamath2014-12-153-3/+227
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | am 6765631b: Merge "Remove apache dependency from android-common."Narayan Kamath2014-12-153-3/+227
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "Remove apache dependency from android-common."Narayan Kamath2014-12-153-3/+227
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | Remove apache dependency from android-common.Narayan Kamath2014-12-153-3/+227
| | |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Cleaned up usages of deprecated APINick Korostelev2014-11-182-4/+2
* | | | | | | | | | | | | | | | | | | | | | | am 036ffbce: am 842e82f6: Merge "Move libvariablespeed to libc++."Dan Albert2014-11-162-6/+4
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | am 842e82f6: Merge "Move libvariablespeed to libc++."Dan Albert2014-11-162-6/+4
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "Move libvariablespeed to libc++."Dan Albert2014-11-162-6/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | Move libvariablespeed to libc++.Dan Albert2014-11-152-6/+4
| | |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | am 0c2eb842: am ede5a97a: Merge commit \'25b78c8a18327bd73c3d4d34887dd63953ae...Qiwen Zhao2014-11-131-5/+10
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | am ede5a97a: Merge commit \'25b78c8a18327bd73c3d4d34887dd63953aeaa8c\' into l...Qiwen Zhao2014-11-121-5/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge commit '25b78c8a18327bd73c3d4d34887dd63953aeaa8c' into lmp-mr1-devQiwen Zhao2014-11-121-5/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | Ensure default handler always is set if no other error handler registeredAlan Newberger2014-11-041-5/+10
* | | | | | | | | | | | | | | | | | | | | | | | am 2c10ad01: am e7e528ac: Merge commit \'c15ddae4862bb9a10b0142fac9558a5f899b...Qiwen Zhao2014-11-131-1/+17
|\| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | am e7e528ac: Merge commit \'c15ddae4862bb9a10b0142fac9558a5f899b1a21\' into l...Qiwen Zhao2014-11-121-1/+17
| |\| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge commit 'c15ddae4862bb9a10b0142fac9558a5f899b1a21' into lmp-mr1-devQiwen Zhao2014-11-121-1/+17
| | |\| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Ensure agent error handler is always non-nullAlan Newberger2014-10-271-1/+17
* | | | | | | | | | | | | | | | | | | | | | | | am f7400b8a: am 3238136a: Merge commit \'733ca8dfa76ac34d1f9caff8798d01a4a8f4...Qiwen Zhao2014-11-134-15/+34
|\| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | am 3238136a: Merge commit \'733ca8dfa76ac34d1f9caff8798d01a4a8f44002\' into l...Qiwen Zhao2014-11-124-15/+34
| |\| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge commit '733ca8dfa76ac34d1f9caff8798d01a4a8f44002' into lmp-mr1-devQiwen Zhao2014-11-124-15/+34
| | |\| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Return more detailed debugging info for logging purposes.Senpo Hu2014-10-144-15/+34