Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 25a2979c: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT ME... | Qiwen Zhao | 2015-03-23 | 0 | -0/+0 |
|\ | |||||
| * | reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE. | Qiwen Zhao | 2015-03-20 | 0 | -0/+0 |
| |\ | |||||
| | * | am 9d283076: am 06b23bb5: Merge "Camera2: Update for camera2 API changes" int... | Eino-Ville Talvala | 2015-03-20 | 0 | -0/+0 |
| | |\ | |||||
| | * \ | am 2ad38174: am 9f57c438: Merge "portability: Fix a bug where long AF callbac... | Rachad Alao | 2015-03-20 | 0 | -0/+0 |
| | |\ \ | |||||
| | * \ \ | am e46a8378: am 25ee73ac: Let CameraProxy support setJpegOrientation. | Senpo Hu | 2015-03-20 | 0 | -0/+0 |
| | |\ \ \ | |||||
| | * \ \ \ | am 6c2fa7f2: am ca507f86: Merge "Log null returns from Camera.getParameters" ... | Alan Newberger | 2015-03-20 | 0 | -0/+0 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | am 46637f4b: am d5205c26: Merge "portability: Fix incorrect comparison betwee... | Igor Murashkin | 2015-03-20 | 0 | -0/+0 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | am 3d63c611: am bb013aa3: Camera2: Renames for API consistency | Eino-Ville Talvala | 2015-03-20 | 0 | -0/+0 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | am 320ae7b7: am 3b7da912: ex: Avoid exception if HDR_SCENE_MODE name changes. | Ruben Brunk | 2015-03-20 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | am 0497ec6e: am 9fb7e160: Merge "camera2: Add HDR vendor tag for legacy mode.... | Ruben Brunk | 2015-03-20 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | am df8bf90c: am 58774cf3: Merge "camera2-portability: Touch-to-focus accounti... | Igor Murashkin | 2015-03-20 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | am 5537c7c1: am f73c6cf2: Add ability to reset focus and metering regions usi... | Andy Huibers | 2015-03-20 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | am 25c45cca: am 415cf3ee: camera2-portability: Allow disabling the shutter so... | Sol Boucher | 2015-03-20 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | am d500784b: am 47a01cf0: Merge "camera2-portability: Fix and document obscur... | Sol Boucher | 2015-03-20 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | am 3a89cdf5: am 7d717032: camera2-portability: Fix camera2 takePicture AE reg... | Sol Boucher | 2015-03-20 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | am ec891dde: am 7c8d6957: Merge "camera2-portability: Fix zoom occasionally n... | Sol Boucher | 2015-03-20 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 444909d9: am 984a0864: camera2-portability: Optimize out some camera2 AE p... | Sol Boucher | 2015-03-20 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am c192e279: am f27e71f9: Merge "camera2-portability: Switch to ratio-based z... | Sol Boucher | 2015-03-20 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am bfed64d0: am 336f88ed: Merge "camera2-api: Tag camera2 JPEGs with any prov... | Sol Boucher | 2015-03-20 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am d90959c9: am d6a52ce7: Merge "camera2-api: Work around invalid camera2 API... | Sol Boucher | 2015-03-20 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 18aa7840: resolved conflicts for merge of 1870c071 to lmp-dev-plus-aosp | Stephen Hines | 2015-03-20 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | | | | | | | | | am 46ca918d: am 482fc563: Merge "Make WebP in FrameSequence optional" | Chris Craik | 2015-02-24 | 17 | -19/+30 |
|\| | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | am 482fc563: Merge "Make WebP in FrameSequence optional" | Chris Craik | 2015-02-24 | 17 | -19/+30 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Make WebP in FrameSequence optional" | Chris Craik | 2015-02-24 | 17 | -19/+30 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | | | | | | | Make WebP in FrameSequence optional | Chris Craik | 2015-02-23 | 17 | -19/+30 |
| | |/ / / / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | | | | | Camera2: Portability: Remove HDR hack. | Eino-Ville Talvala | 2015-01-07 | 4 | -60/+5 |
* | | | | | | | | | | | | | | | | | | | | | | | am f924719d: am 7158b670: Fix StaleDataExceptions | Jay Shrauner | 2015-01-05 | 1 | -2/+9 |
|\| | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | am 7158b670: Fix StaleDataExceptions | Jay Shrauner | 2015-01-05 | 1 | -2/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | Fix StaleDataExceptions | Jay Shrauner | 2014-12-19 | 1 | -2/+9 |
* | | | | | | | | | | | | | | | | | | | | | | | am b39a8a0b: am 6765631b: Merge "Remove apache dependency from android-common." | Narayan Kamath | 2014-12-15 | 3 | -3/+227 |
|\| | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | am 6765631b: Merge "Remove apache dependency from android-common." | Narayan Kamath | 2014-12-15 | 3 | -3/+227 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Remove apache dependency from android-common." | Narayan Kamath | 2014-12-15 | 3 | -3/+227 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | | | | | | | Remove apache dependency from android-common. | Narayan Kamath | 2014-12-15 | 3 | -3/+227 |
| | |/ / / / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | | | | | Cleaned up usages of deprecated API | Nick Korostelev | 2014-11-18 | 2 | -4/+2 |
* | | | | | | | | | | | | | | | | | | | | | | | am 036ffbce: am 842e82f6: Merge "Move libvariablespeed to libc++." | Dan Albert | 2014-11-16 | 2 | -6/+4 |
|\| | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | am 842e82f6: Merge "Move libvariablespeed to libc++." | Dan Albert | 2014-11-16 | 2 | -6/+4 |
| |\| | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Move libvariablespeed to libc++." | Dan Albert | 2014-11-16 | 2 | -6/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | | | | | | | Move libvariablespeed to libc++. | Dan Albert | 2014-11-15 | 2 | -6/+4 |
| | |/ / / / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | | | | | am 0c2eb842: am ede5a97a: Merge commit \'25b78c8a18327bd73c3d4d34887dd63953ae... | Qiwen Zhao | 2014-11-13 | 1 | -5/+10 |
|\| | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | am ede5a97a: Merge commit \'25b78c8a18327bd73c3d4d34887dd63953aeaa8c\' into l... | Qiwen Zhao | 2014-11-12 | 1 | -5/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | Merge commit '25b78c8a18327bd73c3d4d34887dd63953aeaa8c' into lmp-mr1-dev | Qiwen Zhao | 2014-11-12 | 1 | -5/+10 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | | | | | | | Ensure default handler always is set if no other error handler registered | Alan Newberger | 2014-11-04 | 1 | -5/+10 |
* | | | | | | | | | | | | | | | | | | | | | | | | am 2c10ad01: am e7e528ac: Merge commit \'c15ddae4862bb9a10b0142fac9558a5f899b... | Qiwen Zhao | 2014-11-13 | 1 | -1/+17 |
|\| | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | am e7e528ac: Merge commit \'c15ddae4862bb9a10b0142fac9558a5f899b1a21\' into l... | Qiwen Zhao | 2014-11-12 | 1 | -1/+17 |
| |\| | | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c15ddae4862bb9a10b0142fac9558a5f899b1a21' into lmp-mr1-dev | Qiwen Zhao | 2014-11-12 | 1 | -1/+17 |
| | |\| | | | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | | | | | Ensure agent error handler is always non-null | Alan Newberger | 2014-10-27 | 1 | -1/+17 |
* | | | | | | | | | | | | | | | | | | | | | | | | am f7400b8a: am 3238136a: Merge commit \'733ca8dfa76ac34d1f9caff8798d01a4a8f4... | Qiwen Zhao | 2014-11-13 | 4 | -15/+34 |
|\| | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | am 3238136a: Merge commit \'733ca8dfa76ac34d1f9caff8798d01a4a8f44002\' into l... | Qiwen Zhao | 2014-11-12 | 4 | -15/+34 |
| |\| | | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | Merge commit '733ca8dfa76ac34d1f9caff8798d01a4a8f44002' into lmp-mr1-dev | Qiwen Zhao | 2014-11-12 | 4 | -15/+34 |
| | |\| | | | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | | | | | Return more detailed debugging info for logging purposes. | Senpo Hu | 2014-10-14 | 4 | -15/+34 |