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> 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? future) {} - /// The state of a [CameraController]. class CameraValue { /// Creates a new camera controller state. @@ -353,7 +349,7 @@ class CameraController extends ValueNotifier { mediaSettings, ); - _unawaited( + unawaited( CameraPlatform.instance.onCameraInitialized(_cameraId).first.then(( CameraInitializedEvent event, ) { @@ -361,7 +357,7 @@ class CameraController extends ValueNotifier { }), ); - _unawaited( + unawaited( CameraPlatform.instance.onCameraError(_cameraId).first.then(( CameraErrorEvent event, ) { @@ -1008,7 +1004,7 @@ class CameraController extends ValueNotifier { if (_isDisposed) { return; } - _unawaited(_deviceOrientationSubscription?.cancel()); + unawaited(_deviceOrientationSubscription?.cancel()); _isDisposed = true; super.dispose(); if (_initializeFuture != null) { 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> 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? future) {} - /// The state of a [CameraController]. class CameraValue { /// Creates a new camera controller state. @@ -304,7 +300,7 @@ class CameraController extends ValueNotifier { mediaSettings ?? const MediaSettings(), ); - _unawaited( + unawaited( CameraPlatform.instance.onCameraInitialized(_cameraId).first.then(( CameraInitializedEvent event, ) { @@ -857,7 +853,7 @@ class CameraController extends ValueNotifier { if (_isDisposed) { return; } - _unawaited(_deviceOrientationSubscription?.cancel()); + unawaited(_deviceOrientationSubscription?.cancel()); _isDisposed = true; super.dispose(); if (_initCalled != null) {