mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-02-02 05:41:08 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Made the worker threads shut down synchronously to fix a race condition where the CameraManager could close the camera driver too soon.

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@357 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
dswitkin 2008-04-11 20:25:09 +00:00
parent e14defda5f
commit 4c10031a67
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android-m3/src/com/google/zxing/client/android/BarcodeReaderCaptureActivity.java
View file

@ -91,8 +91,7 @@ public final class BarcodeReaderCaptureActivity extends Activity {
protected void onPause() { protected void onPause() {
super.onPause(); super.onPause();
if (cameraThread != null) { if (cameraThread != null) {
Message quit = Message.obtain(cameraThread.handler, R.id.quit); cameraThread.quitSynchronously();
quit.sendToTarget();
cameraThread = null; cameraThread = null;
} }
cameraManager.closeDriver(); cameraManager.closeDriver();

13
android-m3/src/com/google/zxing/client/android/CameraThread.java
View file

@ -76,6 +76,10 @@ final class CameraThread extends Thread {
state = State.DONE; state = State.DONE;
Message quit = Message.obtain(decodeThread.handler, R.id.quit); Message quit = Message.obtain(decodeThread.handler, R.id.quit);
quit.sendToTarget(); quit.sendToTarget();
try {
decodeThread.join();
} catch (InterruptedException e) {
}
Looper.myLooper().quit(); Looper.myLooper().quit();
break; break;
case R.id.decode_started: case R.id.decode_started:
@ -116,6 +120,15 @@ final class CameraThread extends Thread {
Looper.loop(); Looper.loop();
} }
public void quitSynchronously() {
Message quit = Message.obtain(handler, R.id.quit);
quit.sendToTarget();
try {
join();
} catch (InterruptedException e) {
}
}
public void setDecodeAllMode() { public void setDecodeAllMode() {
Message message = Message.obtain(decodeThread.handler, R.id.set_decode_all_mode); Message message = Message.obtain(decodeThread.handler, R.id.set_decode_all_mode);
message.sendToTarget(); message.sendToTarget();