summaryrefslogtreecommitdiffstats
path: root/camera/libcameraservice
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2010-06-09 15:57:48 -0700
committerJames Dong <jdong@google.com>2010-06-09 21:30:43 -0700
commitfcd193c9fd4c5d799d2038bded924ba57fa1e4e1 (patch)
tree7d12d3a7c81edf9f925995b5b89a77ef89908c8c /camera/libcameraservice
parentb4f689e6d576bade4756742dd16921238c24c061 (diff)
downloadframeworks_native-fcd193c9fd4c5d799d2038bded924ba57fa1e4e1.zip
frameworks_native-fcd193c9fd4c5d799d2038bded924ba57fa1e4e1.tar.gz
frameworks_native-fcd193c9fd4c5d799d2038bded924ba57fa1e4e1.tar.bz2
Remove the lock/unlock workaround from CameraService
bug - 2677772 Change-Id: I7c996daad8b3bfc89e9fa2d655dc18c9a5c68f2f
Diffstat (limited to 'camera/libcameraservice')
-rw-r--r--camera/libcameraservice/CameraService.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/camera/libcameraservice/CameraService.cpp b/camera/libcameraservice/CameraService.cpp
index 4f684b7..690169a 100644
--- a/camera/libcameraservice/CameraService.cpp
+++ b/camera/libcameraservice/CameraService.cpp
@@ -371,10 +371,7 @@ CameraService::Client::~Client() {
status_t CameraService::Client::checkPid() const {
int callingPid = getCallingPid();
if (callingPid == mClientPid) return NO_ERROR;
- if (callingPid == getpid()) {
- LOGW("FIXME: use camera from mediaserver without permission.");
- return NO_ERROR;
- }
+
LOGW("attempt to use a locked camera from a different process"
" (old pid %d, new pid %d)", mClientPid, callingPid);
return EBUSY;