mirror of
https://github.com/zxing/zxing.git
synced 2025-03-05 20:48:51 -08:00
Possible fix from Acer for case where camera is not closed ?
git-svn-id: https://zxing.googlecode.com/svn/trunk@1733 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
parent
3b65b7304d
commit
169a94c45b
|
@ -126,18 +126,17 @@ public final class CameraManager {
|
||||||
if (camera == null) {
|
if (camera == null) {
|
||||||
throw new IOException();
|
throw new IOException();
|
||||||
}
|
}
|
||||||
camera.setPreviewDisplay(holder);
|
}
|
||||||
|
camera.setPreviewDisplay(holder);
|
||||||
|
if (!initialized) {
|
||||||
|
initialized = true;
|
||||||
|
configManager.initFromCameraParameters(camera);
|
||||||
|
}
|
||||||
|
configManager.setDesiredCameraParameters(camera);
|
||||||
|
|
||||||
if (!initialized) {
|
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
|
||||||
initialized = true;
|
if (prefs.getBoolean(PreferencesActivity.KEY_FRONT_LIGHT, false)) {
|
||||||
configManager.initFromCameraParameters(camera);
|
FlashlightManager.enableFlashlight();
|
||||||
}
|
|
||||||
configManager.setDesiredCameraParameters(camera);
|
|
||||||
|
|
||||||
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
|
|
||||||
if (prefs.getBoolean(PreferencesActivity.KEY_FRONT_LIGHT, false)) {
|
|
||||||
FlashlightManager.enableFlashlight();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue