ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix metricsd to conform to the lastest server schema"

Browse source 
am: 2fcf449886

* commit '2fcf449886a52d47a4b57279993e59b13d3be1cb':
  Fix metricsd to conform to the lastest server schema
This commit is contained in:
Alex Vakulenko 2015-12-16 20:59:44 +00:00 • committed by android-build-merger
commit 6170653ce5
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
metricsd/etc/weaved/traits/metrics.json
View file

@ -1,15 +1,17 @@
{
"_metrics": {
"commands": {
"_enableAnalyticsReporting": {
"minimalRole": "manager"
"enableAnalyticsReporting": {
"minimalRole": "manager",
"parameters": {}
},
"_disableAnalyticsReporting": {
"minimalRole": "manager"
"disableAnalyticsReporting": {
"minimalRole": "manager",
"parameters": {}
}
},
"state": {
"_AnalyticsReportingState": {
"analyticsReportingState": {
"type": "string",
"enum": [ "enabled", "disabled" ]
}

6
metricsd/metrics_collector.cc
View file

@ -229,11 +229,11 @@ int MetricsCollector::OnInit() {
device_->AddComponent(kWeaveComponent, {"_metrics"});
device_->AddCommandHandler(
kWeaveComponent,
"_metrics._enableAnalyticsReporting",
"_metrics.enableAnalyticsReporting",
base::Bind(&MetricsCollector::OnEnableMetrics, base::Unretained(this)));
device_->AddCommandHandler(
kWeaveComponent,
"_metrics._disableAnalyticsReporting",
"_metrics.disableAnalyticsReporting",
base::Bind(&MetricsCollector::OnDisableMetrics, base::Unretained(this)));
latest_cpu_use_microseconds_ = cpu_usage_collector_->GetCumulativeCpuUse();
@ -294,7 +294,7 @@ void MetricsCollector::UpdateWeaveState() {
metrics_lib_->AreMetricsEnabled() ? "enabled" : "disabled";
if (!device_->SetStateProperty(kWeaveComponent,
"_metrics._AnalyticsReportingState",
"_metrics.analyticsReportingState",
enabled,
nullptr)) {
LOG(ERROR) << "failed to update weave's state";