diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-14 01:05:18 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-14 01:05:18 +0000 |
| commit | fd4107c0904c599e6203e68769401c0f888bb08f (patch) | |
| tree | 466347da5360298f3c41d1d86c07c6ef371f4fd2 | |
| parent | 44d4fdc3e9b303db56b5d0781267014ec44319bb (diff) | |
| parent | 8fb0f52466ab5d3b1ef1589311e91fbba8e60a81 (diff) | |
| download | iorap-fd4107c0904c599e6203e68769401c0f888bb08f.tar.gz | |
Snap for 6492800 from 8fb0f52466ab5d3b1ef1589311e91fbba8e60a81 to rvc-release
Change-Id: I8dae2e8f4aa5b167f6f80245e87233d6b054e3a2
| -rw-r--r-- | src/manager/event_manager.cc | 2 | ||||
| -rw-r--r-- | src/perfetto/rx_producer.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/manager/event_manager.cc b/src/manager/event_manager.cc index 582fcf4..1618af8 100644 --- a/src/manager/event_manager.cc +++ b/src/manager/event_manager.cc @@ -302,7 +302,7 @@ struct AppLaunchEventState { AbortTrace(); AbortReadAhead(); - } else if (!IsTracing() || !IsReadAhead()) { // and the temperature is Cold. + } else if (!IsTracing() && !IsReadAhead()) { // and the temperature is Cold. // Start late trace when intent didn't have a component name LOG(VERBOSE) << "AppLaunchEventState#OnNewEvent need to start new trace"; diff --git a/src/perfetto/rx_producer.cc b/src/perfetto/rx_producer.cc index 64aec8d..824600c 100644 --- a/src/perfetto/rx_producer.cc +++ b/src/perfetto/rx_producer.cc @@ -83,7 +83,7 @@ PerfettoDependencies::Component PerfettoDependencies::CreateComponent() { .bind<PerfettoConsumer, PerfettoConsumerImpl>() .registerProvider([]() /* -> TraceConfig */ { return CreateConfig(kTraceDurationMs, - /*deferred_start*/true, + /*deferred_start*/false, kBufferSize); }); } |