Skip to content

[camera] Remove outdated TODO in camera_controller.dart #11239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
auto-submit merged 3 commits into from
Mar 13, 2026
+5 −13
Merged

[camera] Remove outdated TODO in camera_controller.dart #11239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a8f849
Remove outdated TODO in camera_controller.dart
cdeil Mar 12, 2026
c37756b
Resolve outdated TODO in android_camerax controller
cdeil Mar 12, 2026
8934487
Merge branch 'main' into rm-outdated-todo-camera-controller
stuartmorgan-g Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions packages/camera/camera/lib/src/camera_controller.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -353,15 +349,15 @@ class CameraController extends ValueNotifier<CameraValue> {
mediaSettings,
);

_unawaited(
unawaited(
CameraPlatform.instance.onCameraInitialized(_cameraId).first.then((
CameraInitializedEvent event,
) {
initializeCompleter.complete(event);
}),
);

_unawaited(
unawaited(
CameraPlatform.instance.onCameraError(_cameraId).first.then((
CameraErrorEvent event,
) {
Expand Down Expand Up @@ -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) {
Expand Down
8 changes: 2 additions & 6 deletions packages/camera/camera_android_camerax/example/lib/camera_controller.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -304,7 +300,7 @@ class CameraController extends ValueNotifier<CameraValue> {
mediaSettings ?? const MediaSettings(),
);

_unawaited(
unawaited(
CameraPlatform.instance.onCameraInitialized(_cameraId).first.then((
CameraInitializedEvent event,
) {
Expand Down Expand Up @@ -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) {
Expand Down
Loading