commit b65e80e534c8e0ca1f2008960ae435594a608e32
author Bertrand Simonnet <bsimonnet@google.com> Fri Jan 22 22:24:35 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 22 22:24:35 2016 +0000
tree c77ad0fbd364f0f5963934e36f59b6991b893fa5
parent 4ac60013d453b534517b829848893571639ebd2c
parent 8f8ce0c3002430bfbbbc95eb3c2a97efa1ac8e36

Merge "metricsd: Add more assert clause."
am: 8f8ce0c300

* commit '8f8ce0c3002430bfbbbc95eb3c2a97efa1ac8e36':
  metricsd: Add more assert clause.

metricsd/uploader/metrics_log.cc

diff --git a/metricsd/uploader/metrics_log.cc b/metricsd/uploader/metrics_log.cc
index 39655e6..fcaa8c1 100644
--- a/metricsd/uploader/metrics_log.cc
+++ b/metricsd/uploader/metrics_log.cc
@@ -85,5 +85,6 @@
 }
 
 bool MetricsLog::PopulateSystemProfile(SystemProfileSetter* profile_setter) {
+  CHECK(profile_setter);
   return profile_setter->Populate(uma_proto());
 }

metricsd/uploader/system_profile_cache.cc

diff --git a/metricsd/uploader/system_profile_cache.cc b/metricsd/uploader/system_profile_cache.cc
index 70f6afd..e6f6617 100644
--- a/metricsd/uploader/system_profile_cache.cc
+++ b/metricsd/uploader/system_profile_cache.cc
@@ -80,6 +80,10 @@
   } else {
     reader.Load();
     auto client = update_engine::UpdateEngineClient::CreateInstance();
+    if (!client) {
+      LOG(ERROR) << "failed to create the update engine client";
+      return false;
+    }
     if (!client->GetChannel(&channel)) {
       LOG(ERROR) << "failed to read the current channel from update engine.";
       return false;