diff options
| author | Yin-Chia Yeh <yinchiayeh@google.com> | 2015-04-15 20:58:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-15 20:58:13 +0000 |
| commit | 5e1c007038df74b389018e762d5059cacecff59e (patch) | |
| tree | 0c20828f7a07efbf2ee611d6c4767fa54ebdfa3b /services/camera | |
| parent | 6a07a72588c99d01df9d2c4bcd5bdb15db8937c9 (diff) | |
| parent | 0336d3649f13506a7daf425690d225beac9d214f (diff) | |
| download | frameworks_av-5e1c007038df74b389018e762d5059cacecff59e.zip frameworks_av-5e1c007038df74b389018e762d5059cacecff59e.tar.gz frameworks_av-5e1c007038df74b389018e762d5059cacecff59e.tar.bz2 | |
Merge "Camera: allow non-supported template"
Diffstat (limited to 'services/camera')
| -rw-r--r-- | services/camera/libcameraservice/device3/Camera3Device.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp index ec9c70c..d2c2482 100644 --- a/services/camera/libcameraservice/device3/Camera3Device.cpp +++ b/services/camera/libcameraservice/device3/Camera3Device.cpp @@ -1082,9 +1082,9 @@ status_t Camera3Device::createDefaultRequest(int templateId, mHal3Device, templateId); ATRACE_END(); if (rawRequest == NULL) { - SET_ERR_L("HAL is unable to construct default settings for template %d", - templateId); - return DEAD_OBJECT; + ALOGI("%s: template %d is not supported on this camera device", + __FUNCTION__, templateId); + return BAD_VALUE; } *request = rawRequest; mRequestTemplateCache[templateId] = rawRequest; |