From c9dae660aa23504d20b43554772e963c66fa47e2 Mon Sep 17 00:00:00 2001
From: zhuw <zhuw@codeaurora.org>
Date: Wed, 21 Mar 2018 16:42:58 +0800
Subject: Fix FD offset when back from recording in zoom condition

reset camera bound when back

Change-Id: Ia9527ad698e2a272c677f46d409f2e2095ed02b3
---
 src/com/android/camera/CaptureModule.java | 7 +------
 src/com/android/camera/CaptureUI.java     | 5 +++--
 2 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'src/com/android/camera')

diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index d2efbdab5..95f2fe0d8 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -902,12 +902,6 @@ public class CaptureModule implements CameraModule, PhotoController,
         mCaptureHDRTestEnable = false;
     }
 
-    public void startFaceDetection() {
-            mUI.onStartFaceDetection(mDisplayOrientation,
-                    mSettingsManager.isFacingFront(getMainCameraId()),
-                    mSettingsManager.getSensorActiveArraySize(getMainCameraId()));
-    }
-
     private boolean canStartMonoPreview() {
         return getCameraMode() == MONO_MODE ||
                 (getCameraMode() == DUAL_MODE && isMonoPreviewOn());
@@ -5508,6 +5502,7 @@ public class CaptureModule implements CameraModule, PhotoController,
                 else {
                     mUI.onStartFaceDetection(mDisplayOrientation,
                             mSettingsManager.isFacingFront(getMainCameraId()),
+                            mCropRegion[getMainCameraId()],
                             mSettingsManager.getSensorActiveArraySize(getMainCameraId()));
                 }
             }
diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java
index 0d0b3ee7f..745483493 100755
--- a/src/com/android/camera/CaptureUI.java
+++ b/src/com/android/camera/CaptureUI.java
@@ -1605,14 +1605,15 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
     public void resumeFaceDetection() {
     }
 
-    public void onStartFaceDetection(int orientation, boolean mirror, Rect cameraBound) {
+    public void onStartFaceDetection(int orientation, boolean mirror, Rect cameraBound,
+                                     Rect originalCameraBound) {
         mFaceView.setBlockDraw(false);
         mFaceView.clear();
         mFaceView.setVisibility(View.VISIBLE);
         mFaceView.setDisplayOrientation(orientation);
         mFaceView.setMirror(mirror);
         mFaceView.setCameraBound(cameraBound);
-        mFaceView.setOriginalCameraBound(cameraBound);
+        mFaceView.setOriginalCameraBound(originalCameraBound);
         mFaceView.setZoom(mModule.getZoomValue());
         mFaceView.resume();
     }
-- 
cgit v1.2.3