X-Git-Url: http://git.rot13.org/?p=zxing.git;a=blobdiff_plain;f=android%2Fsrc%2Fcom%2Fgoogle%2Fzxing%2Fclient%2Fandroid%2Fcamera%2FCameraConfigurationManager.java;h=e06b01cd4000eeed278dc7762dcbeb80d0def0e0;hp=071388f74c86b6caa2bac7a4d544912f927983ab;hb=5ea18b9a884b7b20cd87c0e99999da702cac3bfb;hpb=b106c4e151ba160a364acc7adc4000d0ce011ed3

diff --git a/android/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java b/android/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java
index 071388f7..e06b01cd 100644
--- a/android/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java
+++ b/android/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java
@@ -182,8 +182,9 @@ final class CameraConfigurationManager {
     // FIXME: This is a hack to turn the flash off on the Samsung Galaxy.
     // And this is a hack-hack to work around a different value on the Behold II
     // Restrict Behold II check to Cupcake, per Samsung's advice
-    if (Build.MODEL.contains("Behold II") &&
-        CameraManager.SDK_INT == Build.VERSION_CODES.CUPCAKE) {
+    //if (Build.MODEL.contains("Behold II") &&
+    //    CameraManager.SDK_INT == Build.VERSION_CODES.CUPCAKE) {
+    if (Build.MODEL.contains("Behold II") && CameraManager.SDK_INT == 3) { // 3 = Cupcake
       parameters.set("flash-value", 1);
     } else {
       parameters.set("flash-value", 2);