diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-06-19 23:33:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-19 23:33:15 +0000 |
| commit | 06508824dc699c566bc4ffbd816b2227fba15379 (patch) | |
| tree | 4da78726e2ad35fbb0106589183268884a1c9ad5 /services | |
| parent | 940f8be3619cecda66dad33f995904795df88c2d (diff) | |
| parent | f0d8468dcec08e1ac4edf62ec7da5782a0b84d93 (diff) | |
| download | frameworks_av-06508824dc699c566bc4ffbd816b2227fba15379.zip frameworks_av-06508824dc699c566bc4ffbd816b2227fba15379.tar.gz frameworks_av-06508824dc699c566bc4ffbd816b2227fba15379.tar.bz2 | |
am f0d8468d: DO NOT MERGE: CameraService: Fix permissions check issues
* commit 'f0d8468dcec08e1ac4edf62ec7da5782a0b84d93':
DO NOT MERGE: CameraService: Fix permissions check issues
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index 5957d97..06c1626 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -541,8 +541,8 @@ status_t CameraService::connectPro( case CAMERA_DEVICE_API_VERSION_2_0: case CAMERA_DEVICE_API_VERSION_2_1: case CAMERA_DEVICE_API_VERSION_3_0: - client = new ProCamera2Client(this, cameraCb, String16(), - cameraId, facing, callingPid, USE_CALLING_UID, getpid()); + client = new ProCamera2Client(this, cameraCb, clientPackageName, + cameraId, facing, callingPid, clientUid, getpid()); break; case -1: ALOGE("Invalid camera id %d", cameraId); @@ -619,8 +619,8 @@ status_t CameraService::connectDevice( case CAMERA_DEVICE_API_VERSION_2_0: case CAMERA_DEVICE_API_VERSION_2_1: case CAMERA_DEVICE_API_VERSION_3_0: - client = new CameraDeviceClient(this, cameraCb, String16(), - cameraId, facing, callingPid, USE_CALLING_UID, getpid()); + client = new CameraDeviceClient(this, cameraCb, clientPackageName, + cameraId, facing, callingPid, clientUid, getpid()); break; case -1: ALOGE("Invalid camera id %d", cameraId); @@ -834,6 +834,7 @@ status_t CameraService::onTransact( switch (code) { case BnCameraService::CONNECT: case BnCameraService::CONNECT_PRO: + case BnCameraService::CONNECT_DEVICE: const int pid = getCallingPid(); const int self_pid = getpid(); if (pid != self_pid) { |