From 5a8f84993d9898e3ccd91879a329a0da047dcea6 Mon Sep 17 00:00:00 2001
From: Christoph Deil <deil.christoph@gmail.com>
Date: Thu, 12 Mar 2026 19:45:20 +0100
Subject: [PATCH 1/2] Remove outdated TODO in camera_controller.dart

---
 packages/camera/camera/lib/src/camera_controller.dart | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/camera/camera/lib/src/camera_controller.dart b/packages/camera/camera/lib/src/camera_controller.dart
index 5a6e71ae3055..53e029b0faad 100644
--- a/packages/camera/camera/lib/src/camera_controller.dart
+++ b/packages/camera/camera/lib/src/camera_controller.dart
@@ -28,10 +28,6 @@ Future<List<CameraDescription>> availableCameras() async {
   return CameraPlatform.instance.availableCameras();
 }
 
-// TODO(stuartmorgan): Remove this once the package requires 2.10, where the
-// dart:async `unawaited` accepts a nullable future.
-void _unawaited(Future<void>? future) {}
-
 /// The state of a [CameraController].
 class CameraValue {
   /// Creates a new camera controller state.
@@ -353,7 +349,7 @@ class CameraController extends ValueNotifier<CameraValue> {
         mediaSettings,
       );
 
-      _unawaited(
+      unawaited(
         CameraPlatform.instance.onCameraInitialized(_cameraId).first.then((
           CameraInitializedEvent event,
         ) {
@@ -361,7 +357,7 @@ class CameraController extends ValueNotifier<CameraValue> {
         }),
       );
 
-      _unawaited(
+      unawaited(
         CameraPlatform.instance.onCameraError(_cameraId).first.then((
           CameraErrorEvent event,
         ) {
@@ -1008,7 +1004,7 @@ class CameraController extends ValueNotifier<CameraValue> {
     if (_isDisposed) {
       return;
     }
-    _unawaited(_deviceOrientationSubscription?.cancel());
+    unawaited(_deviceOrientationSubscription?.cancel());
     _isDisposed = true;
     super.dispose();
     if (_initializeFuture != null) {

From c37756b67021fefd3876515dfdbe7ff02f3b9dba Mon Sep 17 00:00:00 2001
From: Christoph Deil <deil.christoph@gmail.com>
Date: Thu, 12 Mar 2026 19:57:34 +0100
Subject: [PATCH 2/2] Resolve outdated TODO in android_camerax controller

---
 .../example/lib/camera_controller.dart                    | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/camera/camera_android_camerax/example/lib/camera_controller.dart b/packages/camera/camera_android_camerax/example/lib/camera_controller.dart
index c9f989df5250..ae95d306d52a 100644
--- a/packages/camera/camera_android_camerax/example/lib/camera_controller.dart
+++ b/packages/camera/camera_android_camerax/example/lib/camera_controller.dart
@@ -28,10 +28,6 @@ Future<List<CameraDescription>> availableCameras() async {
   return CameraPlatform.instance.availableCameras();
 }
 
-// TODO(stuartmorgan): Remove this once the package requires 2.10, where the
-// dart:async `unawaited` accepts a nullable future.
-void _unawaited(Future<void>? future) {}
-
 /// The state of a [CameraController].
 class CameraValue {
   /// Creates a new camera controller state.
@@ -304,7 +300,7 @@ class CameraController extends ValueNotifier<CameraValue> {
         mediaSettings ?? const MediaSettings(),
       );
 
-      _unawaited(
+      unawaited(
         CameraPlatform.instance.onCameraInitialized(_cameraId).first.then((
           CameraInitializedEvent event,
         ) {
@@ -857,7 +853,7 @@ class CameraController extends ValueNotifier<CameraValue> {
     if (_isDisposed) {
       return;
     }
-    _unawaited(_deviceOrientationSubscription?.cancel());
+    unawaited(_deviceOrientationSubscription?.cancel());
     _isDisposed = true;
     super.dispose();
     if (_initCalled != null) {