summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorShuzhen Wang <shuzhenw@quicinc.com>2012-08-31 10:24:22 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-31 11:27:02 -0700
commit092fe44abd787fcb4377d90c63f2aa7120a4d267 (patch)
tree802a20db19e8f4a051b6612072ba6884dec4cce0 /services
parent6bcdca035d4e9f7b2aee2d3febd8e2df5f57ae6f (diff)
downloadframeworks_av-092fe44abd787fcb4377d90c63f2aa7120a4d267.zip
frameworks_av-092fe44abd787fcb4377d90c63f2aa7120a4d267.tar.gz
frameworks_av-092fe44abd787fcb4377d90c63f2aa7120a4d267.tar.bz2
Camera: set vendor_ops on camera metadata.
This makes sure that vendor specific metadata can propogate through the framework. Change-Id: I3bd0ae4b889eb907caf7b305dbcb16abbbef0ea3
Diffstat (limited to 'services')
-rw-r--r--services/camera/libcameraservice/Camera2Device.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/Camera2Device.cpp b/services/camera/libcameraservice/Camera2Device.cpp
index 7cac025..f62c0a0 100644
--- a/services/camera/libcameraservice/Camera2Device.cpp
+++ b/services/camera/libcameraservice/Camera2Device.cpp
@@ -109,7 +109,12 @@ status_t Camera2Device::initialize(camera_module_t *module)
__FUNCTION__, mId, strerror(-res), res);
return res;
}
-
+ res = set_camera_metadata_vendor_tag_ops(mVendorTagOps);
+ if (res != OK) {
+ ALOGE("%s: Camera %d: Unable to set tag ops: %s (%d)",
+ __FUNCTION__, mId, strerror(-res), res);
+ return res;
+ }
setNotifyCallback(NULL);
return OK;