perfetto: make suspend aware clock the default for snapshots
As we've now tested this code extensively, we can safely make this the
default behaviour in Android T+
Change-Id: Iee725eb191f66777080f42b189cd102a912da56c
diff --git a/protos/perfetto/config/perfetto_config.proto b/protos/perfetto/config/perfetto_config.proto
index c173c1c..0bd01d4 100644
--- a/protos/perfetto/config/perfetto_config.proto
+++ b/protos/perfetto/config/perfetto_config.proto
@@ -1579,9 +1579,9 @@
// falls back to the best-available alternative.
//
// Introduced in Android S.
- // TODO(lalitm): deprecate this in T and make this the default if nothing
- // crashes in S.
- optional bool prefer_suspend_clock_for_snapshot = 7;
+ // Deprecated and has no effect in Android T+ as using a suspend aware
+ // clock is the default behaviour.
+ optional bool prefer_suspend_clock_for_snapshot = 7 [deprecated = true];
}
optional BuiltinDataSource builtin_data_sources = 20;
diff --git a/protos/perfetto/config/trace_config.proto b/protos/perfetto/config/trace_config.proto
index dbc1bab..5cb450d 100644
--- a/protos/perfetto/config/trace_config.proto
+++ b/protos/perfetto/config/trace_config.proto
@@ -115,9 +115,9 @@
// falls back to the best-available alternative.
//
// Introduced in Android S.
- // TODO(lalitm): deprecate this in T and make this the default if nothing
- // crashes in S.
- optional bool prefer_suspend_clock_for_snapshot = 7;
+ // Deprecated and has no effect in Android T+ as using a suspend aware
+ // clock is the default behaviour.
+ optional bool prefer_suspend_clock_for_snapshot = 7 [deprecated = true];
}
optional BuiltinDataSource builtin_data_sources = 20;
diff --git a/protos/perfetto/trace/perfetto_trace.proto b/protos/perfetto/trace/perfetto_trace.proto
index ba8c9a7..b6aeec0 100644
--- a/protos/perfetto/trace/perfetto_trace.proto
+++ b/protos/perfetto/trace/perfetto_trace.proto
@@ -1579,9 +1579,9 @@
// falls back to the best-available alternative.
//
// Introduced in Android S.
- // TODO(lalitm): deprecate this in T and make this the default if nothing
- // crashes in S.
- optional bool prefer_suspend_clock_for_snapshot = 7;
+ // Deprecated and has no effect in Android T+ as using a suspend aware
+ // clock is the default behaviour.
+ optional bool prefer_suspend_clock_for_snapshot = 7 [deprecated = true];
}
optional BuiltinDataSource builtin_data_sources = 20;
diff --git a/src/tracing/core/tracing_service_impl.cc b/src/tracing/core/tracing_service_impl.cc
index 32f7461..dcfdb22 100644
--- a/src/tracing/core/tracing_service_impl.cc
+++ b/src/tracing/core/tracing_service_impl.cc
@@ -1106,9 +1106,7 @@
// events.
base::PeriodicTask::Args snapshot_task_args;
snapshot_task_args.start_first_task_immediately = true;
- snapshot_task_args.use_suspend_aware_timer =
- tracing_session->config.builtin_data_sources()
- .prefer_suspend_clock_for_snapshot();
+ snapshot_task_args.use_suspend_aware_timer = true;
snapshot_task_args.task = [weak_this, tsid] {
if (weak_this)
weak_this->PeriodicSnapshotTask(tsid);
