diff options
author | Eino-Ville Talvala <etalvala@google.com> | 2013-02-26 01:40:39 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-26 01:40:39 +0000 |
commit | b39f30b0a4902ea0f28454885785da4b2629fe25 (patch) | |
tree | c4042ba7bf201f8d4ac726e876f30cc168f0d032 /camera/Camera.cpp | |
parent | b4ac0ea6c45c04ac3e69d6b2243cfec58e858495 (diff) | |
parent | ceb388d6c03c38b96dc41c0ea4804b749aa077c4 (diff) | |
download | frameworks_av-b39f30b0a4902ea0f28454885785da4b2629fe25.zip frameworks_av-b39f30b0a4902ea0f28454885785da4b2629fe25.tar.gz frameworks_av-b39f30b0a4902ea0f28454885785da4b2629fe25.tar.bz2 |
am ceb388d6: CameraService and Stagefright: Support AppOps
* commit 'ceb388d6c03c38b96dc41c0ea4804b749aa077c4':
CameraService and Stagefright: Support AppOps
Diffstat (limited to 'camera/Camera.cpp')
-rw-r--r-- | camera/Camera.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/camera/Camera.cpp b/camera/Camera.cpp index be395ba..d8dc2a5 100644 --- a/camera/Camera.cpp +++ b/camera/Camera.cpp @@ -19,6 +19,7 @@ #define LOG_TAG "Camera" #include <utils/Log.h> #include <utils/threads.h> +#include <utils/String16.h> #include <binder/IPCThreadState.h> #include <binder/IServiceManager.h> #include <binder/IMemory.h> @@ -116,14 +117,15 @@ status_t Camera::getCameraInfo(int cameraId, return cs->getCameraInfo(cameraId, cameraInfo); } -sp<Camera> Camera::connect(int cameraId) +sp<Camera> Camera::connect(int cameraId, const String16& clientPackageName, + int clientUid) { ALOGV("connect"); sp<Camera> c = new Camera(); sp<ICameraClient> cl = c; const sp<ICameraService>& cs = getCameraService(); if (cs != 0) { - c->mCamera = cs->connect(cl, cameraId); + c->mCamera = cs->connect(cl, cameraId, clientPackageName, clientUid); } if (c->mCamera != 0) { c->mCamera->asBinder()->linkToDeath(c); |