summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorYin-Chia Yeh <yinchiayeh@google.com>2015-04-14 12:34:22 -0700
committerYin-Chia Yeh <yinchiayeh@google.com>2015-04-14 12:34:22 -0700
commit0336d3649f13506a7daf425690d225beac9d214f (patch)
tree3d932a776ac7fb3064e3ced5e96bcffde8600aac /services
parentcc0cb8a14acc8ed1760b929fd7f706d800a6ff99 (diff)
downloadframeworks_av-0336d3649f13506a7daf425690d225beac9d214f.zip
frameworks_av-0336d3649f13506a7daf425690d225beac9d214f.tar.gz
frameworks_av-0336d3649f13506a7daf425690d225beac9d214f.tar.bz2
Camera: allow non-supported template
Bug: 19395059 Change-Id: I42bbd99fef6055173062266c1a490311105c6814
Diffstat (limited to 'services')
-rw-r--r--services/camera/libcameraservice/device3/Camera3Device.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
index 8236788..96b7741 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -1054,9 +1054,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;