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>
diff --git a/dlcservice_chromeos.h b/dlcservice_chromeos.h
index b56b495..8828e1a 100644
--- a/dlcservice_chromeos.h
+++ b/dlcservice_chromeos.h
@@ -34,17 +34,17 @@
// DlcServiceInterface overrides.
- // Will clear the |dlc_module_ids|, passed to be modified. Clearing by
- // default has the added benefit of avoiding indeterminate behavior in the
- // case that |dlc_module_ids| wasn't empty to begin which would lead to
- // possible duplicates and cases when error was not checked it's still safe.
- bool GetInstalled(std::vector<std::string>* dlc_module_ids) override;
+ // Will clear the |dlc_ids|, passed to be modified. Clearing by default has
+ // the added benefit of avoiding indeterminate behavior in the case that
+ // |dlc_ids| wasn't empty to begin which would lead to possible duplicates and
+ // cases when error was not checked it's still safe.
+ bool GetDlcsToUpdate(std::vector<std::string>* dlc_ids) override;
// Call into dlcservice for it to mark the DLC IDs as being installed.
- bool InstallCompleted(const std::vector<std::string>& ids) override;
+ bool InstallCompleted(const std::vector<std::string>& dlc_ids) override;
// Call into dlcservice for it to mark the DLC IDs as being updated.
- bool UpdateCompleted(const std::vector<std::string>& ids) override;
+ bool UpdateCompleted(const std::vector<std::string>& dlc_ids) override;
private:
DISALLOW_COPY_AND_ASSIGN(DlcServiceChromeOS);