commit e074a93046ebe5cea0b55c3a479e082a426e1e07
author Yin-Chia Yeh <yinchiayeh@google.com> Fri Jan 30 10:29:02 2015 -0800
committer Yin-Chia Yeh <yinchiayeh@google.com> Tue Feb 03 15:23:56 2015 -0800
tree c1b960cf44d005a19e8609e5be3d3f47c4ad0366
parent 16469200f5a94277178ea41ed59898a113320b60

CameraService: intercept Camera module

Wrap camera module returned from HAL so get_camera_info returns
static_camera_characteristics processed by framework, which
generates keys added after HAL3.2 is released.

Change-Id: Ief423a1571cf06c7ef80b98b403a33969baf95f6

services/camera/libcameraservice/common/Camera2ClientBase.h

diff --git a/services/camera/libcameraservice/common/Camera2ClientBase.h b/services/camera/libcameraservice/common/Camera2ClientBase.h
index e09c1b5..eb21d55 100644
--- a/services/camera/libcameraservice/common/Camera2ClientBase.h
+++ b/services/camera/libcameraservice/common/Camera2ClientBase.h
@@ -18,6 +18,7 @@
 #define ANDROID_SERVERS_CAMERA_CAMERA2CLIENT_BASE_H
 
 #include "common/CameraDeviceBase.h"
+#include "common/CameraModule.h"
 #include "camera/CaptureResult.h"
 
 namespace android {
@@ -55,7 +56,7 @@
                       int servicePid);
     virtual ~Camera2ClientBase();
 
-    virtual status_t      initialize(camera_module_t *module);
+    virtual status_t      initialize(CameraModule *module);
     virtual status_t      dump(int fd, const Vector<String16>& args);
 
     /**