SnapdragonCamera: Force removing preview cover

A workaround to remove preview cover after picture is taken, if
preview cover is not removed right after preview started.

Change-Id: I723d70fde6ecaf7302714daa6648c85d8a40d1b4
CRs-Fixed: 1016691

1 files changed, 5 insertions, 4 deletions

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 6f116ab24..028bfd1e2 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1258,13 +1258,14 @@ public class PhotoModule
         public void onPictureTaken(final byte [] jpegData, CameraProxy camera) {
             mUI.stopSelfieFlash();
             mUI.enableShutter(true);
+            if (mUI.isPreviewCoverVisible()) {
+                 // When take picture request is sent before starting preview, onPreviewFrame()
+                 // callback doesn't happen so removing preview cover here, instead.
+                 mUI.hidePreviewCover();
+            }
             if (mInstantCaptureSnapShot == true) {
                 Log.v(TAG, "Instant capture picture taken!");
                 mInstantCaptureSnapShot = false;
-
-                // When take picture request is sent before starting preview, onPreviewFrame()
-                // callback doesn't happen so removing preview cover here, instead.
-                mUI.hidePreviewCover();
             }
             if (mPaused) {
                 return;