Locked hacking

packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/Camera2CameraControlHostApiImpl.java

@@ -18,6 +18,9 @@
 import io.flutter.plugins.camerax.GeneratedCameraXLibrary.Camera2CameraControlHostApi;
 import java.util.Objects;
 
+import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.CameraMetadata;
+
 /**
  * Host API implementation for {@link Camera2CameraControl}.
  *
@@ -55,8 +58,10 @@ public void addCaptureRequestOptions(
         throw new IllegalStateException("Context must be set to add capture request options.");
       }
 
-      ListenableFuture<Void> addCaptureRequestOptionsFuture =
-          camera2CameraControl.addCaptureRequestOptions(bundle);
+      // ListenableFuture<Void> addCaptureRequestOptionsFuture =
+      //     camera2CameraControl.addCaptureRequestOptions(bundle);
+      CaptureRequestOptions options = new CaptureRequestOptions.Builder().setCaptureRequestOption(CaptureRequest.CONTROL_AF_MODE, CaptureRequest.CONTROL_AF_MODE_AUTO).setCaptureRequestOption(CaptureRequest.CONTROL_AF_TRIGGER, CameraMetadata.CONTROL_AF_TRIGGER_IDLE).build();
+      ListenableFuture<Void> addCaptureRequestOptionsFuture = camera2CameraControl.setCaptureRequestOptions(options);
 
       Futures.addCallback(
           addCaptureRequestOptionsFuture,

packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraAndroidCameraxPlugin.java

@@ -36,6 +36,9 @@ public final class CameraAndroidCameraxPlugin implements FlutterPlugin, Activity
 
   @VisibleForTesting public @Nullable LiveDataHostApiImpl liveDataHostApiImpl;
 
+    @VisibleForTesting @Nullable
+  public Camera2CameraControlHostApiImpl camera2CameraControlHostApiImpl;
+
   /**
    * Initialize this within the {@code #configureFlutterEngine} of a Flutter activity or fragment.
    *
@@ -119,6 +122,11 @@ public void setUp(
     cameraControlHostApiImpl =
         new CameraControlHostApiImpl(binaryMessenger, instanceManager, context);
     GeneratedCameraXLibrary.CameraControlHostApi.setup(binaryMessenger, cameraControlHostApiImpl);
+        camera2CameraControlHostApiImpl = new Camera2CameraControlHostApiImpl(instanceManager, context);
+    GeneratedCameraXLibrary.Camera2CameraControlHostApi.setup(
+        binaryMessenger, camera2CameraControlHostApiImpl);
+    GeneratedCameraXLibrary.CaptureRequestOptionsHostApi.setup(
+        binaryMessenger, new CaptureRequestOptionsHostApiImpl(instanceManager));
   }
 
   @Override
@@ -209,6 +217,9 @@ public void updateContext(@NonNull Context context) {
     }
     if (cameraControlHostApiImpl != null) {
       cameraControlHostApiImpl.setContext(context);
+    }
+        if (camera2CameraControlHostApiImpl != null) {
+      camera2CameraControlHostApiImpl.setContext(context);
     }
   }
 

packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CaptureRequestOptionsHostApiImpl.java

@@ -5,6 +5,7 @@
 package io.flutter.plugins.camerax;
 
 import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.CameraMetadata;
 import androidx.annotation.NonNull;
 import androidx.annotation.OptIn;
 import androidx.annotation.VisibleForTesting;
@@ -51,6 +52,9 @@ public static class CaptureRequestOptionsProxy {
             builder.setCaptureRequestOption(
                 (CaptureRequest.Key<Boolean>) optionKey, (Boolean) optionValue);
             break;
+          case CONTROL_AF_TRIGGER:
+            builder.setCaptureRequestOption( (CaptureRequest.Key<Integer>) optionKey, CameraMetadata.CONTROL_AF_TRIGGER_IDLE); //(Integer) optionValue);
+            break;
           default:
             throw new IllegalArgumentException(
                 "The capture request key "
@@ -69,6 +73,9 @@ private CaptureRequest.Key<? extends Object> getCaptureRequestKey(
         case CONTROL_AE_LOCK:
           key = CaptureRequest.CONTROL_AE_LOCK;
           break;
+        case CONTROL_AF_TRIGGER:
+          key = CaptureRequest.CONTROL_AF_TRIGGER;
+          break;
         default:
           throw new IllegalArgumentException(
               "The capture request key is not currently supported by the plugin.");
@@ -110,8 +117,8 @@ public void create(@NonNull Long identifier, @NonNull Map<Long, Object> options)
     Map<CaptureRequestKeySupportedType, Object> decodedOptions =
         new HashMap<CaptureRequestKeySupportedType, Object>();
     for (Map.Entry<Long, Object> option : options.entrySet()) {
-      decodedOptions.put(
-          CaptureRequestKeySupportedType.values()[option.getKey().intValue()], option.getValue());
+      Integer index = ((Number) option.getKey()).intValue();
+      decodedOptions.put(CaptureRequestKeySupportedType.values()[index], option.getValue());
     }
     instanceManager.addDartCreatedInstance(proxy.create(decodedOptions), identifier);
   }