Shut down FaultManager after shutting down threads.
Bug: 17703163
Change-Id: I7a8454b61e887376d019af601f3a416d18bc0760
diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index adf0994..d962eb5 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -170,9 +170,6 @@
BackgroundMethodSamplingProfiler::Shutdown();
}
- // Shutdown the fault manager if it was initialized.
- fault_manager.Shutdown();
-
Trace::Shutdown();
// Make sure to let the GC complete if it is running.
@@ -185,6 +182,10 @@
// Make sure all other non-daemon threads have terminated, and all daemon threads are suspended.
delete thread_list_;
+
+ // Shutdown the fault manager if it was initialized.
+ fault_manager.Shutdown();
+
delete monitor_list_;
delete monitor_pool_;
delete class_linker_;