summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Camera2: Support waitForSurfacePrepared in BlockingSessionCallback" ↵stable/cm-13.0-ZNH2KBYin-Chia Yeh2015-06-091-1/+53
|\ | | | | | | into mnc-dev
| * Camera2: Support waitForSurfacePrepared in BlockingSessionCallbackYin-Chia Yeh2015-06-051-1/+53
| | | | | | | | Change-Id: I7f6f351092a173fe0b7a567e5240cb5abe8cb2de
* | Remove variable-speed library.Andrew Lee2015-06-0135-4209/+0
|/ | | | | Bug: 21444991 Change-Id: I3e1fc7f0773ddfa227cde6b5161102a087f47702
* Camera2: Support onSurfacePrepared in BlockingSessionCallbackEino-Ville Talvala2015-05-131-0/+11
| | | | Change-Id: Id46c044badb98f7837ca3898758997c171aa5c68
* DO NOT MERGE: Minor style fixes.Jiawen Chen2015-04-295-25/+41
| | | | | | | | | - BlockingCameraManager had the wrong TAG. - Added static / final to NUM_STATES. - Javadoc @param mismatch. Change-Id: I0dbe6b3d4bdcb5a51ba0aea89985c3495a59381e (cherry picked from commit 5a772174d14175474e76701b07cc0be86c3df32a)
* am 20df46ed: am 3ed91a81: Merge "Fix race in bitmap decode vs release."Chris Craik2015-04-231-20/+39
|\ | | | | | | | | * commit '20df46edeb2ddac7be4a4587e2ce210a735a1871': Fix race in bitmap decode vs release.
| * am 3ed91a81: Merge "Fix race in bitmap decode vs release."Chris Craik2015-04-231-20/+39
| |\ | | | | | | | | | | | | * commit '3ed91a812dc34b1a8a594322aaff5d9df0467d3f': Fix race in bitmap decode vs release.
| | * 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
| | |/ | | | | | | | | | | | | | | | | | | Now, if the decode is still running at destroy time, have the decode runnable/thread manage the cleanup. Change-Id: Ifcebf9f00417275229087d6c36989519d5f73aed
* | | am 47098ae3: am 33817eae: Merge "Simplify destruction path - require users ↵Chris Craik2015-04-201-3/+1
|\| | | | | | | | | | | | | | | | | | | | to call destroy()" * commit '47098ae3d7bcf54e180b381327fdc0f3175b286a': Simplify destruction path - require users to call destroy()
| * | am 33817eae: Merge "Simplify destruction path - require users to call destroy()"Chris Craik2015-04-201-3/+1
| |\| | | | | | | | | | | | | * commit '33817eaefa27af45f0e25358ff36a09a4843aab8': Simplify destruction path - require users to call destroy()
| | * 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
| | | | | | | | | | | | | | | | | | | | bug:19035637 Change-Id: I1efbd8682977dd58c8c454b8253bfa82f6534ff5
* | | | Merge "Fix StaleDataException in isPartitionEmpty"Jay Shrauner2015-04-031-1/+1
|\ \ \ \
| * | | | Fix StaleDataException in isPartitionEmptyJay Shrauner2015-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check whether the cursor is closed before querying getCount() Bug:20052582 Change-Id: I4f205cba25428a95d8416d7f7bcedbda40d622c4
* | | | | am 315c8a38: am d90222ba: Merge "Adding Bytebuffer support to rastermill ↵Chris Craik2015-04-0312-30/+149
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | library" * commit '315c8a384c4ca2a5670b9eed407caa5dea6c1ce0': Adding Bytebuffer support to rastermill library
| * | | am d90222ba: Merge "Adding Bytebuffer support to rastermill library"Chris Craik2015-04-0212-30/+149
| |\| | | | | | | | | | | | | | | | | | * commit 'd90222baefb107ddc08d024b02d664d18f50f44f': Adding Bytebuffer support to rastermill library
| | * | Merge "Adding Bytebuffer support to rastermill library"Chris Craik2015-04-0212-30/+149
| | |\ \
| | | * | Adding Bytebuffer support to rastermill libraryChris Craik2015-04-0112-30/+149
| | |/ / | | | | | | | | | | | | Change-Id: Ifedaeaec49caffa5add357246ff43e2b870949f0
* | | | am 25a2979c: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT ↵Qiwen Zhao2015-03-230-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | MERGE ANYWHERE. * commit '25a2979c374bda4f4aa26b26bc72a28fa55f38cf':
| * | | 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" ↵Eino-Ville Talvala2015-03-200-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '9d283076744f1d8f5166476b747f23c3bc443aba':
| | * \ \ am 2ad38174: am 9f57c438: Merge "portability: Fix a bug where long AF ↵Rachad Alao2015-03-200-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | callbacks caused ISE timeouts" into lmp-dev * commit '2ad38174f2adfd09bc9b28087820079575877645':
| | * \ \ \ am e46a8378: am 25ee73ac: Let CameraProxy support setJpegOrientation.Senpo Hu2015-03-200-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | * commit 'e46a8378bc9d05ea41eca153f98b00e43ff9f70b':
| | * \ \ \ \ am 6c2fa7f2: am ca507f86: Merge "Log null returns from Camera.getParameters" ↵Alan Newberger2015-03-200-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '6c2fa7f20c7dc4f2d425f07b39cb574291c3ed15':
| | * \ \ \ \ \ am 46637f4b: am d5205c26: Merge "portability: Fix incorrect comparison ↵Igor Murashkin2015-03-200-0/+0
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | between int and Integer" into lmp-dev * commit '46637f4b11090250fb16ce27e50b012351c750e6':
| | * \ \ \ \ \ \ am 3d63c611: am bb013aa3: Camera2: Renames for API consistencyEino-Ville Talvala2015-03-200-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3d63c61135a25a725dba50180c21254eb436e3b2':
| | * \ \ \ \ \ \ \ am 320ae7b7: am 3b7da912: ex: Avoid exception if HDR_SCENE_MODE name changes.Ruben Brunk2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '320ae7b7410342eedb7b689bb5a84323f3c125d8':
| | * \ \ \ \ \ \ \ \ am 0497ec6e: am 9fb7e160: Merge "camera2: Add HDR vendor tag for legacy ↵Ruben Brunk2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mode." into lmp-dev * commit '0497ec6e0b24e5153dda7dcd7ff82cfabfcfdf18':
| | * \ \ \ \ \ \ \ \ \ am df8bf90c: am 58774cf3: Merge "camera2-portability: Touch-to-focus ↵Igor Murashkin2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | accounting for effective crop" into lmp-dev * commit 'df8bf90c8b1753a9e233f7694881c4c5bb172812':
| | * \ \ \ \ \ \ \ \ \ \ am 5537c7c1: am f73c6cf2: Add ability to reset focus and metering regions ↵Andy Huibers2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using API1. * commit '5537c7c145c8be2289772910eb4a60b43de8c30f':
| | * \ \ \ \ \ \ \ \ \ \ \ am 25c45cca: am 415cf3ee: camera2-portability: Allow disabling the shutter ↵Sol Boucher2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sound on API 2 * commit '25c45cca5f0ee247554d26a3376096ed5c8ec010':
| | * \ \ \ \ \ \ \ \ \ \ \ \ am d500784b: am 47a01cf0: Merge "camera2-portability: Fix and document ↵Sol Boucher2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | obscure state machine bug" into lmp-dev * commit 'd500784b9bdca48d19604bb4cebe84ea08c88a90':
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ am 3a89cdf5: am 7d717032: camera2-portability: Fix camera2 takePicture AE ↵Sol Boucher2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | regression * commit '3a89cdf55cdef9426b0679f4d9e706da3715b2b9':
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ec891dde: am 7c8d6957: Merge "camera2-portability: Fix zoom occasionally ↵Sol Boucher2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not working" into lmp-dev * commit 'ec891dde6a5de29ed505692b653f3ba3b3cae81f':
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 444909d9: am 984a0864: camera2-portability: Optimize out some camera2 AE ↵Sol Boucher2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | precaptures * commit '444909d9aff00d322b5a596e576175bcf1550504':
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c192e279: am f27e71f9: Merge "camera2-portability: Switch to ratio-based ↵Sol Boucher2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | zoom interfaces" into lmp-dev * commit 'c192e279acae7ce5b75e26c443bd53c33e9c667c':
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am bfed64d0: am 336f88ed: Merge "camera2-api: Tag camera2 JPEGs with any ↵Sol Boucher2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | provided location" into lmp-dev * commit 'bfed64d0dc0020ab53ec734ea2547ea71ce0178f':
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d90959c9: am d6a52ce7: Merge "camera2-api: Work around invalid camera2 ↵Sol Boucher2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API focus modes" into lmp-dev * commit 'd90959c9fcf4ec6d6f332ab534993913538bfe38':
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 18aa7840: resolved conflicts for merge of 1870c071 to lmp-dev-plus-aospStephen Hines2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '18aa7840e17473544a80205367435e9c2e8b7527': Remove deprecated carousel from frameworks/ex.
* | | | | | | | | | | | | | | | | | | | | | | am 46ca918d: am 482fc563: Merge "Make WebP in FrameSequence optional"Chris Craik2015-02-2417-19/+30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '46ca918db82c1fca3f370ec6a9b936bf7268aa85': Make WebP in FrameSequence optional
| * | | | | | | | | | | | | | | | | | | | | | am 482fc563: Merge "Make WebP in FrameSequence optional"Chris Craik2015-02-2417-19/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '482fc563fa9783cce1dee882e8d4cd4d2d92b1c6': Make WebP in FrameSequence optional
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Make WebP in FrameSequence optional"Chris Craik2015-02-2417-19/+30
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Make WebP in FrameSequence optionalChris Craik2015-02-2317-19/+30
| | |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass FRAMESEQUENCE_INCLUDE_WEBP=true to enable Change-Id: Ide605b3aca80c10a805d8983b2f06bcc983bf95a
* | | | | | | | | | | | | | | | | | | | | | | Camera2: Portability: Remove HDR hack.Eino-Ville Talvala2015-01-074-60/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18640480 Change-Id: I8f0b42cbb05c6881fbc32664ce9e2b97a0ef5db3
* | | | | | | | | | | | | | | | | | | | | | | am f924719d: am 7158b670: Fix StaleDataExceptionsJay Shrauner2015-01-051-2/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f924719d491c2b1a1c42234a0a174d975691b483': Fix StaleDataExceptions
| * | | | | | | | | | | | | | | | | | | | | | am 7158b670: Fix StaleDataExceptionsJay Shrauner2015-01-051-2/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7158b6705d330ac1e61d5aa51c51b54507c4ab88': Fix StaleDataExceptions
| | * | | | | | | | | | | | | | | | | | | | | Fix StaleDataExceptionsJay Shrauner2014-12-191-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In ensureCacheValid, check whether the cursor is closed before querying its count. In getItem, check whether the cursor is closed before moving it to position, as was already being done in getItemId. Bug:18815354 Change-Id: I4cf2509923695afe9499d0507383c4e0d51bd23e
* | | | | | | | | | | | | | | | | | | | | | | am b39a8a0b: am 6765631b: Merge "Remove apache dependency from android-common."Narayan Kamath2014-12-153-3/+227
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b39a8a0b13bd48abb77439f62454c2f737b95f45': Remove apache dependency from android-common.
| * | | | | | | | | | | | | | | | | | | | | | am 6765631b: Merge "Remove apache dependency from android-common."Narayan Kamath2014-12-153-3/+227
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6765631b2eac9978b7ca2b7f8ef0dd6b53808d10': Remove apache dependency from android-common.
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 04:32:32 +0000