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

Merge "metricsd: Update weave command APIs"

Browse source
This commit is contained in:
Alex Vakulenko 2015-10-09 22:10:56 +00:00 • committed by Gerrit Code Review
commit a3ae129f22
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
metricsd/metrics_daemon.cc
View file

@ -326,7 +326,7 @@ void MetricsDaemon::OnShutdown(int* return_code) {
}
void MetricsDaemon::OnWeaveCommand(CommandProxy* command) {
if (command->category() != "metrics" || command->status() != "queued") {
if (command->state() != "queued") {
return;
}
@ -342,24 +342,26 @@ void MetricsDaemon::OnEnableMetrics(CommandProxy* command) {
if (base::WriteFile(metrics_directory_.Append(metrics::kConsentFileName),
"", 0) != 0) {
PLOG(ERROR) << "Could not create the consent file.";
command->Abort(nullptr);
command->Abort("metrics_error", "Could not create the consent file",
nullptr);
return;
}
NotifyStateChanged();
command->Done(nullptr);
command->Complete({}, nullptr);
}
void MetricsDaemon::OnDisableMetrics(CommandProxy* command) {
if (!base::DeleteFile(metrics_directory_.Append(metrics::kConsentFileName),
false)) {
PLOG(ERROR) << "Cound not delete the consent file.";
command->Abort(nullptr);
PLOG(ERROR) << "Could not delete the consent file.";
command->Abort("metrics_error", "Could not delete the consent file",
nullptr);
return;
}
NotifyStateChanged();
command->Done(nullptr);
command->Complete({}, nullptr);
}
void MetricsDaemon::NotifyStateChanged() {