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 | 8b5c4ec7bbf253eb704094ab6b04f58923f67994 (patch) | |
| tree | 1abc45a9ded12752e9d2105129e852397702a5ac /services/camera/libcameraservice/CameraService.cpp | |
| parent | 2c86f533c622e175b3ed77f40216a0891f9cc785 (diff) | |
| parent | c073ba525404f3416c2824c435d3d926a9892f1b (diff) | |
| download | frameworks_av-8b5c4ec7bbf253eb704094ab6b04f58923f67994.zip frameworks_av-8b5c4ec7bbf253eb704094ab6b04f58923f67994.tar.gz frameworks_av-8b5c4ec7bbf253eb704094ab6b04f58923f67994.tar.bz2 | |
Merge "camera_client: refactor Camera/ProCamera commonalities into BasicCamera" into jb-mr2-dev
Diffstat (limited to 'services/camera/libcameraservice/CameraService.cpp')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 6 |
1 files changed, 5 insertions, 1 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) { |