summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | 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
* | | 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 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
* | | | | | | | | | | | | | | | | | | | | | 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 6765631b: Merge "Remove apache dependency from android-common."Narayan Kamath2014-12-153-3/+227
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6765631b2eac9978b7ca2b7f8ef0dd6b53808d10': Remove apache dependency from android-common.
| * | | | | | | | | | | | | | | | | | | | | Merge "Remove apache dependency from android-common."Narayan Kamath2014-12-153-3/+227
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | Remove apache dependency from android-common.Narayan Kamath2014-12-153-3/+227
| |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This static library was relying on HttpDateTime via AndroidHttpClient. (and is the only user of this API in our tree). Regrettably, the most reasonable way forward seems to be copy that class into frameworks/ex. Using reflection is possible too, but it's riskier since we have to ensure this class exists unmodified all the way back to froyo. See API council request b/2553589 for why this was in AndroidHttpClient in the first place. Also, this change sets LOCAL_SDK_VERSION := 8 for tests to match the library version. bug: 18027885 Change-Id: I9c473f60f0314758120e0d6c6f9b56e4d77ba658
* | | | | | | | | | | | | | | | | | | | | | am 842e82f6: Merge "Move libvariablespeed to libc++."Dan Albert2014-11-162-6/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '842e82f6b8d85c71469f4decdfd5d1a486d55881': Move libvariablespeed to libc++.
| * | | | | | | | | | | | | | | | | | | | | Merge "Move libvariablespeed to libc++."Dan Albert2014-11-162-6/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | Move libvariablespeed to libc++.Dan Albert2014-11-152-6/+4
| |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15193147 Change-Id: Ie582a5789fea7fa83442d998b0d27388176e4e77
* | | | | | | | | | | | | | | | | | | | | | am ede5a97a: Merge commit \'25b78c8a18327bd73c3d4d34887dd63953aeaa8c\' into ↵Qiwen Zhao2014-11-121-5/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'ede5a97a7ed75ac04dfa58c3b867e67ea4e80f92': Ensure default handler always is set if no other error handler registered
| * | | | | | | | | | | | | | | | | | | | | Merge commit '25b78c8a18327bd73c3d4d34887dd63953aeaa8c' into lmp-mr1-devQiwen Zhao2014-11-121-5/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | Ensure default handler always is set if no other error handler registeredAlan Newberger2014-11-041-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid memory leaks we set the error handler to null in activity onDestroy. But, the agent may receive callbacks after this, so ensure at minimum that we set the default logging handler to default handle errors post activity destroy. Bug: 18200874 Bug: 18202261 Change-Id: Ie7251a149ab02c474d8affd15af6b9ea48c2cdc0
* | | | | | | | | | | | | | | | | | | | | | | am e7e528ac: Merge commit \'c15ddae4862bb9a10b0142fac9558a5f899b1a21\' into ↵Qiwen Zhao2014-11-121-1/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'e7e528accaef2dfdc4c74c3ad116ede1cbb0c2e9': Ensure agent error handler is always non-null
| * | | | | | | | | | | | | | | | | | | | | | Merge commit 'c15ddae4862bb9a10b0142fac9558a5f899b1a21' into lmp-mr1-devQiwen Zhao2014-11-121-1/+17
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Ensure agent error handler is always non-nullAlan Newberger2014-10-271-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a dummy placeholder handler which logs warnings, which can be replaced by app if desired. This makes various assumptions valid that this is non-null. Bug: 18137167 Change-Id: I0f508dff3cfe766ccc5a3c5a26c6196f4fb31e04
* | | | | | | | | | | | | | | | | | | | | | | am 3238136a: Merge commit \'733ca8dfa76ac34d1f9caff8798d01a4a8f44002\' into ↵Qiwen Zhao2014-11-124-15/+34
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '3238136a95ea85c0283a1b623e501c835ed5b753': Return more detailed debugging info for logging purposes.
| * | | | | | | | | | | | | | | | | | | | | | Merge commit '733ca8dfa76ac34d1f9caff8798d01a4a8f44002' into lmp-mr1-devQiwen Zhao2014-11-124-15/+34
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Return more detailed debugging info for logging purposes.Senpo Hu2014-10-144-15/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If71afbf8029e9e4d5560eb6a655ece990cf19a19
* | | | | | | | | | | | | | | | | | | | | | | am 7ce2ce7d: Merge commit \'318eeb225f4567a8c2a6fe14baa06e8923ebe622\' into ↵Qiwen Zhao2014-11-125-83/+30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '7ce2ce7d166d839eb62e03b4cdad7fad4b5e267a': Cleanup: handle API 1 error callback in CameraExceptionHandler.
| * | | | | | | | | | | | | | | | | | | | | | Merge commit '318eeb225f4567a8c2a6fe14baa06e8923ebe622' into lmp-mr1-devQiwen Zhao2014-11-125-83/+30
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Cleanup: handle API 1 error callback in CameraExceptionHandler.Senpo Hu2014-10-105-83/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Portability API used to expose setErrorCallback call which is API 1 only. The new CameraExceptionHandler should be the centralized place to handle different camera errors. Bug: 17931297 Change-Id: I0212f96a98e0caca64aca0f947b991b895d8d56b
* | | | | | | | | | | | | | | | | | | | | | | am a84d38ef: Merge commit \'2d01b8e2b5ad30ce3c442799cad4c3d26607fc6f\' into ↵Qiwen Zhao2014-11-120-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'a84d38ef1687853d1e1e6d1e05533c80405fa322': Overhaul error handling in AndroidCameraAgentImpl.
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 23:15:35 +0000