Fix bug in which exposure and AE settings were not applied to AF scans

Change-Id: I2b495bab4221f231835219173edade26f3e4e896

diff --git a/src/com/android/camera/one/v2/autofocus/ManualAutoFocusFactory.java b/src/com/android/camera/one/v2/autofocus/ManualAutoFocusFactory.java
index 56bdea6..a45658a 100644 (file)
--- a/src/com/android/camera/one/v2/autofocus/ManualAutoFocusFactory.java
+++ b/src/com/android/camera/one/v2/autofocus/ManualAutoFocusFactory.java
@@ -75,7 +75,6 @@ public class ManualAutoFocusFactory {
         RequestTemplate afRequestBuilder = new RequestTemplate(rootBuilder);
         afRequestBuilder.setParam(CaptureRequest.CONTROL_AE_REGIONS, mAEMeteringRegion);
         afRequestBuilder.setParam(CaptureRequest.CONTROL_AF_REGIONS, mAFMeteringRegion);
-        afRequestBuilder.setParam(CaptureRequest.SCALER_CROP_REGION, cropRegion);
 
         CameraCommand afScanCommand = new FullAFScanCommand(frameServer, afRequestBuilder,
                 templateType);

diff --git a/src/com/android/camera/one/v2/common/BasicCameraFactory.java b/src/com/android/camera/one/v2/common/BasicCameraFactory.java
index 06a6be0..ffea7ab 100644 (file)
--- a/src/com/android/camera/one/v2/common/BasicCameraFactory.java
+++ b/src/com/android/camera/one/v2/common/BasicCameraFactory.java
@@ -108,7 +108,7 @@ public class BasicCameraFactory {
 
         ManualAutoFocusFactory manualAutoFocusFactory = new ManualAutoFocusFactory(new
                 Lifetime(lifetime), frameServer, threadPool, cropRegion,
-                sensorOrientation, mPreviewStarter, rootBuilder,
+                sensorOrientation, mPreviewStarter, previewBuilder,
                 templateType);
         mManualAutoFocus = manualAutoFocusFactory.provideManualAutoFocus();
         Supplier<MeteringRectangle[]> aeRegions =