commit 4c9d0b3b746700dd5398edd65510af1f6db4b752
author Eino-Ville Talvala <etalvala@google.com> Fri Aug 24 18:06:21 2012 -0700
committer Eino-Ville Talvala <etalvala@google.com> Fri Aug 24 18:06:21 2012 -0700
tree d4b2ee350db5c930ed455157b1e15f92a56b35f6
parent 24a3843696c909138dc5ffeef00365e7bdf65ecf

TestingCamera: Only enable focus move callbacks in some AF modes.

Fixes TestingCamera on Nakasi.

Change-Id: I1039ae69e312c053b62af39e791681ff6ae328f4

apps/TestingCamera/src/com/android/testingcamera/TestingCamera.java

diff --git a/apps/TestingCamera/src/com/android/testingcamera/TestingCamera.java b/apps/TestingCamera/src/com/android/testingcamera/TestingCamera.java
index ceb0c4f..12f6aaa 100644
--- a/apps/TestingCamera/src/com/android/testingcamera/TestingCamera.java
+++ b/apps/TestingCamera/src/com/android/testingcamera/TestingCamera.java
@@ -308,6 +308,10 @@
             mAfMode = pos;
             String focusMode = mAfModes.get(mAfMode);
             log("Setting focus mode to " + focusMode);
+            if (focusMode == Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE ||
+                        focusMode == Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO) {
+                mCamera.setAutoFocusMoveCallback(mAutofocusMoveCallback);
+            }
             mParams.setFocusMode(focusMode);
 
             mCamera.setParameters(mParams);
@@ -477,8 +481,6 @@
         // Update parameters based on above updates
         mCamera.setParameters(mParams);
 
-        mCamera.setAutoFocusMoveCallback(mAutofocusMoveCallback);
-
         if (mPreviewHolder != null) {
             log("Setting preview display");
             try {