summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | | | Cleaned up usages of deprecated APINick Korostelev2014-11-182-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie2f5fdc51d47e1d70dcfaf27550412d8569c1c04
* | | | | | | | | | | | | | | | | | | | | | | am 036ffbce: am 842e82f6: Merge "Move libvariablespeed to libc++."Dan Albert2014-11-162-6/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '036ffbce1b8ca4032f05feab5e35c67212cb265e': Move libvariablespeed to libc++.
| * | | | | | | | | | | | | | | | | | | | | | 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 0c2eb842: am ede5a97a: Merge commit ↵Qiwen Zhao2014-11-131-5/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \'25b78c8a18327bd73c3d4d34887dd63953aeaa8c\' into lmp-mr1-dev * commit '0c2eb84264c5c5a9f4c9e7187bf926296ee49511': Ensure default handler always is set if no other error handler registered
| * | | | | | | | | | | | | | | | | | | | | | 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 2c10ad01: am e7e528ac: Merge commit ↵Qiwen Zhao2014-11-131-1/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \'c15ddae4862bb9a10b0142fac9558a5f899b1a21\' into lmp-mr1-dev * commit '2c10ad010dc8650d43b893ecba23091e9e0dd250': Ensure agent error handler is always non-null
| * | | | | | | | | | | | | | | | | | | | | | | 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 f7400b8a: am 3238136a: Merge commit ↵Qiwen Zhao2014-11-134-15/+34
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \'733ca8dfa76ac34d1f9caff8798d01a4a8f44002\' into lmp-mr1-dev * commit 'f7400b8ad32e57b89840b53c94a9fbcca66fcc5f': Return more detailed debugging info for logging purposes.
| * | | | | | | | | | | | | | | | | | | | | | | 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 41663542: am 7ce2ce7d: Merge commit ↵Qiwen Zhao2014-11-135-83/+30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \'318eeb225f4567a8c2a6fe14baa06e8923ebe622\' into lmp-mr1-dev * commit '41663542e572c06b1be98d0b4c0bc198a43242e0': Cleanup: handle API 1 error callback in CameraExceptionHandler.
| * | | | | | | | | | | | | | | | | | | | | | | 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 97024451: am a84d38ef: Merge commit ↵Qiwen Zhao2014-11-130-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \'2d01b8e2b5ad30ce3c442799cad4c3d26607fc6f\' into lmp-mr1-dev * commit '970244510e092d91c11b213440cfa6c194cfafca': Overhaul error handling in AndroidCameraAgentImpl.
| * | | | | | | | | | | | | | | | | | | | | | | am a84d38ef: Merge commit \'2d01b8e2b5ad30ce3c442799cad4c3d26607fc6f\' into ↵Qiwen Zhao2014-11-120-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'a84d38ef1687853d1e1e6d1e05533c80405fa322': Overhaul error handling in AndroidCameraAgentImpl.
| | * | | | | | | | | | | | | | | | | | | | | | Merge commit '2d01b8e2b5ad30ce3c442799cad4c3d26607fc6f' into lmp-mr1-devQiwen Zhao2014-11-120-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Overhaul error handling in AndroidCameraAgentImpl.Senpo Hu2014-10-075-336/+653
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DispatchThread could throw RTE when timeout (2500 ms). This CL extends it to 3500 ms and also re-route the exception to the proper exception callback instead of surfacing that up to the app. Since a lot of try-catch block is added, CameraExceptionHandler class is added to keep CameraAgent.java clean. The portability layer should ensure the proper use of Camera API 1. With this assumption, any run time exception thrown by the framework should be considered fatal. Once it happened, CameraAgent/CameraProxy should be invalidated. Any subsequent camera commands should be gated as no-ops to prevent HAL hanging symptom. Users should be guided to exit the app and recover from the camera error. Design Doc: https://docs.google.com/a/google.com/document/d/1t0sEPwGgc387XcoCVC7kT9Y_RSZPxcayla03M4bdn0U/edit Corresponding CL for the app layer: ag/562383 Bug: 16189216 Change-Id: I33e69aeff0c8e4211e82e0e83133915700c4eb8f
* | | | | | | | | | | | | | | | | | | | | | | | am 3f67d845: am aacce208: Merge commit ↵Qiwen Zhao2014-11-131-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \'90e75d1f90b85e11f6905966ea28d59916935c68\' into lmp-mr1-dev * commit '3f67d845af493927f81889b0ca4087a1c4a9871b': Check isZoomSupported before any zoom ratio calculations.
| * | | | | | | | | | | | | | | | | | | | | | | am aacce208: Merge commit \'90e75d1f90b85e11f6905966ea28d59916935c68\' into ↵Qiwen Zhao2014-11-121-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'aacce208f76035a8f7453acc66a0b52e3434babd': Check isZoomSupported before any zoom ratio calculations.
| | * | | | | | | | | | | | | | | | | | | | | | Merge commit '90e75d1f90b85e11f6905966ea28d59916935c68' into lmp-mr1-devQiwen Zhao2014-11-121-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Check isZoomSupported before any zoom ratio calculations.Alan Newberger2014-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per API doc, isZoomeSupported should be checked before calling getZoomRatios or getMaxZoom. Moving zoom calculation into isZoomSupported check fixed crash in front camera with no zoom support, where a HAL/fwk returns a null list of zoom ratios. Bug: 17863266 Change-Id: I80b5f7a431e7bbe4d50e5d062628e38eda3fd0a6
* | | | | | | | | | | | | | | | | | | | | | | | am a5fa3b21: am 52d378bc: Merge commit ↵Qiwen Zhao2014-11-131-3/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \'698997b9ef47f215350f03c0289f291846cd3604\' into lmp-mr1-dev * commit 'a5fa3b21247ef211eb8225aec96cb7683d161ed2': Add null check for exif thumbnail size
| * | | | | | | | | | | | | | | | | | | | | | | am 52d378bc: Merge commit \'698997b9ef47f215350f03c0289f291846cd3604\' into ↵Qiwen Zhao2014-11-121-3/+12
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '52d378bc6bede2c8019134e9c952c14869f226cb': Add null check for exif thumbnail size
| | * | | | | | | | | | | | | | | | | | | | | | Merge commit '698997b9ef47f215350f03c0289f291846cd3604' into lmp-mr1-devQiwen Zhao2014-11-121-3/+12
| | |\| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Add null check for exif thumbnail sizePuneet Lall2014-10-031-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:17790747 Change-Id: I758bb217d0a76093d8e4bb1832cc7ab6907235ee
* | | | | | | | | | | | | | | | | | | | | | | | am 7d5fcf19: am a3d310ed: Merge commit ↵Qiwen Zhao2014-11-132-11/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \'1c1d1afb5701b78fcdf09969bba1c20eb591bccf\' into lmp-mr1-dev * commit '7d5fcf19f74ce8a0ec62bfa6e76ebaaeafb6cbc4': Remove default thumbnail size setting in portability lib
| * | | | | | | | | | | | | | | | | | | | | | | am a3d310ed: Merge commit \'1c1d1afb5701b78fcdf09969bba1c20eb591bccf\' into ↵Qiwen Zhao2014-11-122-11/+15
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'a3d310ed23dadd652733854f6dd4ad565e5942d3': Remove default thumbnail size setting in portability lib
| | * | | | | | | | | | | | | | | | | | | | | | Merge commit '1c1d1afb5701b78fcdf09969bba1c20eb591bccf' into lmp-mr1-devQiwen Zhao2014-11-122-11/+15
| | |\| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Remove default thumbnail size setting in portability libAlan Newberger2014-09-292-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Settings thumbnail size to (0,0) suppresses thumbnail generation. The Camera app did not set to (0,0) explicitly, but when porting Camera.Parameters to CameraSettings this crept in. Causes issue on Nakasi and no reason to suppress thumbnails in general. Bug: 17700333 Change-Id: I486e560bc9aaf05daf019a3aad8de78ee306f21b
* | | | | | | | | | | | | | | | | | | | | | | | am 782bac7b: am 21e5d240: am 70a82d9d: Add null check in AndroidCameraSettings.Senpo Hu2014-10-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '782bac7b2818d96e56ab1e304f9f150bef70e8aa':
| * | | | | | | | | | | | | | | | | | | | | | | am 21e5d240: am 70a82d9d: Add null check in AndroidCameraSettings.Senpo Hu2014-10-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '21e5d2401d605b31bccd6357da4ee7c49cf08aed':
| | * | | | | | | | | | | | | | | | | | | | | | am 70a82d9d: Add null check in AndroidCameraSettings.Senpo Hu2014-09-241-0/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0': Add null check in AndroidCameraSettings.
* | | | | | | | | | | | | | | | | | | | | | | | am efd94f33: am 0ea96753: am 2eed7ab0: Merge "Specify Locale.US for ↵Alan Newberger2014-10-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stringification of enums" into lmp-dev * commit 'efd94f33a32ca8bd05ba599caaa8ac0e531c72f9':
| * | | | | | | | | | | | | | | | | | | | | | | am 0ea96753: am 2eed7ab0: Merge "Specify Locale.US for stringification of ↵Alan Newberger2014-10-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enums" into lmp-dev * commit '0ea96753473345ed5aa5ac97da03f632bda8cf59':