Service isolate rework take 2

runtime/vm/debugger.cc

Index: runtime/vm/debugger.cc
diff --git a/runtime/vm/debugger.cc b/runtime/vm/debugger.cc
index c75ac2c6e558c574ac023e49b499e9192e63fc6f..9e0f9d8e4672dbd7cc44e52d5d936403764962d6 100644
--- a/runtime/vm/debugger.cc
+++ b/runtime/vm/debugger.cc
@@ -1066,7 +1066,9 @@ void Debugger::Shutdown() {
     delete bpt;
   }
   // Signal isolate shutdown event.
-  SignalIsolateEvent(DebuggerEvent::kIsolateShutdown);
+  if (!Service::IsServiceIsolate(isolate_)) {
+    SignalIsolateEvent(DebuggerEvent::kIsolateShutdown);
+  }
 }
 
 
@@ -2253,8 +2255,9 @@ void Debugger::Initialize(Isolate* isolate) {
     return;
   }
   isolate_ = isolate;
+
   // Use the isolate's control port as the isolate_id for debugging.
-  // This port will be used as a unique ID to represet the isolate in the
+  // This port will be used as a unique ID to represent the isolate in the
   // debugger wire protocol messages.
   isolate_id_ = isolate->main_port();
   initialized_ = true;
@@ -2263,7 +2266,9 @@ void Debugger::Initialize(Isolate* isolate) {
 
 void Debugger::NotifyIsolateCreated() {
   // Signal isolate creation event.
-  SignalIsolateEvent(DebuggerEvent::kIsolateCreated);
+  if (!Service::IsServiceIsolate(isolate_)) {
+    SignalIsolateEvent(DebuggerEvent::kIsolateCreated);
+  }
 }