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
commit314079efa77c07255b2a2794eba470fccd1541fb (patch)
tree4e8c055169f545023186564fe400cf2d9c8e644a /services
parent86a520036e0522b8c36b3e7f1187c2d4e473c6ea (diff)
downloadframeworks_av-314079efa77c07255b2a2794eba470fccd1541fb.zip
frameworks_av-314079efa77c07255b2a2794eba470fccd1541fb.tar.gz
frameworks_av-314079efa77c07255b2a2794eba470fccd1541fb.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;