diff --git a/dev/tools/pubspec.yaml b/dev/tools/pubspec.yaml index 06e2ce0fa6..ad4b2044c4 100644 --- a/dev/tools/pubspec.yaml +++ b/dev/tools/pubspec.yaml @@ -31,7 +31,7 @@ dependencies: coverage: 0.14.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" crypto: 2.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" csslib: 0.16.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - dds: 1.7.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + dds: 1.7.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" devtools: 0.9.5+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" devtools_server: 0.9.5+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" devtools_shared: 0.9.5+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -96,4 +96,4 @@ dev_dependencies: node_preamble: 1.4.12 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" -# PUBSPEC CHECKSUM: e6e5 +# PUBSPEC CHECKSUM: f0e6 diff --git a/packages/flutter_tools/lib/src/commands/update_packages.dart b/packages/flutter_tools/lib/src/commands/update_packages.dart index 9bc47bb31c..7f1060bb7f 100644 --- a/packages/flutter_tools/lib/src/commands/update_packages.dart +++ b/packages/flutter_tools/lib/src/commands/update_packages.dart @@ -66,6 +66,7 @@ const Map _kManuallyPinnedDependencies = { 'url_launcher': '6.0.0-nullsafety.1', 'connectivity': '3.0.0-nullsafety.1', 'device_info': '2.0.0-nullsafety.1', + 'camera': '0.6.4+5', }; class UpdatePackagesCommand extends FlutterCommand { diff --git a/packages/flutter_tools/lib/src/vmservice.dart b/packages/flutter_tools/lib/src/vmservice.dart index ef5e4aafbb..b8b35dbdc3 100644 --- a/packages/flutter_tools/lib/src/vmservice.dart +++ b/packages/flutter_tools/lib/src/vmservice.dart @@ -34,7 +34,8 @@ typedef PrintStructuredErrorLogMethod = void Function(vm_service.Event); WebSocketConnector _openChannel = _defaultOpenChannel; -/// The error codes for the JSON-RPC standard. +/// The error codes for the JSON-RPC standard, including VM service specific +/// error codes. /// /// See also: https://www.jsonrpc.org/specification#error_object abstract class RPCErrorCodes { @@ -49,6 +50,11 @@ abstract class RPCErrorCodes { /// Application specific error codes. static const int kServerError = -32000; + + /// Non-standard JSON-RPC error codes: + + /// The VM service or extension service has disappeared. + static const int kServiceDisappeared = 112; } /// A function that reacts to the invocation of the 'reloadSources' service. @@ -718,8 +724,10 @@ extension FlutterVmService on vm_service.VmService { ); return response.json; } on vm_service.RPCError catch (err) { - // If an application is not using the framework - if (err.code == RPCErrorCodes.kMethodNotFound) { + // If an application is not using the framework or the VM service + // disappears while handling a request, return null. + if ((err.code == RPCErrorCodes.kMethodNotFound) + || (err.code == RPCErrorCodes.kServiceDisappeared)) { return null; } rethrow; diff --git a/packages/flutter_tools/pubspec.yaml b/packages/flutter_tools/pubspec.yaml index 47d3f0aea6..65ecc98d3b 100644 --- a/packages/flutter_tools/pubspec.yaml +++ b/packages/flutter_tools/pubspec.yaml @@ -10,7 +10,7 @@ dependencies: # To update these, use "flutter update-packages --force-upgrade". archive: 2.0.13 args: 1.6.0 - dds: 1.7.2 + dds: 1.7.3 dwds: 7.1.1 completion: 0.2.3 coverage: 0.14.2 @@ -110,4 +110,4 @@ dartdoc: # Exclude this package from the hosted API docs. nodoc: true -# PUBSPEC CHECKSUM: c7c3 +# PUBSPEC CHECKSUM: 4cc4