From 29a7a1fe3595c2e9ef01f7ad7d05fa795169ed67 Mon Sep 17 00:00:00 2001
From: Elliott Brooks <21270878+elliette@users.noreply.github.com>
Date: Mon, 14 Apr 2025 13:43:46 -0700
Subject: [PATCH 1/2] Prevent web apps from freezing after hot-restarts
 triggered from DevTools (#9125)

---
 .../lib/src/screens/debugger/breakpoint_manager.dart          | 4 ++++
 packages/devtools_app/release_notes/NEXT_RELEASE_NOTES.md     | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/packages/devtools_app/lib/src/screens/debugger/breakpoint_manager.dart b/packages/devtools_app/lib/src/screens/debugger/breakpoint_manager.dart
index a18c39d24b2..89e887d99b6 100644
--- a/packages/devtools_app/lib/src/screens/debugger/breakpoint_manager.dart
+++ b/packages/devtools_app/lib/src/screens/debugger/breakpoint_manager.dart
@@ -93,6 +93,10 @@ class BreakpointManager with DisposerMixin {
     if ([
       EventKind.kPauseStart,
       EventKind.kPausePostRequest,
+      // We check for a resume event because package:dwds sends a resume event
+      // after a hot-restart. See:
+      // https://github.com/dart-lang/webdev/issues/2610
+      EventKind.kResume,
     ].contains(pauseEventKind)) {
       await serviceConnection.serviceManager.isolateManager.resumeIsolate(
         isolateRef,
diff --git a/packages/devtools_app/release_notes/NEXT_RELEASE_NOTES.md b/packages/devtools_app/release_notes/NEXT_RELEASE_NOTES.md
index a3a082feca1..068651f1442 100644
--- a/packages/devtools_app/release_notes/NEXT_RELEASE_NOTES.md
+++ b/packages/devtools_app/release_notes/NEXT_RELEASE_NOTES.md
@@ -15,6 +15,9 @@ To learn more about DevTools, check out the
 
 ## General updates
 
+* Prevent web apps from remaining paused after triggering a hot-restart from
+DevTools. - [#9125](https://github.com/flutter/devtools/pull/9125)
+
 * Added a memory pressure warning that allows you to reduce the memory usage of
 DevTools in order to avoid an OOM crash. -
 [#8989](https://github.com/flutter/devtools/pull/8989),

From 74b3c517ed8e6f52c3e0b84a066e3f3a623b7be9 Mon Sep 17 00:00:00 2001
From: Elliott Brooks <21270878+elliette@users.noreply.github.com>
Date: Tue, 15 Apr 2025 12:11:52 -0700
Subject: [PATCH 2/2] Prepare cherry-pick release - DevTools 2.45.1

---
 packages/devtools_app/lib/devtools.dart | 2 +-
 packages/devtools_app/pubspec.yaml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/devtools_app/lib/devtools.dart b/packages/devtools_app/lib/devtools.dart
index c7af9fef9f8..1dc65bbd620 100644
--- a/packages/devtools_app/lib/devtools.dart
+++ b/packages/devtools_app/lib/devtools.dart
@@ -10,4 +10,4 @@
 /// Note: a regexp in the `dt update-version' command logic matches the constant
 /// declaration `const version =`. If you change the declaration you must also
 /// modify the regex in the `dt update-version' command logic.
-const version = '2.45.0';
+const version = '2.45.1';
diff --git a/packages/devtools_app/pubspec.yaml b/packages/devtools_app/pubspec.yaml
index 25d97473b88..2b05b720371 100644
--- a/packages/devtools_app/pubspec.yaml
+++ b/packages/devtools_app/pubspec.yaml
@@ -7,7 +7,7 @@ publish_to: none
 
 # Note: this version should only be updated by running the 'dt update-version'
 # command that updates the version here and in 'devtools.dart'.
-version: 2.45.0
+version: 2.45.1
 
 repository: https://github.com/flutter/devtools/tree/master/packages/devtools_app