From 714fc7e212e6f1c68d0f09b71855c4362aea9ff2 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@gmail.com>
Date: Thu, 29 Sep 2016 18:07:57 +0300
Subject: Fix another mismerge of "SnapdragonCamera: fix screen flash on
 resuming"

Change-Id: Ibcea6008e354ffcc9eac5db11edede99ef5f20db
---
 src/com/android/camera/PhotoModule.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 26a321094..7f08d78f4 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -2878,9 +2878,6 @@ public class PhotoModule
         }
 
         setCameraParameters(UPDATE_PARAM_ALL);
-
-        mCameraDevice.startPreview();
-        setCameraState(IDLE);
         mCameraDevice.setOneShotPreviewCallback(mHandler,
                 new CameraManager.CameraPreviewDataCallback() {
                     @Override
@@ -2888,6 +2885,9 @@ public class PhotoModule
                         mUI.hidePreviewCover();
                     }
                 });
+        mCameraDevice.startPreview();
+
+        setCameraState(IDLE);
         mHandler.sendEmptyMessage(ON_PREVIEW_STARTED);
 
         setDisplayOrientation();
-- 
cgit v1.2.3