Backing out this change for the Droid on suspicion that it's interfering with at...

git-svn-id: http://zxing.googlecode.com/svn/trunk@1363 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/android/src/com/google/zxing/client/android/camera/AutoFocusCallback.java b/android/src/com/google/zxing/client/android/camera/AutoFocusCallback.java
index 629290a..1e3f199 100644 (file)
--- a/android/src/com/google/zxing/client/android/camera/AutoFocusCallback.java
+++ b/android/src/com/google/zxing/client/android/camera/AutoFocusCallback.java
@@ -27,15 +27,9 @@ final class AutoFocusCallback implements Camera.AutoFocusCallback {
 
   private static final long AUTOFOCUS_INTERVAL_MS = 1500L;
 
-  private final CameraConfigurationManager configManager;
-  private boolean reinitCamera;
   private Handler autoFocusHandler;
   private int autoFocusMessage;
 
-  AutoFocusCallback(CameraConfigurationManager configManager) {
-    this.configManager = configManager;
-  }
-
   void setHandler(Handler autoFocusHandler, int autoFocusMessage) {
     this.autoFocusHandler = autoFocusHandler;
     this.autoFocusMessage = autoFocusMessage;
@@ -49,10 +43,6 @@ final class AutoFocusCallback implements Camera.AutoFocusCallback {
       //Log.d(TAG, "Got auto-focus callback; requesting another");
       autoFocusHandler.sendMessageDelayed(message, AUTOFOCUS_INTERVAL_MS);
       autoFocusHandler = null;
-      if (!reinitCamera) {
-        reinitCamera = true;
-        configManager.setDesiredCameraParameters(camera);
-      }
     } else {
       Log.d(TAG, "Got auto-focus callback, but no handler for it");
     }

diff --git a/android/src/com/google/zxing/client/android/camera/CameraManager.java b/android/src/com/google/zxing/client/android/camera/CameraManager.java
index 81605c4..7824da4 100755 (executable)
--- a/android/src/com/google/zxing/client/android/camera/CameraManager.java
+++ b/android/src/com/google/zxing/client/android/camera/CameraManager.java
@@ -98,7 +98,7 @@ public final class CameraManager {
     useOneShotPreviewCallback = Integer.parseInt(Build.VERSION.SDK) > Build.VERSION_CODES.CUPCAKE;
 
     previewCallback = new PreviewCallback(configManager, useOneShotPreviewCallback);
-    autoFocusCallback = new AutoFocusCallback(configManager);
+    autoFocusCallback = new AutoFocusCallback();
   }
 
   /**