From 0e4107e829eced475395dc4e11e4a76b49c5f30e Mon Sep 17 00:00:00 2001
From: Hidenori Matsubayashi <Hidenori.Matsubayashi@sony.com>
Date: Fri, 10 Dec 2021 13:19:28 +0900
Subject: [PATCH] Update to flutter-2.8.0 (#68)

Updated to the flutter 2.8.0. See also:
 - https://github.com/sony/flutter-embedded-linux/releases/tag/40a99c5951
 - https://github.com/flutter/flutter/tree/2.8.0
---
 bin/internal/engine.version           | 2 +-
 bin/internal/flutter.version          | 2 +-
 lib/commands/upgrade.dart             | 4 ++--
 lib/elinux_device.dart                | 4 ++--
 lib/elinux_remote_devices_config.dart | 2 +-
 lib/executable.dart                   | 1 -
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/bin/internal/engine.version b/bin/internal/engine.version
index ce2a1e9..19bc713 100644
--- a/bin/internal/engine.version
+++ b/bin/internal/engine.version
@@ -1 +1 @@
-d3ea636dc5d16b56819f3266241e1f708979c233
+40a99c595137e4b2f5b2efa8ff343ea23c1e16b8
diff --git a/bin/internal/flutter.version b/bin/internal/flutter.version
index f650bfa..434a585 100644
--- a/bin/internal/flutter.version
+++ b/bin/internal/flutter.version
@@ -1 +1 @@
-18116933e77adc82f80866c928266a5b4f1ed645
+cf4400006550b70f28e4b4af815151d1e74846c6
diff --git a/lib/commands/upgrade.dart b/lib/commands/upgrade.dart
index 8654d20..8ffc075 100644
--- a/lib/commands/upgrade.dart
+++ b/lib/commands/upgrade.dart
@@ -279,12 +279,12 @@ class ELinuxUpgradeCommandRunner {
   /// Source: [runCommandSecondHalf] in `upgrade.dart`
   Future<void> runCommandSecondHalf() async {
     // Make sure the welcome message re-display is delayed until the end.
-    globals.persistentToolState.redisplayWelcomeMessage = false;
+    globals.persistentToolState.setShouldRedisplayWelcomeMessage(false);
     await precacheArtifacts();
     await updatePackages();
     await runDoctor();
     // Force the welcome message to re-display following the upgrade.
-    globals.persistentToolState.redisplayWelcomeMessage = true;
+    globals.persistentToolState.setShouldRedisplayWelcomeMessage(true);
   }
 
   /// Source: [precacheArtifacts] in `upgrade.dart`
diff --git a/lib/elinux_device.dart b/lib/elinux_device.dart
index aeb1aa2..314f93b 100644
--- a/lib/elinux_device.dart
+++ b/lib/elinux_device.dart
@@ -164,8 +164,8 @@ class ELinuxDevice extends Device {
       final ProtocolDiscovery discovery = ProtocolDiscovery.observatory(
         _logReader,
         portForwarder: _config.usesPortForwarding ? portForwarder : null,
-        hostPort: null,
-        devicePort: null,
+        hostPort: debuggingOptions?.hostVmServicePort,
+        devicePort: debuggingOptions?.deviceVmServicePort,
         logger: _logger,
         ipv6: ipv6,
       );
diff --git a/lib/elinux_remote_devices_config.dart b/lib/elinux_remote_devices_config.dart
index 5dd89f8..4cf24de 100644
--- a/lib/elinux_remote_devices_config.dart
+++ b/lib/elinux_remote_devices_config.dart
@@ -77,7 +77,7 @@ class ELinuxRemoteDevicesConfig {
     for (final MapEntry<int, dynamic> entry in typedList.asMap().entries) {
       try {
         revived.add(ELinuxRemoteDeviceConfig.fromJson(entry.value));
-      } on ELinuxRemoteDeviceRevivalException catch (e) {
+      } on ELinuxRemoteDeviceRevivalException catch (_) {
         // TODO(hidenori): Corrensponds to the format difference
         // from the default schema and uncooment here.
         //
diff --git a/lib/executable.dart b/lib/executable.dart
index ce3595a..8761289 100644
--- a/lib/executable.dart
+++ b/lib/executable.dart
@@ -141,7 +141,6 @@ Future<void> main(List<String> args) async {
               stdio: globals.stdio,
               terminal: globals.terminal,
               outputPreferences: globals.outputPreferences,
-              stopwatchFactory: const StopwatchFactory(),
             )),
     },
   );