commit 134cd3193ddc17e97cb6364594d85e5b203c7cc6
author Igor Murashkin <iam@google.com> Fri Oct 04 12:00:30 2013 -0700
committer Igor Murashkin <iam@google.com> Fri Oct 04 12:00:30 2013 -0700
tree 695a0d6dd11a6e0ccd839e7d1e62a838d3d7aedf
parent 6c5cc576e747a38cf6feef39a578d9cccb0ba251

camera2: Add passive unfocused state to AF state machine

* Also fix minor issue where passive focused state was falsely locking

Bug: 11014205
Change-Id: Ic53e455693aa4f14d776658625d4ba8fa7dc2f51

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;