summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | Camera2: Support waitForSurfacePrepared in BlockingSessionCallbackYin-Chia Yeh2015-06-051-1/+53
* | | | | | | am 037f27e3: resolved conflicts for merge of 9c9958ca to mnc-dev-plus-aospAndrew Lee2015-06-0235-4198/+0
|\| | | | | |
| * | | | | | resolved conflicts for merge of 9c9958ca to mnc-dev-plus-aospAndrew Lee2015-06-0235-4198/+0
| |\| | | | |
| | * | | | | Remove variable-speed library.Andrew Lee2015-06-0135-4209/+0
| | |/ / / /
* | | | | | am c8c2dec0: am 51527497: Merge "Add setCircularMaskEnabled"Chris Craik2015-05-291-2/+41
|\| | | | |
| * | | | | am 51527497: Merge "Add setCircularMaskEnabled"Chris Craik2015-05-291-2/+41
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "Add setCircularMaskEnabled"Chris Craik2015-05-291-2/+41
| | |\ \ \ \
| | | * | | | Add setCircularMaskEnabledChris Craik2015-05-291-2/+41
| | |/ / / /
* | | | | | am 7492d060: am 47acc4b4: Merge "Use try-with-resources instead of Closeables...Paul Duffin2015-05-221-10/+2
|\| | | | |
| * | | | | am 47acc4b4: Merge "Use try-with-resources instead of Closeables.closeQuietly...Paul Duffin2015-05-221-10/+2
| |\| | | |
| | * | | | Merge "Use try-with-resources instead of Closeables.closeQuietly(Closeable)"Paul Duffin2015-05-221-10/+2
| | |\ \ \ \
| | | * | | | Use try-with-resources instead of Closeables.closeQuietly(Closeable)Paul Duffin2015-05-221-10/+2
* | | | | | | am 56f9fe09: am b8ba8dbc: Merge "Include the frameworks/ex/variablespeed/test...Paul Duffin2015-05-221-5/+2
|\| | | | | |
| * | | | | | am b8ba8dbc: Merge "Include the frameworks/ex/variablespeed/tests/Android.mk ...Paul Duffin2015-05-221-5/+2
| |\| | | | |
| | * | | | | Merge "Include the frameworks/ex/variablespeed/tests/Android.mk file"Paul Duffin2015-05-221-5/+2
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Include the frameworks/ex/variablespeed/tests/Android.mk filePaul Duffin2015-05-211-5/+2
| | |/ / / /
* | | | | | am 49640ea5: am 55882370: Merge "Move min framerate behavior to Java"Chris Craik2015-05-142-10/+13
|\| | | | |
| * | | | | am 55882370: Merge "Move min framerate behavior to Java"Chris Craik2015-05-142-10/+13
| |\| | | | | | |/ / / | |/| | |
| | * | | Merge "Move min framerate behavior to Java"Chris Craik2015-05-142-10/+13
| | |\ \ \
| | | * | | Move min framerate behavior to JavaChris Craik2015-05-142-10/+13
| | |/ / /
* | | | | am ebb6c511: Camera2: Support onSurfacePrepared in BlockingSessionCallbackEino-Ville Talvala2015-05-131-0/+11
|\| | | |
| * | | | Camera2: Support onSurfacePrepared in BlockingSessionCallbackEino-Ville Talvala2015-05-131-0/+11
* | | | | am 046ba28a: (-s ours) DO NOT MERGE: Minor style fixes.Jiawen Chen2015-04-290-0/+0
|\| | | |
| * | | | DO NOT MERGE: Minor style fixes.Jiawen Chen2015-04-295-25/+41
* | | | | Merge "Minor style fixes."Jiawen Chen2015-04-295-25/+41
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Minor style fixes.Jiawen Chen2015-04-285-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-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
| | |\ \ \ \ \ \ \ \ \ \ \