github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a crash in remote device daemon. (#144358)

Browse Source 
The daemon server is expecting the client to pass `deviceId` in `device.shutdownDartDevelopmentService` method.

24a792dae1/packages/flutter_tools/lib/src/commands/daemon.dart (L1239)
This commit is contained in:
Lau Ching Jun 2024-02-29 14:29:08 -08:00 committed by GitHub
parent b099bf0b4c
commit cfa011dd9d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/flutter_tools/lib/src/proxied_devices/devices.dart
View File

@ -810,7 +810,9 @@ class ProxiedDartDevelopmentService implements DartDevelopmentService {
await _localDds.shutdown(); await _localDds.shutdown();
_ddsStartedLocally = false; _ddsStartedLocally = false;
} else { } else {
await connection.sendRequest('device.shutdownDartDevelopmentService'); await connection.sendRequest('device.shutdownDartDevelopmentService', <String, Object?>{
'deviceId': deviceId,
});
} }
} }

3
packages/flutter_tools/test/general.shard/proxied_devices/proxied_devices_test.dart
View File

@ -615,6 +615,9 @@ void main() {
final DaemonMessage shutdownMessage = await broadcastOutput.first; final DaemonMessage shutdownMessage = await broadcastOutput.first;
expect(shutdownMessage.data['id'], isNotNull); expect(shutdownMessage.data['id'], isNotNull);
expect(shutdownMessage.data['method'], 'device.shutdownDartDevelopmentService'); expect(shutdownMessage.data['method'], 'device.shutdownDartDevelopmentService');
expect(shutdownMessage.data['params'], <String, Object?>{
'deviceId': 'test_id',
});
}); });
testWithoutContext('starts a local dds if the VM service port is not a forwarded port', () async { testWithoutContext('starts a local dds if the VM service port is not a forwarded port', () async {