diff options
| author | James Dong <jdong@google.com> | 2010-04-26 17:48:26 -0700 |
|---|---|---|
| committer | James Dong <jdong@google.com> | 2010-04-28 11:55:47 -0700 |
| commit | b00e246669a1da84b1dd7e3f014eedc21747562f (patch) | |
| tree | e7c4b1f8785ef9c97f49d24850f4461376e8dc31 /camera/libcameraservice | |
| parent | 55fb51aa411b574646cc3068ce36e73789b81616 (diff) | |
| download | frameworks_base-b00e246669a1da84b1dd7e3f014eedc21747562f.zip frameworks_base-b00e246669a1da84b1dd7e3f014eedc21747562f.tar.gz frameworks_base-b00e246669a1da84b1dd7e3f014eedc21747562f.tar.bz2 | |
Use timestamp from camera driver for CameraSource
Change-Id: I09ddec69997c43b8f17fdd21304c76cb4c5ab8cf
Diffstat (limited to 'camera/libcameraservice')
| -rw-r--r-- | camera/libcameraservice/CameraService.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/camera/libcameraservice/CameraService.cpp b/camera/libcameraservice/CameraService.cpp index 00bd54e..53c77da 100644 --- a/camera/libcameraservice/CameraService.cpp +++ b/camera/libcameraservice/CameraService.cpp @@ -16,6 +16,7 @@ ** limitations under the License. */ +//#define LOG_NDEBUG 0 #define LOG_TAG "CameraService" #include <utils/Log.h> @@ -247,7 +248,7 @@ CameraService::Client::Client(const sp<CameraService>& cameraService, status_t CameraService::Client::checkPid() { int callingPid = getCallingPid(); - if (mClientPid == callingPid) return NO_ERROR; + if (mClientPid == callingPid || callingPid == getpid()) return NO_ERROR; LOGW("Attempt to use locked camera (client %p) from different process " " (old pid %d, new pid %d)", getCameraClient()->asBinder().get(), mClientPid, callingPid); |