am c7c6d18a: Stop thread from reattaching during runtime shutdown while tracing.

* commit 'c7c6d18a90079b67a7592d3f2cb3d4c6f0081512':
  Stop thread from reattaching during runtime shutdown while tracing.

diff --cc runtime/runtime.cc
Simple merge

diff --cc runtime/trace.cc
index f51b8c4,0f5e06a..ca5e150
--- 1/runtime/trace.cc
--- 2/runtime/trace.cc
+++ b/runtime/trace.cc
@@@ -174,15 -175,15 +174,15 @@@ bool Trace::UseThreadCpuClock() 
  }
  
  bool Trace::UseWallClock() {
 -  return (clock_source_ == kProfilerClockSourceWall) ||
 -      (clock_source_ == kProfilerClockSourceDual);
 +  return (clock_source_ == kTraceClockSourceWall) ||
 +      (clock_source_ == kTraceClockSourceDual);
  }
  
- static void MeasureClockOverhead(Trace* trace) {
-   if (trace->UseThreadCpuClock()) {
+ void Trace::MeasureClockOverhead() {
+   if (UseThreadCpuClock()) {
      Thread::Current()->GetCpuMicroTime();
    }
-   if (trace->UseWallClock()) {
+   if (UseWallClock()) {
      MicroTime();
    }
  }

diff --cc runtime/trace.h
Simple merge