TestingCamera: Only enable focus move callbacks in some AF modes.android-sdk-support_r11android-cts-4.2_r2android-cts-4.2_r1android-4.2_r1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1tools_r22jb-mr1.1-releasejb-mr1.1-dev-plus-aospjb-mr1.1-devjb-mr1-releasejb-mr1-dev-plus-aospjb-mr1-dev

Fixes TestingCamera on Nakasi.

Change-Id: I1039ae69e312c053b62af39e791681ff6ae328f4

1 files changed, 4 insertions, 2 deletions

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 @@ public class TestingCamera extends Activity implements SurfaceHolder.Callback {
             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 @@ public class TestingCamera extends Activity implements SurfaceHolder.Callback {
         // Update parameters based on above updates
         mCamera.setParameters(mParams);
 
-        mCamera.setAutoFocusMoveCallback(mAutofocusMoveCallback);
-
         if (mPreviewHolder != null) {
             log("Setting preview display");
             try {