From b84d935c179a275a47e07291d2a983daf844de80 Mon Sep 17 00:00:00 2001
From: Igor Murashkin <iam@google.com>
Date: Tue, 26 Feb 2013 14:32:34 -0800
Subject: camera_client: refactor Camera/ProCamera commonalities into
 BasicCamera

Change-Id: Ie10a4094522d49683657665fe94ab0b7ccd280e9
---
 services/camera/libcameraservice/CameraService.cpp | 6 +++++-
 services/camera/libcameraservice/CameraService.h   | 7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'services/camera/libcameraservice')

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index ec1c3f0..1a78b53 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -269,10 +269,14 @@ sp<ICamera> CameraService::connect(
 
 sp<IProCameraUser> CameraService::connect(
                                         const sp<IProCameraCallbacks>& cameraCb,
-                                        int cameraId)
+                                        int cameraId,
+                                        const String16& clientPackageName,
+                                        int clientUid)
 {
     int callingPid = getCallingPid();
 
+    // TODO: use clientPackageName and clientUid with appOpsMangr
+
     LOG1("CameraService::connectPro E (pid %d, id %d)", callingPid, cameraId);
 
     if (!mModule) {
diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h
index b017505..d93aa73 100644
--- a/services/camera/libcameraservice/CameraService.h
+++ b/services/camera/libcameraservice/CameraService.h
@@ -25,6 +25,11 @@
 #include <camera/ICameraService.h>
 #include <hardware/camera.h>
 
+#include <camera/ICamera.h>
+#include <camera/ICameraClient.h>
+#include <camera/IProCameraUser.h>
+#include <camera/IProCameraCallbacks.h>
+
 /* This needs to be increased if we can have more cameras */
 #define MAX_CAMERAS 2
 
@@ -60,7 +65,7 @@ public:
     virtual sp<ICamera> connect(const sp<ICameraClient>& cameraClient, int cameraId,
             const String16& clientPackageName, int clientUid);
     virtual sp<IProCameraUser> connect(const sp<IProCameraCallbacks>& cameraCb,
-            int cameraId);
+            int cameraId, const String16& clientPackageName, int clientUid);
 
     // Extra permissions checks
     virtual status_t    onTransact(uint32_t code, const Parcel& data,
-- 
cgit v1.1