LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Camera2: Fix a deadlock when closing the camera: DO NOT MERGE" into jb-mr1-aah-dev

Browse Source
This commit is contained in:
Igor Murashkin
2013-01-10 13:34:20 -08:00
committed by Android (Google) Code Review
parent 6daf70b26b 04ff9ec118
commit 778dd967ad
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tools/emulator/system/camera/EmulatedFakeCamera2.cpp
View File

@@ -166,22 +166,26 @@ status_t EmulatedFakeCamera2::connectCamera(hw_device_t** device) {
} }
status_t EmulatedFakeCamera2::closeCamera() { status_t EmulatedFakeCamera2::closeCamera() {
Mutex::Autolock l(mMutex); {
Mutex::Autolock l(mMutex);
status_t res; status_t res;
ALOGV("%s", __FUNCTION__); ALOGV("%s", __FUNCTION__);
res = mSensor->shutDown(); res = mSensor->shutDown();
if (res != NO_ERROR) { if (res != NO_ERROR) {
ALOGE("%s: Unable to shut down sensor: %d", __FUNCTION__, res); ALOGE("%s: Unable to shut down sensor: %d", __FUNCTION__, res);
return res; return res;
}
mConfigureThread->requestExit();
mReadoutThread->requestExit();
mControlThread->requestExit();
mJpegCompressor->cancel();
} }
mConfigureThread->requestExit(); // give up the lock since we will now block and the threads
mReadoutThread->requestExit(); // can call back into this object
mControlThread->requestExit();
mJpegCompressor->cancel();
mConfigureThread->join(); mConfigureThread->join();
mReadoutThread->join(); mReadoutThread->join();
mControlThread->join(); mControlThread->join();