commit 2b68e6b41a78adcaa36805ec024700985d9ecde7
author Amin Hassani <ahassani@chromium.org> Fri Apr 17 10:49:12 2020 -0700
committer Commit Bot <commit-bot@chromium.org> Tue Apr 28 19:49:05 2020 +0000
tree d4ee8305c536ff4e9bb760a0899bbed4aeb1ae2b
parent 50504d6ab786972146fbc43ac433f7e4b301f66b

update_engine: Use GetDlcsToUpdate() instead of GetInstalled()

The meaning of GetInstalled() DBus in dlcservice have changed. So we need
to get the list of DLCs that ought to be updated from the new DBus
GetDlcsToUpdate().

Also rename all dlc_module_ids to dlc_ids.

BUG=chromium:1071654
TEST=cros_workon_make --board reef --test update_engine

Cq-Depend: chromium:2157669
Change-Id: I02e450a1fd75f8b387eb8a107c9c8a32f3e01e6e
Reviewed-on: https://chromium-review.googlesource.com/c/aosp/platform/system/update_engine/+/2163441
Tested-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Andrew Lassalle <andrewlassalle@chromium.org>
Reviewed-by: Jae Hoon Kim <kimjae@chromium.org>
Commit-Queue: Amin Hassani <ahassani@chromium.org>

dlcservice_chromeos.cc

diff --git a/dlcservice_chromeos.cc b/dlcservice_chromeos.cc
index 3c76b2a..08482ee 100644
--- a/dlcservice_chromeos.cc
+++ b/dlcservice_chromeos.cc
@@ -23,7 +23,6 @@
 
 #include "update_engine/dbus_connection.h"
 
-using dlcservice::DlcModuleList;
 using std::string;
 using std::vector;
 
@@ -39,25 +38,25 @@
   return std::make_unique<DlcServiceChromeOS>();
 }
 
-bool DlcServiceChromeOS::GetInstalled(vector<string>* dlc_module_ids) {
-  if (!dlc_module_ids)
+bool DlcServiceChromeOS::GetDlcsToUpdate(vector<string>* dlc_ids) {
+  if (!dlc_ids)
     return false;
-  dlc_module_ids->clear();
+  dlc_ids->clear();
 
-  dlcservice::DlcModuleList dlc_module_list;
-  if (!GetDlcServiceProxy().GetInstalled(&dlc_module_list, nullptr)) {
-    LOG(ERROR) << "dlcservice does not return installed DLC module list.";
+  brillo::ErrorPtr err;
+  if (!GetDlcServiceProxy().GetDlcsToUpdate(dlc_ids, &err)) {
+    LOG(ERROR) << "dlcservice failed to return DLCs that need to be updated. "
+               << "ErrorCode=" << err->GetCode()
+               << ", ErrMsg=" << err->GetMessage();
+    dlc_ids->clear();
     return false;
   }
-  for (const auto& dlc_module_info : dlc_module_list.dlc_module_infos()) {
-    dlc_module_ids->emplace_back(dlc_module_info.dlc_id());
-  }
   return true;
 }
 
-bool DlcServiceChromeOS::InstallCompleted(const std::vector<std::string>& ids) {
+bool DlcServiceChromeOS::InstallCompleted(const vector<string>& dlc_ids) {
   brillo::ErrorPtr err;
-  if (!GetDlcServiceProxy().InstallCompleted(ids, &err)) {
+  if (!GetDlcServiceProxy().InstallCompleted(dlc_ids, &err)) {
     LOG(ERROR) << "dlcservice failed to complete install. ErrCode="
                << err->GetCode() << ", ErrMsg=" << err->GetMessage();
     return false;
@@ -65,9 +64,9 @@
   return true;
 }
 
-bool DlcServiceChromeOS::UpdateCompleted(const std::vector<std::string>& ids) {
+bool DlcServiceChromeOS::UpdateCompleted(const vector<string>& dlc_ids) {
   brillo::ErrorPtr err;
-  if (!GetDlcServiceProxy().UpdateCompleted(ids, &err)) {
+  if (!GetDlcServiceProxy().UpdateCompleted(dlc_ids, &err)) {
     LOG(ERROR) << "dlcservice failed to complete updated. ErrCode="
                << err->GetCode() << ", ErrMsg=" << err->GetMessage();
     return false;