summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2015-06-09Merge "Camera2: Support waitForSurfacePrepared in BlockingSessionCallback" in...android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.1_r9android-6.0.1_r8android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1marshmallow-releasemarshmallow-mr3-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-releaseYin-Chia Yeh
2015-06-05Camera2: Support waitForSurfacePrepared in BlockingSessionCallbackYin-Chia Yeh
2015-06-01Remove variable-speed library.Andrew Lee
2015-05-13Camera2: Support onSurfacePrepared in BlockingSessionCallbackEino-Ville Talvala
2015-04-29DO NOT MERGE: Minor style fixes.Jiawen Chen
2015-04-23am 20df46ed: am 3ed91a81: Merge "Fix race in bitmap decode vs release."Chris Craik
2015-04-23am 3ed91a81: Merge "Fix race in bitmap decode vs release."Chris Craik
2015-04-23Merge "Fix race in bitmap decode vs release."master-soongChris Craik
2015-04-23Fix race in bitmap decode vs release.Chris Craik
2015-04-20am 47098ae3: am 33817eae: Merge "Simplify destruction path - require users to...Chris Craik
2015-04-20am 33817eae: Merge "Simplify destruction path - require users to call destroy()"Chris Craik
2015-04-20Merge "Simplify destruction path - require users to call destroy()"Chris Craik
2015-04-03Merge "Fix StaleDataException in isPartitionEmpty"Jay Shrauner
2015-04-03am 315c8a38: am d90222ba: Merge "Adding Bytebuffer support to rastermill libr...Chris Craik
2015-04-02am d90222ba: Merge "Adding Bytebuffer support to rastermill library"Chris Craik
2015-04-02Merge "Adding Bytebuffer support to rastermill library"android-wear-5.1.1_r1android-wear-5.1.0_r1Chris Craik
2015-04-02Fix StaleDataException in isPartitionEmptyJay Shrauner
2015-04-01Adding Bytebuffer support to rastermill libraryChris Craik
2015-03-23am 25a2979c: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT ME...Qiwen Zhao
2015-03-20reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.Qiwen Zhao
2015-03-20am 9d283076: am 06b23bb5: Merge "Camera2: Update for camera2 API changes" int...Eino-Ville Talvala
2015-03-20am 2ad38174: am 9f57c438: Merge "portability: Fix a bug where long AF callbac...Rachad Alao
2015-03-20am e46a8378: am 25ee73ac: Let CameraProxy support setJpegOrientation.Senpo Hu
2015-03-20am 6c2fa7f2: am ca507f86: Merge "Log null returns from Camera.getParameters" ...Alan Newberger
2015-03-20am 46637f4b: am d5205c26: Merge "portability: Fix incorrect comparison betwee...Igor Murashkin
2015-03-20am 3d63c611: am bb013aa3: Camera2: Renames for API consistencyEino-Ville Talvala
2015-03-20am 320ae7b7: am 3b7da912: ex: Avoid exception if HDR_SCENE_MODE name changes.Ruben Brunk
2015-03-20am 0497ec6e: am 9fb7e160: Merge "camera2: Add HDR vendor tag for legacy mode....Ruben Brunk
2015-03-20am df8bf90c: am 58774cf3: Merge "camera2-portability: Touch-to-focus accounti...Igor Murashkin
2015-03-20am 5537c7c1: am f73c6cf2: Add ability to reset focus and metering regions usi...Andy Huibers
2015-03-20am 25c45cca: am 415cf3ee: camera2-portability: Allow disabling the shutter so...Sol Boucher
2015-03-20am d500784b: am 47a01cf0: Merge "camera2-portability: Fix and document obscur...Sol Boucher
2015-03-20am 3a89cdf5: am 7d717032: camera2-portability: Fix camera2 takePicture AE reg...Sol Boucher
2015-03-20am ec891dde: am 7c8d6957: Merge "camera2-portability: Fix zoom occasionally n...Sol Boucher
2015-03-20am 444909d9: am 984a0864: camera2-portability: Optimize out some camera2 AE p...Sol Boucher
2015-03-20am c192e279: am f27e71f9: Merge "camera2-portability: Switch to ratio-based z...Sol Boucher
2015-03-20am bfed64d0: am 336f88ed: Merge "camera2-api: Tag camera2 JPEGs with any prov...Sol Boucher
2015-03-20am d90959c9: am d6a52ce7: Merge "camera2-api: Work around invalid camera2 API...Sol Boucher
2015-03-20am 18aa7840: resolved conflicts for merge of 1870c071 to lmp-dev-plus-aospStephen Hines
2015-02-24am 46ca918d: am 482fc563: Merge "Make WebP in FrameSequence optional"Chris Craik
2015-02-24am 482fc563: Merge "Make WebP in FrameSequence optional"Chris Craik
2015-02-24Merge "Make WebP in FrameSequence optional"Chris Craik
2015-02-23Make WebP in FrameSequence optionalChris Craik
2015-01-29Simplify destruction path - require users to call destroy()Chris Craik
2015-01-07Camera2: Portability: Remove HDR hack.Eino-Ville Talvala
2015-01-05am f924719d: am 7158b670: Fix StaleDataExceptionsJay Shrauner
2015-01-05am 7158b670: Fix StaleDataExceptionsJay Shrauner
2014-12-19Fix StaleDataExceptionsandroid-5.1.1_r5android-5.1.1_r28android-5.1.1_r22android-5.1.1_r17android-5.1.1_r12lollipop-mr1-wfc-releaselollipop-mr1-devJay Shrauner
2014-12-15am b39a8a0b: am 6765631b: Merge "Remove apache dependency from android-common."Narayan Kamath
2014-12-15am 6765631b: Merge "Remove apache dependency from android-common."Narayan Kamath