diff options
| author | Igor Murashkin <iam@google.com> | 2013-02-27 20:43:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-27 20:43:26 +0000 |
| commit | f5daac4225905184b8d7cdd2fd87247d73e27ea7 (patch) | |
| tree | 5324b82082de8fb57ddddeb8aa154c14cddd55e9 /services/camera/libcameraservice | |
| parent | 5e8e702658cd61fc07b4163fdbca3e8a5589f2b9 (diff) | |
| parent | b84d935c179a275a47e07291d2a983daf844de80 (diff) | |
| download | frameworks_av-f5daac4225905184b8d7cdd2fd87247d73e27ea7.zip frameworks_av-f5daac4225905184b8d7cdd2fd87247d73e27ea7.tar.gz frameworks_av-f5daac4225905184b8d7cdd2fd87247d73e27ea7.tar.bz2 | |
Merge "camera_client: refactor Camera/ProCamera commonalities into BasicCamera" into jb-mr2-dev
Diffstat (limited to 'services/camera/libcameraservice')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 6 | ||||
| -rw-r--r-- | services/camera/libcameraservice/CameraService.h | 7 |
2 files changed, 11 insertions, 2 deletions
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, |