| commit | bd02dd1bf1f34eb4e100d0d058f1fe5a2790d67e | [log] [tgz] |
|---|---|---|
| author | Igor Murashkin <iam@google.com> | Wed Feb 13 15:53:56 2013 -0800 |
| committer | Igor Murashkin <iam@google.com> | Fri Feb 22 10:50:14 2013 -0800 |
| tree | 09dabb9a40decb5640f9b5d419565e999a5995d2 | |
| parent | ee9cc423e2551ffbacfd226b8627737beabaec99 [diff] [blame] |
Camera: Move CameraMetadata.h from service to client library Change-Id: I940ce86f318f37ae5b73f912a6e589415150125f
diff --git a/services/camera/libcameraservice/Camera2Device.h b/services/camera/libcameraservice/Camera2Device.h index 41df2e4..86ff80f 100644 --- a/services/camera/libcameraservice/Camera2Device.h +++ b/services/camera/libcameraservice/Camera2Device.h
@@ -27,14 +27,12 @@ #include <utils/Vector.h> #include "hardware/camera2.h" -#include "camera2/CameraMetadata.h" +#include "camera/CameraMetadata.h" namespace android { class Camera2Device : public virtual RefBase { public: - typedef camera2::CameraMetadata CameraMetadata; - Camera2Device(int id); ~Camera2Device();