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

Remove exception on re-setting manual camera ID; this is fine and needed for an activity handling multiple Intents

Browse source
This commit is contained in:
Sean Owen 2014-07-30 01:17:13 +01:00
parent 281721f2d9
commit 58be32036a
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/src/com/google/zxing/client/android/camera/CameraManager.java
View file

@ -280,12 +280,8 @@ public final class CameraManager {
* @param cameraId camera ID of the camera to use. A negative value means "no preference". * @param cameraId camera ID of the camera to use. A negative value means "no preference".
*/ */
public synchronized void setManualCameraId(int cameraId) { public synchronized void setManualCameraId(int cameraId) {
if (initialized) {
throw new IllegalStateException();
} else {
requestedCameraId = cameraId; requestedCameraId = cameraId;
} }
}
/** /**
* Allows third party apps to specify the scanning rectangle dimensions, rather than determine * Allows third party apps to specify the scanning rectangle dimensions, rather than determine