openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "metricsd: Split out the trait name from the command name" 

am: c480b8e6dd

* commit 'c480b8e6dd8a18566b391a9893436311452027c1':
  metricsd: Split out the trait name from the command name
This commit is contained in:
Alex Vakulenko 2016-01-08 22:05:25 +00:00 committed by android-build-merger
parent c83a5aefd6 c480b8e6dd
commit 6d2c274520
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
metricsd/metrics_collector.cc
View File

@ -71,6 +71,7 @@ const char kMeminfoFileName[] = "/proc/meminfo";
const char kVmStatFileName[] = "/proc/vmstat";
const char kWeaveComponent[] = "metrics";
const char kWeaveTrait[] = "_metrics";
} // namespace
@ -259,15 +260,13 @@ void MetricsCollector::OnWeaveServiceConnected(
if (!weave_service)
return;
weave_service->AddComponent(kWeaveComponent, {"_metrics"}, nullptr);
weave_service->AddComponent(kWeaveComponent, {kWeaveTrait}, nullptr);
weave_service->AddCommandHandler(
kWeaveComponent,
"_metrics.enableAnalyticsReporting",
kWeaveComponent, kWeaveTrait, "enableAnalyticsReporting",
base::Bind(&MetricsCollector::OnEnableMetrics,
weak_ptr_factory_.GetWeakPtr()));
weave_service->AddCommandHandler(
kWeaveComponent,
"_metrics.disableAnalyticsReporting",
kWeaveComponent, kWeaveTrait, "disableAnalyticsReporting",
base::Bind(&MetricsCollector::OnDisableMetrics,
weak_ptr_factory_.GetWeakPtr()));
@ -311,9 +310,8 @@ void MetricsCollector::UpdateWeaveState() {
std::string enabled =
metrics_lib_->AreMetricsEnabled() ? "enabled" : "disabled";
if (!weave_service->SetStateProperty(kWeaveComponent,
"_metrics.analyticsReportingState",
enabled,
if (!weave_service->SetStateProperty(kWeaveComponent, kWeaveTrait,
"analyticsReportingState", enabled,
nullptr)) {
LOG(ERROR) << "failed to update weave's state";
}