From d29cd9beb67e4701b8659e520f88a6bf44a492de Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Tue, 20 Oct 2020 16:01:51 -0700
Subject: [PATCH] Clean up device logger and port forwarding on drive
 completion (#68655)

---
 packages/flutter_tools/lib/src/commands/drive.dart             | 2 ++
 .../flutter_tools/test/commands.shard/hermetic/drive_test.dart | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/packages/flutter_tools/lib/src/commands/drive.dart b/packages/flutter_tools/lib/src/commands/drive.dart
index dacbd0212dc..d966bacd354 100644
--- a/packages/flutter_tools/lib/src/commands/drive.dart
+++ b/packages/flutter_tools/lib/src/commands/drive.dart
@@ -386,6 +386,8 @@ $ex
         globals.printStatus('Stopping application instance.');
         await appStopper(this, package);
       }
+
+      await device?.dispose();
     }
 
     return FlutterCommandResult.success();
diff --git a/packages/flutter_tools/test/commands.shard/hermetic/drive_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/drive_test.dart
index 3e1ff4ea2df..9538adab9ad 100644
--- a/packages/flutter_tools/test/commands.shard/hermetic/drive_test.dart
+++ b/packages/flutter_tools/test/commands.shard/hermetic/drive_test.dart
@@ -228,6 +228,7 @@ void main() {
         '10',
       ];
       await createTestCommandRunner(command).run(args);
+      verify(mockDevice.dispose());
       expect(testLogger.errorText, isEmpty);
     }, overrides: <Type, Generator>{
       FileSystem: () => fs,
@@ -529,6 +530,7 @@ void main() {
                 prebuiltApplication: false,
                 userIdentifier: anyNamed('userIdentifier'),
         ));
+        verify(mockDevice.dispose());
       }, overrides: <Type, Generator>{
         FileSystem: () => fs,
         ProcessManager: () => FakeProcessManager.any(),
@@ -558,6 +560,7 @@ void main() {
                 prebuiltApplication: false,
                 userIdentifier: anyNamed('userIdentifier'),
         ));
+        verify(mockDevice.dispose());
       }, overrides: <Type, Generator>{
         FileSystem: () => fs,
         ProcessManager: () => FakeProcessManager.any(),