summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add bounds checking for transparency lookupHEADreplicant-6.0-0004-rc2replicant-6.0-0004-rc1cm-13.0Chris Craik2018-04-061-4/+5
* Skip composition of frames lacking a color mapChris Craik2018-01-101-13/+12
* DO NOT MERGEreplicant-6.0-0003Leon Scroggins III2017-07-171-2/+2
* resolve merge conflicts of 89cdd4cb to mnc-devreplicant-6.0-0002replicant-6.0-0001Chris Craik2017-03-221-0/+4
* resolve merge conflicts of 3802db4 to mnc-devChris Craik2017-01-132-2/+19
* Handle color bounds correctly in GIF decode.Chris Craik2016-12-121-1/+1
* Merge "Camera2: Support waitForSurfacePrepared in BlockingSessionCallback" in...stable/cm-13.0-ZNH2KBYin-Chia Yeh2015-06-091-1/+53
|\
| * Camera2: Support waitForSurfacePrepared in BlockingSessionCallbackYin-Chia Yeh2015-06-051-1/+53
* | Remove variable-speed library.Andrew Lee2015-06-0135-4209/+0
|/
* Camera2: Support onSurfacePrepared in BlockingSessionCallbackEino-Ville Talvala2015-05-131-0/+11
* DO NOT MERGE: Minor style fixes.Jiawen Chen2015-04-295-25/+41
* am 20df46ed: am 3ed91a81: Merge "Fix race in bitmap decode vs release."Chris Craik2015-04-231-20/+39
|\
| * am 3ed91a81: Merge "Fix race in bitmap decode vs release."Chris Craik2015-04-231-20/+39
| |\
| | * Merge "Fix race in bitmap decode vs release."Chris Craik2015-04-231-20/+39
| | |\
| | | * Fix race in bitmap decode vs release.Chris Craik2015-04-231-20/+39
| | |/
* | | am 47098ae3: am 33817eae: Merge "Simplify destruction path - require users to...Chris Craik2015-04-201-3/+1
|\ \ \ | |/ /
| * | am 33817eae: Merge "Simplify destruction path - require users to call destroy()"Chris Craik2015-04-201-3/+1
| |\ \ | | |/
| | * Merge "Simplify destruction path - require users to call destroy()"Chris Craik2015-04-201-3/+1
| | |\
| | | * Simplify destruction path - require users to call destroy()Chris Craik2015-01-291-6/+1
* | | | Merge "Fix StaleDataException in isPartitionEmpty"Jay Shrauner2015-04-031-1/+1
|\ \ \ \
| * | | | Fix StaleDataException in isPartitionEmptyJay Shrauner2015-04-021-1/+1
* | | | | am 315c8a38: am d90222ba: Merge "Adding Bytebuffer support to rastermill libr...Chris Craik2015-04-0312-30/+149
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am d90222ba: Merge "Adding Bytebuffer support to rastermill library"Chris Craik2015-04-0212-30/+149
| |\ \ \ | | |/ /
| | * | Merge "Adding Bytebuffer support to rastermill library"Chris Craik2015-04-0212-30/+149
| | |\ \
| | | * | Adding Bytebuffer support to rastermill libraryChris Craik2015-04-0112-30/+149
| | |/ /
* | | | 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-210-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-2417-19/+30
| | |/ / / / / / / / / / / / / / / / / / / / /