diff options
| author | James Dong <jdong@google.com> | 2010-06-09 15:57:48 -0700 |
|---|---|---|
| committer | James Dong <jdong@google.com> | 2010-06-09 21:30:43 -0700 |
| commit | 71d714ccbf03948d67ab6cebad49703160e5895e (patch) | |
| tree | 65e87f48eb73d85f22d80e651bc2260f9bf8e577 /camera/libcameraservice | |
| parent | 2feafeffb8c2a5e02cb7998194d129ab0f43f9b0 (diff) | |
| download | frameworks_base-71d714ccbf03948d67ab6cebad49703160e5895e.zip frameworks_base-71d714ccbf03948d67ab6cebad49703160e5895e.tar.gz frameworks_base-71d714ccbf03948d67ab6cebad49703160e5895e.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.cpp | 5 |
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; |