commit 5e08d60617fc63c2e41f9069ff89f5c00db2617d
author Eino-Ville Talvala <etalvala@google.com> Wed May 16 14:59:25 2012 -0700
committer Eino-Ville Talvala <etalvala@google.com> Wed May 16 16:17:06 2012 -0700
tree 31a5cd4e2d204973c265fc0efc07e77d5c5720d3
parent 8ceaedfe124f6c9e51610a7dc2270579f8264fa7

Break out CameraClient from CameraService.

To allow for different low-level implementations of the current camera
API, the Client class inside CameraService has to be inheritable. This
change breaks it up into the common section accessed by the camera
service, and the full implementation for camera device HAL version 1.

The full implementation is moved out to CameraClient.h/.cpp.

There are no functionality changes, just code reorganization.

Bug: 6243944
Change-Id: I8a79b31a3ae3617198dc6bb5576a9f2e2d9c95de

services/camera/libcameraservice/Android.mk

diff --git a/services/camera/libcameraservice/Android.mk b/services/camera/libcameraservice/Android.mk
index 3cae1f5..0022f2b 100644
--- a/services/camera/libcameraservice/Android.mk
+++ b/services/camera/libcameraservice/Android.mk
@@ -7,7 +7,8 @@
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES:=               \
-    CameraService.cpp
+    CameraService.cpp \
+    CameraClient.cpp
 
 LOCAL_SHARED_LIBRARIES:= \
     libui \