diff options
| -rw-r--r-- | tools/emulator/system/camera/EmulatedFakeCamera2.cpp | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/tools/emulator/system/camera/EmulatedFakeCamera2.cpp b/tools/emulator/system/camera/EmulatedFakeCamera2.cpp index 63ae591b7..bcbe2116a 100644 --- a/tools/emulator/system/camera/EmulatedFakeCamera2.cpp +++ b/tools/emulator/system/camera/EmulatedFakeCamera2.cpp @@ -165,22 +165,26 @@ status_t EmulatedFakeCamera2::connectCamera(hw_device_t** device) { } status_t EmulatedFakeCamera2::closeCamera() { - Mutex::Autolock l(mMutex); + { + Mutex::Autolock l(mMutex); - status_t res; - ALOGV("%s", __FUNCTION__); + status_t res; + ALOGV("%s", __FUNCTION__); - res = mSensor->shutDown(); - if (res != NO_ERROR) { - ALOGE("%s: Unable to shut down sensor: %d", __FUNCTION__, res); - return res; - } + res = mSensor->shutDown(); + if (res != NO_ERROR) { + ALOGE("%s: Unable to shut down sensor: %d", __FUNCTION__, res); + return res; + } - mConfigureThread->requestExit(); - mReadoutThread->requestExit(); - mControlThread->requestExit(); - mJpegCompressor->cancel(); + mConfigureThread->requestExit(); + mReadoutThread->requestExit(); + mControlThread->requestExit(); + mJpegCompressor->cancel(); + } + // give up the lock since we will now block and the threads + // can call back into this object mConfigureThread->join(); mReadoutThread->join(); mControlThread->join(); |