From 7b82efe7a376c882f8f938e1c41b8311a8cdda4a Mon Sep 17 00:00:00 2001
From: Eino-Ville Talvala <etalvala@google.com>
Date: Thu, 25 Jul 2013 17:12:35 -0700
Subject: Camera: Rename new API to camera2, rearrange camera service

 - Support API rename from photography to camera2
 - Reorganize camera service files
   - API support files to api1/, api2/, api_pro/
   - HAL device support files into device{1,2,3}/
   - Common files into common/
   - Camera service remains at top-level

Change-Id: Ie474c12536f543832fba0a2dc936ac4fd39fe6a9
---
 camera/ICameraService.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'camera/ICameraService.cpp')

diff --git a/camera/ICameraService.cpp b/camera/ICameraService.cpp
index 068fb0f..876a2df 100644
--- a/camera/ICameraService.cpp
+++ b/camera/ICameraService.cpp
@@ -31,8 +31,8 @@
 #include <camera/IProCameraCallbacks.h>
 #include <camera/ICamera.h>
 #include <camera/ICameraClient.h>
-#include <camera/photography/ICameraDeviceUser.h>
-#include <camera/photography/ICameraDeviceCallbacks.h>
+#include <camera/camera2/ICameraDeviceUser.h>
+#include <camera/camera2/ICameraDeviceCallbacks.h>
 
 namespace android {
 
@@ -151,7 +151,7 @@ public:
         return interface_cast<IProCameraUser>(reply.readStrongBinder());
     }
 
-    // connect to camera service (android.hardware.photography.CameraDevice)
+    // connect to camera service (android.hardware.camera2.CameraDevice)
     virtual sp<ICameraDeviceUser> connect(
             const sp<ICameraDeviceCallbacks>& cameraCb,
             int cameraId,
-- 
cgit v1.1