commit 9fcc8956f5a993ae4fda21d1939b1ea6f3d2e4ad
author Igor Murashkin <iam@google.com> Fri Oct 04 22:03:55 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 04 22:03:55 2013 +0000
tree 695a0d6dd11a6e0ccd839e7d1e62a838d3d7aedf
parent 19411cdaa36a2b1da6144eb955792b26296baf52
parent 134cd3193ddc17e97cb6364594d85e5b203c7cc6

Merge "camera2: Add passive unfocused state to AF state machine" into klp-dev

camera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java

diff --git a/camera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java b/camera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java
index ba32b12..11d7403 100644
--- a/camera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java
+++ b/camera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java
@@ -112,11 +112,11 @@
                 mListener.onAutoFocusFail(result, /*locked*/true);
                 break;
             case CaptureResult.CONTROL_AF_STATE_PASSIVE_FOCUSED:
-                mListener.onAutoFocusSuccess(result, /*locked*/true);
+                mListener.onAutoFocusSuccess(result, /*locked*/false);
                 break;
-            //case CaptureResult.CONTROL_AF_STATE_PASSIVE_UNFOCUSED: // not yet pushed
-            //    mListener.onAutoFocusFail(result, /*locked*/false);
-            //    break;
+            case CaptureResult.CONTROL_AF_STATE_PASSIVE_UNFOCUSED:
+                mListener.onAutoFocusFail(result, /*locked*/false);
+                break;
             case CaptureResult.CONTROL_AF_STATE_ACTIVE_SCAN:
                 mListener.onAutoFocusScan(result);
                 break;