From 51bbe05b25fcb9b3cd35bd79f100e420b01bd5f6 Mon Sep 17 00:00:00 2001
From: Emilian Peev <epeevs@codeaurora.org>
Date: Thu, 4 Dec 2014 17:00:38 +0200
Subject: Camera: Avoid state switch during preview start

 If snapshot is running avoid changing the
 camera application state during handling of
 'ON_PREVIEW_STARTED' messages.

Change-Id: I1654752d431d41d3219f235a08f77e1d7dd10c27
CRs-Fixed: 747816
---
 src/com/android/camera/PhotoModule.java | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 72e0f3f4d..a915d0845 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -533,6 +533,9 @@ public class PhotoModule
     }
 
     private void onPreviewStarted() {
+        if (mCameraState == SNAPSHOT_IN_PROGRESS) {
+            return;
+        }
         mUI.hidePreviewCover();
         setCameraState(IDLE);
         mFocusManager.onPreviewStarted();
-- 
cgit v1.2.3