summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice/Camera2Device.cpp
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2013-02-13 15:53:56 -0800
committerIgor Murashkin <iam@google.com>2013-02-22 10:50:14 -0800
commitbd02dd1bf1f34eb4e100d0d058f1fe5a2790d67e (patch)
tree09dabb9a40decb5640f9b5d419565e999a5995d2 /services/camera/libcameraservice/Camera2Device.cpp
parentee9cc423e2551ffbacfd226b8627737beabaec99 (diff)
downloadframeworks_av-bd02dd1bf1f34eb4e100d0d058f1fe5a2790d67e.zip
frameworks_av-bd02dd1bf1f34eb4e100d0d058f1fe5a2790d67e.tar.gz
frameworks_av-bd02dd1bf1f34eb4e100d0d058f1fe5a2790d67e.tar.bz2
Camera: Move CameraMetadata.h from service to client library
Change-Id: I940ce86f318f37ae5b73f912a6e589415150125f
Diffstat (limited to 'services/camera/libcameraservice/Camera2Device.cpp')
-rw-r--r--services/camera/libcameraservice/Camera2Device.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/Camera2Device.cpp b/services/camera/libcameraservice/Camera2Device.cpp
index 5bfa085..921c8fc 100644
--- a/services/camera/libcameraservice/Camera2Device.cpp
+++ b/services/camera/libcameraservice/Camera2Device.cpp
@@ -202,7 +202,7 @@ status_t Camera2Device::dump(int fd, const Vector<String16>& args) {
return res;
}
-const camera2::CameraMetadata& Camera2Device::info() const {
+const CameraMetadata& Camera2Device::info() const {
ALOGVV("%s: E", __FUNCTION__);
return mDeviceInfo;