From 134cd3193ddc17e97cb6364594d85e5b203c7cc6 Mon Sep 17 00:00:00 2001 From: Igor Murashkin Date: Fri, 4 Oct 2013 12:00:30 -0700 Subject: 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 --- .../src/com/android/ex/camera2/pos/AutoFocusStateMachine.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'camera2/public/src/com/android/ex/camera2/pos') 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 @@ public class AutoFocusStateMachine { 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: + mListener.onAutoFocusFail(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_ACTIVE_SCAN: mListener.onAutoFocusScan(result); break; -- cgit v1.2.3