1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 5cc20e03f..5cd971598 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -1033,6 +1033,11 @@ public class CaptureModule implements CameraModule, PhotoController,
     private void updateCaptureStateMachine(int id, CaptureResult result) {
         Integer afState = result.get(CaptureResult.CONTROL_AF_STATE);
         Integer aeState = result.get(CaptureResult.CONTROL_AE_STATE);
+
+        if (afState == null) {
+            return;
+        }
+
         switch (mState[id]) {
             case STATE_PREVIEW: {
                 break;