[camera] Fix Java lints in camerax version (#3966)

Removes list-baseline.xml and fixes all violations. Includes a few minor opporunistic fixes of warnings surfaced in Android Studio but not by the linter.

Part of https://github.com/flutter/flutter/issues/88011
diff --git a/packages/camera/camera_android_camerax/CHANGELOG.md b/packages/camera/camera_android_camerax/CHANGELOG.md
index 13d2f18..a07f285 100644
--- a/packages/camera/camera_android_camerax/CHANGELOG.md
+++ b/packages/camera/camera_android_camerax/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.0+3
+
+* Fixes Java lints.
+
 ## 0.5.0+2
 
 * Adds a dependency on kotlin-bom to align versions of Kotlin transitive dependencies.
diff --git a/packages/camera/camera_android_camerax/android/build.gradle b/packages/camera/camera_android_camerax/android/build.gradle
index 837ab1b..77b1045 100644
--- a/packages/camera/camera_android_camerax/android/build.gradle
+++ b/packages/camera/camera_android_camerax/android/build.gradle
@@ -56,7 +56,6 @@
         checkAllWarnings true
         warningsAsErrors true
         disable 'AndroidGradlePluginVersion', 'GradleDependency', 'InvalidPackage'
-        baseline file("lint-baseline.xml")
     }
 }
 
diff --git a/packages/camera/camera_android_camerax/android/lint-baseline.xml b/packages/camera/camera_android_camerax/android/lint-baseline.xml
deleted file mode 100644
index 1142794..0000000
--- a/packages/camera/camera_android_camerax/android/lint-baseline.xml
+++ /dev/null
@@ -1,1434 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 7.2.2" type="baseline" client="gradle" dependencies="false" name="AGP (7.2.2)" variant="all" version="7.2.2">
-
-    <issue
-        id="SwitchIntDef"
-        message="Switch statement on an `int` with known associated constant missing case `Configuration.ORIENTATION_SQUARE`, `Configuration.ORIENTATION_UNDEFINED`"
-        errorLine1="    switch (orientation) {"
-        errorLine2="    ~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/DeviceOrientationManager.java"
-            line="244"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` constructor of class `ResolutionInfo` requires synthetic accessor"
-        errorLine1="        ResolutionInfo pigeonReturn = new ResolutionInfo();"
-        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="108"
-            column="39"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` constructor of class `CameraPermissionsErrorData` requires synthetic accessor"
-        errorLine1="        CameraPermissionsErrorData pigeonReturn = new CameraPermissionsErrorData();"
-        errorLine2="                                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="185"
-            column="51"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` method `wrapError` of class `GeneratedCameraXLibrary` requires synthetic accessor"
-        errorLine1="                  ArrayList&lt;Object> wrappedError = wrapError(exception);"
-        errorLine2="                                                   ~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="245"
-            column="52"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` method `wrapError` of class `GeneratedCameraXLibrary` requires synthetic accessor"
-        errorLine1="                  ArrayList&lt;Object> wrappedError = wrapError(exception);"
-        errorLine2="                                                   ~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="283"
-            column="52"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` method `wrapError` of class `GeneratedCameraXLibrary` requires synthetic accessor"
-        errorLine1="                  ArrayList&lt;Object> wrappedError = wrapError(exception);"
-        errorLine2="                                                   ~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="352"
-            column="52"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` method `wrapError` of class `GeneratedCameraXLibrary` requires synthetic accessor"
-        errorLine1="                  ArrayList&lt;Object> wrappedError = wrapError(exception);"
-        errorLine2="                                                   ~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="423"
-            column="52"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` method `wrapError` of class `GeneratedCameraXLibrary` requires synthetic accessor"
-        errorLine1="                  ArrayList&lt;Object> wrappedError = wrapError(exception);"
-        errorLine2="                                                   ~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="450"
-            column="52"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` method `wrapError` of class `GeneratedCameraXLibrary` requires synthetic accessor"
-        errorLine1="                        ArrayList&lt;Object> wrappedError = wrapError(error);"
-        errorLine2="                                                         ~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="536"
-            column="58"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` method `wrapError` of class `GeneratedCameraXLibrary` requires synthetic accessor"
-        errorLine1="                  ArrayList&lt;Object> wrappedError = wrapError(exception);"
-        errorLine2="                                                   ~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="565"
-            column="52"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` method `wrapError` of class `GeneratedCameraXLibrary` requires synthetic accessor"
-        errorLine1="                  ArrayList&lt;Object> wrappedError = wrapError(exception);"
-        errorLine2="                                                   ~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="598"
-            column="52"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` method `wrapError` of class `GeneratedCameraXLibrary` requires synthetic accessor"
-        errorLine1="                  ArrayList&lt;Object> wrappedError = wrapError(exception);"
-        errorLine2="                                                   ~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="627"
-            column="52"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` method `wrapError` of class `GeneratedCameraXLibrary` requires synthetic accessor"
-        errorLine1="                  ArrayList&lt;Object> wrappedError = wrapError(exception);"
-        errorLine2="                                                   ~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="654"
-            column="52"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` method `wrapError` of class `GeneratedCameraXLibrary` requires synthetic accessor"
-        errorLine1="                  ArrayList&lt;Object> wrappedError = wrapError(exception);"
-        errorLine2="                                                   ~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="679"
-            column="52"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` method `wrapError` of class `GeneratedCameraXLibrary` requires synthetic accessor"
-        errorLine1="                        ArrayList&lt;Object> wrappedError = wrapError(error);"
-        errorLine2="                                                         ~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="811"
-            column="58"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` method `wrapError` of class `GeneratedCameraXLibrary` requires synthetic accessor"
-        errorLine1="                  ArrayList&lt;Object> wrappedError = wrapError(exception);"
-        errorLine2="                                                   ~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="841"
-            column="52"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` method `wrapError` of class `GeneratedCameraXLibrary` requires synthetic accessor"
-        errorLine1="                  ArrayList&lt;Object> wrappedError = wrapError(exception);"
-        errorLine2="                                                   ~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="864"
-            column="52"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` method `wrapError` of class `GeneratedCameraXLibrary` requires synthetic accessor"
-        errorLine1="                  ArrayList&lt;Object> wrappedError = wrapError(exception);"
-        errorLine2="                                                   ~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="987"
-            column="52"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` method `wrapError` of class `GeneratedCameraXLibrary` requires synthetic accessor"
-        errorLine1="                  ArrayList&lt;Object> wrappedError = wrapError(exception);"
-        errorLine2="                                                   ~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="1014"
-            column="52"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` method `wrapError` of class `GeneratedCameraXLibrary` requires synthetic accessor"
-        errorLine1="                  ArrayList&lt;Object> wrappedError = wrapError(exception);"
-        errorLine2="                                                   ~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="1037"
-            column="52"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` method `wrapError` of class `GeneratedCameraXLibrary` requires synthetic accessor"
-        errorLine1="                  ArrayList&lt;Object> wrappedError = wrapError(exception);"
-        errorLine2="                                                   ~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="1062"
-            column="52"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` method `wrapError` of class `GeneratedCameraXLibrary` requires synthetic accessor"
-        errorLine1="                  ArrayList&lt;Object> wrappedError = wrapError(exception);"
-        errorLine2="                                                   ~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="1140"
-            column="52"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` method `wrapError` of class `GeneratedCameraXLibrary` requires synthetic accessor"
-        errorLine1="                  ArrayList&lt;Object> wrappedError = wrapError(exception);"
-        errorLine2="                                                   ~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="1166"
-            column="52"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` method `wrapError` of class `GeneratedCameraXLibrary` requires synthetic accessor"
-        errorLine1="                        ArrayList&lt;Object> wrappedError = wrapError(error);"
-        errorLine2="                                                         ~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="1193"
-            column="58"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` field `binaryMessenger` of class `PreviewHostApiImpl` requires synthetic accessor"
-        errorLine1="                      cameraXProxy.createSystemServicesFlutterApiImpl(binaryMessenger);"
-        errorLine2="                                                                      ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/PreviewHostApiImpl.java"
-            line="103"
-            column="71"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` method `getProvideSurfaceErrorDescription` of class `PreviewHostApiImpl` requires synthetic accessor"
-        errorLine1="                      getProvideSurfaceErrorDescription(resultCode), reply -> {});"
-        errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/PreviewHostApiImpl.java"
-            line="105"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public SystemServicesHostApiImpl systemServicesHostApi;"
-        errorLine2="         ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/CameraAndroidCameraxPlugin.java"
-            line="22"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public void updateContext(Context context) {"
-        errorLine2="                            ~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/CameraAndroidCameraxPlugin.java"
-            line="109"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public CameraFlutterApiImpl(BinaryMessenger binaryMessenger, InstanceManager instanceManager) {"
-        errorLine2="                              ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/CameraFlutterApiImpl.java"
-            line="14"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public CameraFlutterApiImpl(BinaryMessenger binaryMessenger, InstanceManager instanceManager) {"
-        errorLine2="                                                               ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/CameraFlutterApiImpl.java"
-            line="14"
-            column="64"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="      BinaryMessenger binaryMessenger, InstanceManager instanceManager) {"
-        errorLine2="      ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/CameraInfoFlutterApiImpl.java"
-            line="15"
-            column="7"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="      BinaryMessenger binaryMessenger, InstanceManager instanceManager) {"
-        errorLine2="                                       ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/CameraInfoFlutterApiImpl.java"
-            line="15"
-            column="40"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public CameraInfoHostApiImpl(InstanceManager instanceManager) {"
-        errorLine2="                               ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/CameraInfoHostApiImpl.java"
-            line="15"
-            column="32"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public Long getSensorRotationDegrees(@NonNull Long identifier) {"
-        errorLine2="         ~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/CameraInfoHostApiImpl.java"
-            line="20"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="      BinaryMessenger binaryMessenger, InstanceManager instanceManager) {"
-        errorLine2="      ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/CameraSelectorFlutterApiImpl.java"
-            line="15"
-            column="7"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="      BinaryMessenger binaryMessenger, InstanceManager instanceManager) {"
-        errorLine2="                                       ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/CameraSelectorFlutterApiImpl.java"
-            line="15"
-            column="40"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  @VisibleForTesting public CameraXProxy cameraXProxy = new CameraXProxy();"
-        errorLine2="                            ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/CameraSelectorHostApiImpl.java"
-            line="21"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="      BinaryMessenger binaryMessenger, InstanceManager instanceManager) {"
-        errorLine2="      ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/CameraSelectorHostApiImpl.java"
-            line="24"
-            column="7"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="      BinaryMessenger binaryMessenger, InstanceManager instanceManager) {"
-        errorLine2="                                       ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/CameraSelectorHostApiImpl.java"
-            line="24"
-            column="40"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public void create(@NonNull Long identifier, Long lensFacing) {"
-        errorLine2="                                               ~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/CameraSelectorHostApiImpl.java"
-            line="30"
-            column="48"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public List&lt;Long> filter(@NonNull Long identifier, @NonNull List&lt;Long> cameraInfoIds) {"
-        errorLine2="         ~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/CameraSelectorHostApiImpl.java"
-            line="39"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public CameraSelector.Builder createCameraSelectorBuilder() {"
-        errorLine2="         ~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/CameraXProxy.java"
-            line="19"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public CameraPermissionsManager createCameraPermissionsManager() {"
-        errorLine2="         ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/CameraXProxy.java"
-            line="23"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public DeviceOrientationManager createDeviceOrientationManager("
-        errorLine2="         ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/CameraXProxy.java"
-            line="27"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public Preview.Builder createPreviewBuilder() {"
-        errorLine2="         ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/CameraXProxy.java"
-            line="35"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public Surface createSurface(@NonNull SurfaceTexture surfaceTexture) {"
-        errorLine2="         ~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/CameraXProxy.java"
-            line="39"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public SystemServicesFlutterApiImpl createSystemServicesFlutterApiImpl("
-        errorLine2="         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/CameraXProxy.java"
-            line="49"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public ImageCapture.Builder createImageCaptureBuilder() {"
-        errorLine2="         ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/CameraXProxy.java"
-            line="54"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public ImageCapture.OutputFileOptions createImageCaptureOutputFileOptions(@NonNull File file) {"
-        errorLine2="         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/CameraXProxy.java"
-            line="61"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public int getPhotoOrientation(PlatformChannel.DeviceOrientation orientation) {"
-        errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/DeviceOrientationManager.java"
-            line="109"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public int getVideoOrientation(PlatformChannel.DeviceOrientation orientation) {"
-        errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/DeviceOrientationManager.java"
-            line="166"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public PlatformChannel.DeviceOrientation getLastUIOrientation() {"
-        errorLine2="         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/DeviceOrientationManager.java"
-            line="197"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    void error(Throwable error);"
-        errorLine2="               ~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="213"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    static MessageCodec&lt;Object> getCodec() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="225"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    static void setup(BinaryMessenger binaryMessenger, InstanceManagerHostApi api) {"
-        errorLine2="                      ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="232"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    static void setup(BinaryMessenger binaryMessenger, InstanceManagerHostApi api) {"
-        errorLine2="                                                       ~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="232"
-            column="56"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    static MessageCodec&lt;Object> getCodec() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="262"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    static void setup(BinaryMessenger binaryMessenger, JavaObjectHostApi api) {"
-        errorLine2="                      ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="268"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    static void setup(BinaryMessenger binaryMessenger, JavaObjectHostApi api) {"
-        errorLine2="                                                       ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="268"
-            column="56"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    public JavaObjectFlutterApi(BinaryMessenger argBinaryMessenger) {"
-        errorLine2="                                ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="298"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    public void dispose(@NonNull Long identifierArg, Reply&lt;Void> callback) {"
-        errorLine2="                                                     ~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="311"
-            column="54"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    static MessageCodec&lt;Object> getCodec() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="327"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    static void setup(BinaryMessenger binaryMessenger, CameraInfoHostApi api) {"
-        errorLine2="                      ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="333"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    static void setup(BinaryMessenger binaryMessenger, CameraInfoHostApi api) {"
-        errorLine2="                                                       ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="333"
-            column="56"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    public CameraInfoFlutterApi(BinaryMessenger argBinaryMessenger) {"
-        errorLine2="                                ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="367"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    public void create(@NonNull Long identifierArg, Reply&lt;Void> callback) {"
-        errorLine2="                                                    ~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="380"
-            column="53"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    static MessageCodec&lt;Object> getCodec() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="398"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    static void setup(BinaryMessenger binaryMessenger, CameraSelectorHostApi api) {"
-        errorLine2="                      ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="405"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    static void setup(BinaryMessenger binaryMessenger, CameraSelectorHostApi api) {"
-        errorLine2="                                                       ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="405"
-            column="56"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    public CameraSelectorFlutterApi(BinaryMessenger argBinaryMessenger) {"
-        errorLine2="                                    ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="465"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="        @NonNull Long identifierArg, @Nullable Long lensFacingArg, Reply&lt;Void> callback) {"
-        errorLine2="                                                                   ~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="479"
-            column="68"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    void getInstance(Result&lt;Long> result);"
-        errorLine2="                     ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="491"
-            column="22"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    static MessageCodec&lt;Object> getCodec() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="510"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    static void setup(BinaryMessenger binaryMessenger, ProcessCameraProviderHostApi api) {"
-        errorLine2="                      ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="517"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    static void setup(BinaryMessenger binaryMessenger, ProcessCameraProviderHostApi api) {"
-        errorLine2="                                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="517"
-            column="56"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    public ProcessCameraProviderFlutterApi(BinaryMessenger argBinaryMessenger) {"
-        errorLine2="                                           ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="694"
-            column="44"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    public void create(@NonNull Long identifierArg, Reply&lt;Void> callback) {"
-        errorLine2="                                                    ~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="707"
-            column="53"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    public CameraFlutterApi(BinaryMessenger argBinaryMessenger) {"
-        errorLine2="                            ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="722"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    public void create(@NonNull Long identifierArg, Reply&lt;Void> callback) {"
-        errorLine2="                                                    ~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="735"
-            column="53"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="        @NonNull Boolean enableAudio, Result&lt;CameraPermissionsErrorData> result);"
-        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="775"
-            column="39"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    static MessageCodec&lt;Object> getCodec() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="783"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    static void setup(BinaryMessenger binaryMessenger, SystemServicesHostApi api) {"
-        errorLine2="                      ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="790"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    static void setup(BinaryMessenger binaryMessenger, SystemServicesHostApi api) {"
-        errorLine2="                                                       ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="790"
-            column="56"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    public SystemServicesFlutterApi(BinaryMessenger argBinaryMessenger) {"
-        errorLine2="                                    ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="879"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    public void onDeviceOrientationChanged(@NonNull String orientationArg, Reply&lt;Void> callback) {"
-        errorLine2="                                                                           ~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="892"
-            column="76"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    public void onCameraError(@NonNull String errorDescriptionArg, Reply&lt;Void> callback) {"
-        errorLine2="                                                                   ~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="903"
-            column="68"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    static MessageCodec&lt;Object> getCodec() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="963"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    static void setup(BinaryMessenger binaryMessenger, PreviewHostApi api) {"
-        errorLine2="                      ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="967"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    static void setup(BinaryMessenger binaryMessenger, PreviewHostApi api) {"
-        errorLine2="                                                       ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="967"
-            column="56"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    void takePicture(@NonNull Long identifier, Result&lt;String> result);"
-        errorLine2="                                               ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="1110"
-            column="48"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    static MessageCodec&lt;Object> getCodec() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="1113"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    static void setup(BinaryMessenger binaryMessenger, ImageCaptureHostApi api) {"
-        errorLine2="                      ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="1120"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="    static void setup(BinaryMessenger binaryMessenger, ImageCaptureHostApi api) {"
-        errorLine2="                                                       ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java"
-            line="1120"
-            column="56"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  @VisibleForTesting public CameraXProxy cameraXProxy = new CameraXProxy();"
-        errorLine2="                            ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/ImageCaptureHostApiImpl.java"
-            line="31"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public void setContext(Context context) {"
-        errorLine2="                         ~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/ImageCaptureHostApiImpl.java"
-            line="46"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public ImageCapture.OnImageSavedCallback createOnImageSavedCallback("
-        errorLine2="         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/ImageCaptureHostApiImpl.java"
-            line="107"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public static InstanceManager open(FinalizationListener finalizationListener) {"
-        errorLine2="                ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/InstanceManager.java"
-            line="72"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public static InstanceManager open(FinalizationListener finalizationListener) {"
-        errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/InstanceManager.java"
-            line="72"
-            column="38"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public Long getIdentifierForStrongReference(Object instance) {"
-        errorLine2="                                              ~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/InstanceManager.java"
-            line="117"
-            column="47"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public void addDartCreatedInstance(Object instance, long identifier) {"
-        errorLine2="                                     ~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/InstanceManager.java"
-            line="142"
-            column="38"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public long addHostCreatedInstance(Object instance) {"
-        errorLine2="                                     ~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/InstanceManager.java"
-            line="157"
-            column="38"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public boolean containsInstance(Object instance) {"
-        errorLine2="                                  ~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/InstanceManager.java"
-            line="198"
-            column="35"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public JavaObjectHostApiImpl(InstanceManager instanceManager) {"
-        errorLine2="                               ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/JavaObjectHostApiImpl.java"
-            line="25"
-            column="32"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  @VisibleForTesting public CameraXProxy cameraXProxy = new CameraXProxy();"
-        errorLine2="                            ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/PreviewHostApiImpl.java"
-            line="26"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  @VisibleForTesting public TextureRegistry.SurfaceTextureEntry flutterSurfaceTexture;"
-        errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/PreviewHostApiImpl.java"
-            line="27"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public Long setSurfaceProvider(@NonNull Long identifier) {"
-        errorLine2="         ~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/PreviewHostApiImpl.java"
-            line="62"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public Preview.SurfaceProvider createSurfaceProvider(@NonNull SurfaceTexture surfaceTexture) {"
-        errorLine2="         ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/PreviewHostApiImpl.java"
-            line="77"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public GeneratedCameraXLibrary.ResolutionInfo getResolutionInfo(@NonNull Long identifier) {"
-        errorLine2="         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/PreviewHostApiImpl.java"
-            line="139"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="      BinaryMessenger binaryMessenger, InstanceManager instanceManager) {"
-        errorLine2="      ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/ProcessCameraProviderFlutterApiImpl.java"
-            line="13"
-            column="7"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="      BinaryMessenger binaryMessenger, InstanceManager instanceManager) {"
-        errorLine2="                                       ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/ProcessCameraProviderFlutterApiImpl.java"
-            line="13"
-            column="40"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="      BinaryMessenger binaryMessenger, InstanceManager instanceManager, Context context) {"
-        errorLine2="      ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/ProcessCameraProviderHostApiImpl.java"
-            line="31"
-            column="7"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="      BinaryMessenger binaryMessenger, InstanceManager instanceManager, Context context) {"
-        errorLine2="                                       ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/ProcessCameraProviderHostApiImpl.java"
-            line="31"
-            column="40"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="      BinaryMessenger binaryMessenger, InstanceManager instanceManager, Context context) {"
-        errorLine2="                                                                        ~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/ProcessCameraProviderHostApiImpl.java"
-            line="31"
-            column="73"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public void setLifecycleOwner(LifecycleOwner lifecycleOwner) {"
-        errorLine2="                                ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/ProcessCameraProviderHostApiImpl.java"
-            line="37"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public void setContext(Context context) {"
-        errorLine2="                         ~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/ProcessCameraProviderHostApiImpl.java"
-            line="48"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public void getInstance(GeneratedCameraXLibrary.Result&lt;Long> result) {"
-        errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/ProcessCameraProviderHostApiImpl.java"
-            line="57"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public List&lt;Long> getAvailableCameraInfos(@NonNull Long identifier) {"
-        errorLine2="         ~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/ProcessCameraProviderHostApiImpl.java"
-            line="82"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public Long bindToLifecycle("
-        errorLine2="         ~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/ProcessCameraProviderHostApiImpl.java"
-            line="106"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public Boolean isBound(@NonNull Long identifier, @NonNull Long useCaseIdentifier) {"
-        errorLine2="         ~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/ProcessCameraProviderHostApiImpl.java"
-            line="135"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  @VisibleForTesting public CameraXProxy cameraXProxy = new CameraXProxy();"
-        errorLine2="                            ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/SystemServicesHostApiImpl.java"
-            line="20"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  @VisibleForTesting public DeviceOrientationManager deviceOrientationManager;"
-        errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/SystemServicesHostApiImpl.java"
-            line="21"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  @VisibleForTesting public SystemServicesFlutterApiImpl systemServicesFlutterApi;"
-        errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/SystemServicesHostApiImpl.java"
-            line="22"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="      BinaryMessenger binaryMessenger, InstanceManager instanceManager) {"
-        errorLine2="      ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/SystemServicesHostApiImpl.java"
-            line="28"
-            column="7"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="      BinaryMessenger binaryMessenger, InstanceManager instanceManager) {"
-        errorLine2="                                       ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/SystemServicesHostApiImpl.java"
-            line="28"
-            column="40"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public void setActivity(Activity activity) {"
-        errorLine2="                          ~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/SystemServicesHostApiImpl.java"
-            line="34"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="  public void setPermissionsRegistry(PermissionsRegistry permissionsRegistry) {"
-        errorLine2="                                     ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/SystemServicesHostApiImpl.java"
-            line="38"
-            column="38"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="      Boolean enableAudio, Result&lt;CameraPermissionsErrorData> result) {"
-        errorLine2="      ~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/SystemServicesHostApiImpl.java"
-            line="50"
-            column="7"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="      Boolean enableAudio, Result&lt;CameraPermissionsErrorData> result) {"
-        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/SystemServicesHostApiImpl.java"
-            line="50"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="      Boolean isFrontFacing, Long sensorOrientation) {"
-        errorLine2="      ~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/SystemServicesHostApiImpl.java"
-            line="81"
-            column="7"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
-        errorLine1="      Boolean isFrontFacing, Long sensorOrientation) {"
-        errorLine2="                             ~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camerax/SystemServicesHostApiImpl.java"
-            line="81"
-            column="30"/>
-    </issue>
-
-</issues>
diff --git a/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraAndroidCameraxPlugin.java b/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraAndroidCameraxPlugin.java
index d386635..dd8ab51 100644
--- a/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraAndroidCameraxPlugin.java
+++ b/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraAndroidCameraxPlugin.java
@@ -7,6 +7,7 @@
 import android.app.Activity;
 import android.content.Context;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.lifecycle.LifecycleOwner;
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
@@ -24,12 +25,12 @@
   private VideoCaptureHostApiImpl videoCaptureHostApiImpl;
   private ImageAnalysisHostApiImpl imageAnalysisHostApiImpl;
   private ImageCaptureHostApiImpl imageCaptureHostApiImpl;
-  public SystemServicesHostApiImpl systemServicesHostApiImpl;
+  public @Nullable SystemServicesHostApiImpl systemServicesHostApiImpl;
 
-  @VisibleForTesting @NonNull
-  public ProcessCameraProviderHostApiImpl processCameraProviderHostApiImpl;
+  @VisibleForTesting
+  public @Nullable ProcessCameraProviderHostApiImpl processCameraProviderHostApiImpl;
 
-  @VisibleForTesting @NonNull public LiveDataHostApiImpl liveDataHostApiImpl;
+  @VisibleForTesting public @Nullable LiveDataHostApiImpl liveDataHostApiImpl;
 
   /**
    * Initialize this within the {@code #configureFlutterEngine} of a Flutter activity or fragment.
diff --git a/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraFlutterApiImpl.java b/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraFlutterApiImpl.java
index a035483..cfc40be 100644
--- a/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraFlutterApiImpl.java
+++ b/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraFlutterApiImpl.java
@@ -4,14 +4,16 @@
 
 package io.flutter.plugins.camerax;
 
+import androidx.annotation.NonNull;
 import androidx.camera.core.Camera;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugins.camerax.GeneratedCameraXLibrary.CameraFlutterApi;
 
 public class CameraFlutterApiImpl extends CameraFlutterApi {
-  private final InstanceManager instanceManager;
+  private final @NonNull InstanceManager instanceManager;
 
-  public CameraFlutterApiImpl(BinaryMessenger binaryMessenger, InstanceManager instanceManager) {
+  public CameraFlutterApiImpl(
+      @NonNull BinaryMessenger binaryMessenger, @NonNull InstanceManager instanceManager) {
     super(binaryMessenger);
     this.instanceManager = instanceManager;
   }
diff --git a/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraInfoFlutterApiImpl.java b/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraInfoFlutterApiImpl.java
index 45fd784..8b0e1ff 100644
--- a/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraInfoFlutterApiImpl.java
+++ b/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraInfoFlutterApiImpl.java
@@ -4,15 +4,16 @@
 
 package io.flutter.plugins.camerax;
 
+import androidx.annotation.NonNull;
 import androidx.camera.core.CameraInfo;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugins.camerax.GeneratedCameraXLibrary.CameraInfoFlutterApi;
 
 public class CameraInfoFlutterApiImpl extends CameraInfoFlutterApi {
-  private final InstanceManager instanceManager;
+  private final @NonNull InstanceManager instanceManager;
 
   public CameraInfoFlutterApiImpl(
-      BinaryMessenger binaryMessenger, InstanceManager instanceManager) {
+      @NonNull BinaryMessenger binaryMessenger, @NonNull InstanceManager instanceManager) {
     super(binaryMessenger);
     this.instanceManager = instanceManager;
   }
diff --git a/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraInfoHostApiImpl.java b/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraInfoHostApiImpl.java
index e72d08d..83eb359 100644
--- a/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraInfoHostApiImpl.java
+++ b/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraInfoHostApiImpl.java
@@ -20,7 +20,7 @@
   private final BinaryMessenger binaryMessenger;
   private final InstanceManager instanceManager;
 
-  @VisibleForTesting public LiveDataFlutterApiWrapper liveDataFlutterApiWrapper;
+  @VisibleForTesting public @NonNull LiveDataFlutterApiWrapper liveDataFlutterApiWrapper;
 
   public CameraInfoHostApiImpl(
       @NonNull BinaryMessenger binaryMessenger, @NonNull InstanceManager instanceManager) {
diff --git a/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraPermissionsManager.java b/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraPermissionsManager.java
index 19b1ee5..28093ec 100644
--- a/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraPermissionsManager.java
+++ b/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraPermissionsManager.java
@@ -8,6 +8,7 @@
 import android.Manifest.permission;
 import android.app.Activity;
 import android.content.pm.PackageManager;
+import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
@@ -99,7 +100,8 @@
     }
 
     @Override
-    public boolean onRequestPermissionsResult(int id, String[] permissions, int[] grantResults) {
+    public boolean onRequestPermissionsResult(
+        int id, @NonNull String[] permissions, @NonNull int[] grantResults) {
       if (alreadyCalled || id != CAMERA_REQUEST_ID) {
         return false;
       }
diff --git a/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraSelectorFlutterApiImpl.java b/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraSelectorFlutterApiImpl.java
index 6ca3782..a0b30fa 100644
--- a/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraSelectorFlutterApiImpl.java
+++ b/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraSelectorFlutterApiImpl.java
@@ -4,6 +4,7 @@
 
 package io.flutter.plugins.camerax;
 
+import androidx.annotation.NonNull;
 import androidx.camera.core.CameraSelector;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugins.camerax.GeneratedCameraXLibrary.CameraSelectorFlutterApi;
@@ -12,7 +13,7 @@
   private final InstanceManager instanceManager;
 
   public CameraSelectorFlutterApiImpl(
-      BinaryMessenger binaryMessenger, InstanceManager instanceManager) {
+      @NonNull BinaryMessenger binaryMessenger, @NonNull InstanceManager instanceManager) {
     super(binaryMessenger);
     this.instanceManager = instanceManager;
   }
diff --git a/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraSelectorHostApiImpl.java b/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraSelectorHostApiImpl.java
index 8ceafbc..bbd7473 100644
--- a/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraSelectorHostApiImpl.java
+++ b/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraSelectorHostApiImpl.java
@@ -5,6 +5,7 @@
 package io.flutter.plugins.camerax;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.camera.core.CameraInfo;
 import androidx.camera.core.CameraSelector;
@@ -18,16 +19,16 @@
   private final BinaryMessenger binaryMessenger;
   private final InstanceManager instanceManager;
 
-  @VisibleForTesting public CameraXProxy cameraXProxy = new CameraXProxy();
+  @VisibleForTesting public @NonNull CameraXProxy cameraXProxy = new CameraXProxy();
 
   public CameraSelectorHostApiImpl(
-      BinaryMessenger binaryMessenger, InstanceManager instanceManager) {
+      @NonNull BinaryMessenger binaryMessenger, @NonNull InstanceManager instanceManager) {
     this.binaryMessenger = binaryMessenger;
     this.instanceManager = instanceManager;
   }
 
   @Override
-  public void create(@NonNull Long identifier, Long lensFacing) {
+  public void create(@NonNull Long identifier, @Nullable Long lensFacing) {
     CameraSelector.Builder cameraSelectorBuilder = cameraXProxy.createCameraSelectorBuilder();
     if (lensFacing != null) {
       cameraSelectorBuilder = cameraSelectorBuilder.requireLensFacing(lensFacing.intValue());
@@ -36,10 +37,10 @@
   }
 
   @Override
-  public List<Long> filter(@NonNull Long identifier, @NonNull List<Long> cameraInfoIds) {
+  public @NonNull List<Long> filter(@NonNull Long identifier, @NonNull List<Long> cameraInfoIds) {
     CameraSelector cameraSelector =
         (CameraSelector) Objects.requireNonNull(instanceManager.getInstance(identifier));
-    List<CameraInfo> cameraInfosForFilter = new ArrayList<CameraInfo>();
+    List<CameraInfo> cameraInfosForFilter = new ArrayList<>();
 
     for (Number cameraInfoAsNumber : cameraInfoIds) {
       Long cameraInfoId = cameraInfoAsNumber.longValue();
@@ -50,7 +51,7 @@
     }
 
     List<CameraInfo> filteredCameraInfos = cameraSelector.filter(cameraInfosForFilter);
-    List<Long> filteredCameraInfosIds = new ArrayList<Long>();
+    List<Long> filteredCameraInfosIds = new ArrayList<>();
 
     for (CameraInfo cameraInfo : filteredCameraInfos) {
       Long filteredCameraInfoId = instanceManager.getIdentifierForStrongReference(cameraInfo);
diff --git a/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraXProxy.java b/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraXProxy.java
index 09c1003..af7fdc3 100644
--- a/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraXProxy.java
+++ b/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraXProxy.java
@@ -24,35 +24,35 @@
    * Converts a {@link ResolutionInfo} instance to a {@link Size} for setting the target resolution
    * of {@link UseCase}s.
    */
-  public static Size sizeFromResolution(@NonNull ResolutionInfo resolutionInfo) {
+  public static @NonNull Size sizeFromResolution(@NonNull ResolutionInfo resolutionInfo) {
     return new Size(resolutionInfo.getWidth().intValue(), resolutionInfo.getHeight().intValue());
   }
 
-  public CameraSelector.Builder createCameraSelectorBuilder() {
+  public @NonNull CameraSelector.Builder createCameraSelectorBuilder() {
     return new CameraSelector.Builder();
   }
 
   /** Creates an instance of {@link CameraPermissionsManager}. */
-  public CameraPermissionsManager createCameraPermissionsManager() {
+  public @NonNull CameraPermissionsManager createCameraPermissionsManager() {
     return new CameraPermissionsManager();
   }
 
   /** Creates an instance of the {@link DeviceOrientationManager}. */
-  public DeviceOrientationManager createDeviceOrientationManager(
+  public @NonNull DeviceOrientationManager createDeviceOrientationManager(
       @NonNull Activity activity,
       @NonNull Boolean isFrontFacing,
-      @NonNull int sensorOrientation,
+      int sensorOrientation,
       @NonNull DeviceOrientationManager.DeviceOrientationChangeCallback callback) {
     return new DeviceOrientationManager(activity, isFrontFacing, sensorOrientation, callback);
   }
 
   /** Creates a builder for an instance of the {@link Preview} use case. */
-  public Preview.Builder createPreviewBuilder() {
+  public @NonNull Preview.Builder createPreviewBuilder() {
     return new Preview.Builder();
   }
 
   /** Creates a {@link Surface} instance from the specified {@link SurfaceTexture}. */
-  public Surface createSurface(@NonNull SurfaceTexture surfaceTexture) {
+  public @NonNull Surface createSurface(@NonNull SurfaceTexture surfaceTexture) {
     return new Surface(surfaceTexture);
   }
 
@@ -62,7 +62,7 @@
    * <p>Included in this class to utilize the callback methods it provides, e.g. {@code
    * onCameraError(String)}.
    */
-  public SystemServicesFlutterApiImpl createSystemServicesFlutterApiImpl(
+  public @NonNull SystemServicesFlutterApiImpl createSystemServicesFlutterApiImpl(
       @NonNull BinaryMessenger binaryMessenger) {
     return new SystemServicesFlutterApiImpl(binaryMessenger);
   }
diff --git a/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/DeviceOrientationManager.java b/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/DeviceOrientationManager.java
index ebcb864..67cac56 100644
--- a/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/DeviceOrientationManager.java
+++ b/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/DeviceOrientationManager.java
@@ -14,6 +14,7 @@
 import android.view.Surface;
 import android.view.WindowManager;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import io.flutter.embedding.engine.systemchannels.PlatformChannel;
 import io.flutter.embedding.engine.systemchannels.PlatformChannel.DeviceOrientation;
@@ -106,7 +107,7 @@
    *     into degrees.
    * @return The device's photo orientation in degrees.
    */
-  public int getPhotoOrientation(PlatformChannel.DeviceOrientation orientation) {
+  public int getPhotoOrientation(@Nullable PlatformChannel.DeviceOrientation orientation) {
     int angle = 0;
     // Fallback to device orientation when the orientation value is null.
     if (orientation == null) {
@@ -163,7 +164,7 @@
    *     into degrees.
    * @return The device's video orientation in clockwise degrees.
    */
-  public int getVideoOrientation(PlatformChannel.DeviceOrientation orientation) {
+  public int getVideoOrientation(@Nullable PlatformChannel.DeviceOrientation orientation) {
     int angle = 0;
 
     // Fallback to device orientation when the orientation value is null.
@@ -194,7 +195,7 @@
   }
 
   /** @return the last received UI orientation. */
-  public PlatformChannel.DeviceOrientation getLastUIOrientation() {
+  public @Nullable PlatformChannel.DeviceOrientation getLastUIOrientation() {
     return this.lastOrientation;
   }
 
@@ -236,6 +237,8 @@
    *
    * @return The current user interface orientation.
    */
+  // Configuration.ORIENTATION_SQUARE is deprecated.
+  @SuppressWarnings("deprecation")
   @VisibleForTesting
   PlatformChannel.DeviceOrientation getUIOrientation() {
     final int rotation = getDisplay().getRotation();
@@ -254,6 +257,8 @@
         } else {
           return PlatformChannel.DeviceOrientation.LANDSCAPE_RIGHT;
         }
+      case Configuration.ORIENTATION_SQUARE:
+      case Configuration.ORIENTATION_UNDEFINED:
       default:
         return PlatformChannel.DeviceOrientation.PORTRAIT_UP;
     }
diff --git a/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/ImageCaptureHostApiImpl.java b/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/ImageCaptureHostApiImpl.java
index 0c00ed6..f2e71aa 100644
--- a/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/ImageCaptureHostApiImpl.java
+++ b/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/ImageCaptureHostApiImpl.java
@@ -27,7 +27,7 @@
   public static final String TEMPORARY_FILE_NAME = "CAP";
   public static final String JPG_FILE_TYPE = ".jpg";
 
-  @VisibleForTesting public CameraXProxy cameraXProxy = new CameraXProxy();
+  @VisibleForTesting public @NonNull CameraXProxy cameraXProxy = new CameraXProxy();
 
   public ImageCaptureHostApiImpl(
       @NonNull BinaryMessenger binaryMessenger,
@@ -42,7 +42,7 @@
    * Sets the context that the {@link ImageCapture} will use to find a location to save a captured
    * image.
    */
-  public void setContext(Context context) {
+  public void setContext(@NonNull Context context) {
     this.context = context;
   }
 
@@ -101,7 +101,7 @@
 
   /** Creates a callback used when saving a captured image. */
   @VisibleForTesting
-  public ImageCapture.OnImageSavedCallback createOnImageSavedCallback(
+  public @NonNull ImageCapture.OnImageSavedCallback createOnImageSavedCallback(
       @NonNull File file, @NonNull GeneratedCameraXLibrary.Result<String> result) {
     return new ImageCapture.OnImageSavedCallback() {
       @Override
diff --git a/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/InstanceManager.java b/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/InstanceManager.java
index 788d54f..97ab805 100644
--- a/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/InstanceManager.java
+++ b/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/InstanceManager.java
@@ -67,7 +67,7 @@
    * @return a new `InstanceManager`.
    */
   @NonNull
-  public static InstanceManager create(FinalizationListener finalizationListener) {
+  public static InstanceManager create(@NonNull FinalizationListener finalizationListener) {
     return new InstanceManager(finalizationListener);
   }
 
@@ -109,7 +109,7 @@
    *     `null` if the manager doesn't contain the value.
    */
   @Nullable
-  public Long getIdentifierForStrongReference(Object instance) {
+  public Long getIdentifierForStrongReference(@Nullable Object instance) {
     logWarningIfFinalizationListenerHasStopped();
 
     final Long identifier = identifiers.get(instance);
@@ -130,7 +130,7 @@
    * @param identifier the identifier to be paired with instance. This value must be >= 0 and
    *     unique.
    */
-  public void addDartCreatedInstance(Object instance, long identifier) {
+  public void addDartCreatedInstance(@NonNull Object instance, long identifier) {
     logWarningIfFinalizationListenerHasStopped();
     addInstance(instance, identifier);
   }
@@ -141,7 +141,7 @@
    * @param instance the instance to be stored. This must be unique to all other added instances.
    * @return the unique identifier (>= 0) stored with instance.
    */
-  public long addHostCreatedInstance(Object instance) {
+  public long addHostCreatedInstance(@NonNull Object instance) {
     logWarningIfFinalizationListenerHasStopped();
 
     if (containsInstance(instance)) {
@@ -178,7 +178,7 @@
    * @param instance the instance whose presence in this manager is to be tested.
    * @return whether this manager contains the given `instance`.
    */
-  public boolean containsInstance(Object instance) {
+  public boolean containsInstance(@Nullable Object instance) {
     logWarningIfFinalizationListenerHasStopped();
     return identifiers.containsKey(instance);
   }
diff --git a/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/JavaObjectHostApiImpl.java b/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/JavaObjectHostApiImpl.java
index 5dc0ba7..538d454 100644
--- a/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/JavaObjectHostApiImpl.java
+++ b/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/JavaObjectHostApiImpl.java
@@ -22,7 +22,7 @@
    *
    * @param instanceManager maintains instances stored to communicate with Dart objects
    */
-  public JavaObjectHostApiImpl(InstanceManager instanceManager) {
+  public JavaObjectHostApiImpl(@NonNull InstanceManager instanceManager) {
     this.instanceManager = instanceManager;
   }
 
diff --git a/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/PreviewHostApiImpl.java b/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/PreviewHostApiImpl.java
index e89b4bc..6f93fd0 100644
--- a/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/PreviewHostApiImpl.java
+++ b/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/PreviewHostApiImpl.java
@@ -19,12 +19,12 @@
 import java.util.concurrent.Executors;
 
 public class PreviewHostApiImpl implements PreviewHostApi {
-  private final BinaryMessenger binaryMessenger;
+  final BinaryMessenger binaryMessenger;
   private final InstanceManager instanceManager;
   private final TextureRegistry textureRegistry;
 
-  @VisibleForTesting public CameraXProxy cameraXProxy = new CameraXProxy();
-  @VisibleForTesting public TextureRegistry.SurfaceTextureEntry flutterSurfaceTexture;
+  @VisibleForTesting public @NonNull CameraXProxy cameraXProxy = new CameraXProxy();
+  @VisibleForTesting public @Nullable TextureRegistry.SurfaceTextureEntry flutterSurfaceTexture;
 
   public PreviewHostApiImpl(
       @NonNull BinaryMessenger binaryMessenger,
@@ -57,7 +57,7 @@
    * by a Flutter {@link TextureRegistry.SurfaceTextureEntry} used to build the {@link Preview}.
    */
   @Override
-  public Long setSurfaceProvider(@NonNull Long identifier) {
+  public @NonNull Long setSurfaceProvider(@NonNull Long identifier) {
     Preview preview = (Preview) Objects.requireNonNull(instanceManager.getInstance(identifier));
     flutterSurfaceTexture = textureRegistry.createSurfaceTexture();
     SurfaceTexture surfaceTexture = flutterSurfaceTexture.surfaceTexture();
@@ -72,10 +72,11 @@
    * {@code Preview} that is backed by a Flutter {@link TextureRegistry.SurfaceTextureEntry}.
    */
   @VisibleForTesting
-  public Preview.SurfaceProvider createSurfaceProvider(@NonNull SurfaceTexture surfaceTexture) {
+  public @NonNull Preview.SurfaceProvider createSurfaceProvider(
+      @NonNull SurfaceTexture surfaceTexture) {
     return new Preview.SurfaceProvider() {
       @Override
-      public void onSurfaceRequested(SurfaceRequest request) {
+      public void onSurfaceRequested(@NonNull SurfaceRequest request) {
         surfaceTexture.setDefaultBufferSize(
             request.getResolution().getWidth(), request.getResolution().getHeight());
         Surface flutterSurface = cameraXProxy.createSurface(surfaceTexture);
@@ -106,7 +107,7 @@
                   break;
               }
             });
-      };
+      }
     };
   }
 
@@ -114,7 +115,7 @@
    * Returns an error description for each {@link SurfaceRequest.Result} that represents an error
    * with providing a surface.
    */
-  private String getProvideSurfaceErrorDescription(int resultCode) {
+  String getProvideSurfaceErrorDescription(int resultCode) {
     switch (resultCode) {
       case SurfaceRequest.Result.RESULT_INVALID_SURFACE:
         return resultCode + ": Provided surface could not be used by the camera.";
@@ -136,7 +137,8 @@
 
   /** Returns the resolution information for the specified {@link Preview}. */
   @Override
-  public GeneratedCameraXLibrary.ResolutionInfo getResolutionInfo(@NonNull Long identifier) {
+  public @NonNull GeneratedCameraXLibrary.ResolutionInfo getResolutionInfo(
+      @NonNull Long identifier) {
     Preview preview = (Preview) Objects.requireNonNull(instanceManager.getInstance(identifier));
     Size resolution = preview.getResolutionInfo().getResolution();
 
diff --git a/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/ProcessCameraProviderFlutterApiImpl.java b/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/ProcessCameraProviderFlutterApiImpl.java
index 90c94d0..35e2bc0 100644
--- a/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/ProcessCameraProviderFlutterApiImpl.java
+++ b/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/ProcessCameraProviderFlutterApiImpl.java
@@ -4,13 +4,14 @@
 
 package io.flutter.plugins.camerax;
 
+import androidx.annotation.NonNull;
 import androidx.camera.lifecycle.ProcessCameraProvider;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugins.camerax.GeneratedCameraXLibrary.ProcessCameraProviderFlutterApi;
 
 public class ProcessCameraProviderFlutterApiImpl extends ProcessCameraProviderFlutterApi {
   public ProcessCameraProviderFlutterApiImpl(
-      BinaryMessenger binaryMessenger, InstanceManager instanceManager) {
+      @NonNull BinaryMessenger binaryMessenger, @NonNull InstanceManager instanceManager) {
     super(binaryMessenger);
     this.instanceManager = instanceManager;
   }
diff --git a/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/ProcessCameraProviderHostApiImpl.java b/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/ProcessCameraProviderHostApiImpl.java
index 7d72dee..9292ee9 100644
--- a/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/ProcessCameraProviderHostApiImpl.java
+++ b/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/ProcessCameraProviderHostApiImpl.java
@@ -28,13 +28,15 @@
   private LifecycleOwner lifecycleOwner;
 
   public ProcessCameraProviderHostApiImpl(
-      BinaryMessenger binaryMessenger, InstanceManager instanceManager, Context context) {
+      @NonNull BinaryMessenger binaryMessenger,
+      @NonNull InstanceManager instanceManager,
+      @NonNull Context context) {
     this.binaryMessenger = binaryMessenger;
     this.instanceManager = instanceManager;
     this.context = context;
   }
 
-  public void setLifecycleOwner(LifecycleOwner lifecycleOwner) {
+  public void setLifecycleOwner(@NonNull LifecycleOwner lifecycleOwner) {
     this.lifecycleOwner = lifecycleOwner;
   }
 
@@ -45,7 +47,7 @@
    * <p>If using the camera plugin in an add-to-app context, ensure that a new instance of the
    * {@code ProcessCameraProvider} is fetched via {@code #getInstance} anytime the context changes.
    */
-  public void setContext(Context context) {
+  public void setContext(@NonNull Context context) {
     this.context = context;
   }
 
@@ -54,7 +56,7 @@
    * for the current {@code Context}.
    */
   @Override
-  public void getInstance(GeneratedCameraXLibrary.Result<Long> result) {
+  public void getInstance(@NonNull GeneratedCameraXLibrary.Result<Long> result) {
     ListenableFuture<ProcessCameraProvider> processCameraProviderFuture =
         ProcessCameraProvider.getInstance(context);
 
@@ -78,13 +80,14 @@
   }
 
   /** Returns cameras available to the {@code ProcessCameraProvider}. */
+  @NonNull
   @Override
   public List<Long> getAvailableCameraInfos(@NonNull Long identifier) {
     ProcessCameraProvider processCameraProvider =
         (ProcessCameraProvider) Objects.requireNonNull(instanceManager.getInstance(identifier));
 
     List<CameraInfo> availableCameras = processCameraProvider.getAvailableCameraInfos();
-    List<Long> availableCamerasIds = new ArrayList<Long>();
+    List<Long> availableCamerasIds = new ArrayList<>();
     final CameraInfoFlutterApiImpl cameraInfoFlutterApi =
         new CameraInfoFlutterApiImpl(binaryMessenger, instanceManager);
 
@@ -103,7 +106,7 @@
    * that {@code LifecycleOwner} reflects.
    */
   @Override
-  public Long bindToLifecycle(
+  public @NonNull Long bindToLifecycle(
       @NonNull Long identifier,
       @NonNull Long cameraSelectorIdentifier,
       @NonNull List<Long> useCaseIds) {
@@ -128,11 +131,11 @@
       cameraFlutterApi.create(camera, result -> {});
     }
 
-    return instanceManager.getIdentifierForStrongReference(camera);
+    return Objects.requireNonNull(instanceManager.getIdentifierForStrongReference(camera));
   }
 
   @Override
-  public Boolean isBound(@NonNull Long identifier, @NonNull Long useCaseIdentifier) {
+  public @NonNull Boolean isBound(@NonNull Long identifier, @NonNull Long useCaseIdentifier) {
     ProcessCameraProvider processCameraProvider =
         (ProcessCameraProvider) Objects.requireNonNull(instanceManager.getInstance(identifier));
     UseCase useCase =
diff --git a/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/SystemServicesHostApiImpl.java b/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/SystemServicesHostApiImpl.java
index ffd387e..b8f4d6b 100644
--- a/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/SystemServicesHostApiImpl.java
+++ b/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/SystemServicesHostApiImpl.java
@@ -7,6 +7,7 @@
 import android.app.Activity;
 import android.content.Context;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import io.flutter.embedding.engine.systemchannels.PlatformChannel.DeviceOrientation;
 import io.flutter.plugin.common.BinaryMessenger;
@@ -23,15 +24,17 @@
   private final InstanceManager instanceManager;
   private Context context;
 
-  @VisibleForTesting public CameraXProxy cameraXProxy = new CameraXProxy();
-  @VisibleForTesting public DeviceOrientationManager deviceOrientationManager;
-  @VisibleForTesting public SystemServicesFlutterApiImpl systemServicesFlutterApi;
+  @VisibleForTesting public @NonNull CameraXProxy cameraXProxy = new CameraXProxy();
+  @VisibleForTesting public @Nullable DeviceOrientationManager deviceOrientationManager;
+  @VisibleForTesting public @NonNull SystemServicesFlutterApiImpl systemServicesFlutterApi;
 
   private Activity activity;
   private PermissionsRegistry permissionsRegistry;
 
   public SystemServicesHostApiImpl(
-      BinaryMessenger binaryMessenger, InstanceManager instanceManager, Context context) {
+      @NonNull BinaryMessenger binaryMessenger,
+      @NonNull InstanceManager instanceManager,
+      @NonNull Context context) {
     this.binaryMessenger = binaryMessenger;
     this.instanceManager = instanceManager;
     this.context = context;
@@ -39,15 +42,15 @@
   }
 
   /** Sets the context, which is used to get the cache directory. */
-  public void setContext(Context context) {
+  public void setContext(@NonNull Context context) {
     this.context = context;
   }
 
-  public void setActivity(Activity activity) {
+  public void setActivity(@NonNull Activity activity) {
     this.activity = activity;
   }
 
-  public void setPermissionsRegistry(PermissionsRegistry permissionsRegistry) {
+  public void setPermissionsRegistry(@NonNull PermissionsRegistry permissionsRegistry) {
     this.permissionsRegistry = permissionsRegistry;
   }
 
@@ -59,7 +62,7 @@
    */
   @Override
   public void requestCameraPermissions(
-      Boolean enableAudio, Result<CameraPermissionsErrorData> result) {
+      @NonNull Boolean enableAudio, @NonNull Result<CameraPermissionsErrorData> result) {
     CameraPermissionsManager cameraPermissionsManager =
         cameraXProxy.createCameraPermissionsManager();
     cameraPermissionsManager.requestPermissions(
diff --git a/packages/camera/camera_android_camerax/pubspec.yaml b/packages/camera/camera_android_camerax/pubspec.yaml
index 7c57766..97a95de 100644
--- a/packages/camera/camera_android_camerax/pubspec.yaml
+++ b/packages/camera/camera_android_camerax/pubspec.yaml
@@ -3,7 +3,7 @@
 repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_android_camerax
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
 
-version: 0.5.0+2
+version: 0.5.0+3
 
 environment:
   sdk: ">=2.19.0 <4.0.0"