From 4e2c77d4911c433d06b96edb5b19efc66731c49f Mon Sep 17 00:00:00 2001
From: Yegor <yjbanov@google.com>
Date: Fri, 3 Dec 2021 16:40:57 -0800
Subject: [PATCH] [FlutterDriver] minor nullability fixes (#94584)

---
 .../flutter_driver/lib/src/extension/extension.dart   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/flutter_driver/lib/src/extension/extension.dart b/packages/flutter_driver/lib/src/extension/extension.dart
index c5578c9cdf..44e57ec4a2 100644
--- a/packages/flutter_driver/lib/src/extension/extension.dart
+++ b/packages/flutter_driver/lib/src/extension/extension.dart
@@ -366,11 +366,12 @@ class FlutterDriverExtension with DeserializeFinderFactory, CreateFinderFactory,
       final Command command = deserializeCommand(params, this);
       assert(WidgetsBinding.instance!.isRootWidgetAttached || !command.requiresRootWidgetAttached,
           'No root widget is attached; have you remembered to call runApp()?');
-      Future<Result?> responseFuture = handleCommand(command, _prober, this);
-      if (command.timeout != null)
-        responseFuture = responseFuture.timeout(command.timeout ?? Duration.zero);
-      final Result? response = await responseFuture;
-      return _makeResponse(response?.toJson());
+      Future<Result> responseFuture = handleCommand(command, _prober, this);
+      if (command.timeout != null) {
+        responseFuture = responseFuture.timeout(command.timeout!);
+      }
+      final Result response = await responseFuture;
+      return _makeResponse(response.toJson());
     } on TimeoutException catch (error, stackTrace) {
       final String message = 'Timeout while executing $commandKind: $error\n$stackTrace';
       _log(message);