camera2: Add #resetState to AutoFocusStateMachine

Bug: 11071158
Change-Id: I24bc2d771703bb502dcbb676b6262954f2017630

1 files changed, 20 insertions, 0 deletions

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 ce66285..23959e4 100644
--- a/camera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java
+++ b/camera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java
@@ -31,6 +31,10 @@ import com.android.ex.camera2.utils.SysTrace;
  */
 public class AutoFocusStateMachine {
 
+    /**
+     * Observe state AF state transitions triggered by
+     * {@link AutoFocusStateMachine#onCaptureCompleted onCaptureCompleted}.
+     */
     public interface AutoFocusStateListener {
         /**
          * The camera is currently focused (either active or passive).
@@ -177,6 +181,22 @@ public class AutoFocusStateMachine {
     }
 
     /**
+     * Reset the current AF state.
+     *
+     * <p>
+     * When dropping capture results (by not invoking {@link #onCaptureCompleted} when a new
+     * {@link CaptureResult} is available), call this function to reset the state. Otherwise
+     * the next time a new state is observed this class may incorrectly consider it as the same
+     * state as before, and not issue any callbacks by {@link AutoFocusStateListener}.
+     * </p>
+     */
+    public synchronized void resetState() {
+        if (VERBOSE_LOGGING) Log.v(TAG, "resetState - last state was " + mLastAfState);
+
+        mLastAfState = AF_UNINITIALIZED;
+    }
+
+    /**
      * Lock the lens from moving. Typically used before taking a picture.
      *
      * <p>After calling this function, submit the new requestBuilder as a separate capture.