update_engine: Deprecate GetStatus DBus and StatusUpdate Signal
Nobody uses these anymore.
BUG=chromium:977320
TEST=sudo FEATURES=test emerge update_engine-client update_engine
Cq-Depend: chrome-internal:2099079
Change-Id: Ie7b31d95346fbf6d391d805db1b808a518bd2bda
Reviewed-on: https://chromium-review.googlesource.com/c/aosp/platform/system/update_engine/+/1891572
Tested-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Jae Hoon Kim <kimjae@chromium.org>
diff --git a/UpdateEngine.conf b/UpdateEngine.conf
index e01c673..ab776e3 100644
--- a/UpdateEngine.conf
+++ b/UpdateEngine.conf
@@ -41,9 +41,6 @@
send_member="ResetStatus"/>
<allow send_destination="org.chromium.UpdateEngine"
send_interface="org.chromium.UpdateEngineInterface"
- send_member="GetStatus"/>
- <allow send_destination="org.chromium.UpdateEngine"
- send_interface="org.chromium.UpdateEngineInterface"
send_member="GetStatusAdvanced"/>
<allow send_destination="org.chromium.UpdateEngine"
send_interface="org.chromium.UpdateEngineInterface"
@@ -89,9 +86,6 @@
<policy user="power">
<allow send_destination="org.chromium.UpdateEngine"
send_interface="org.chromium.UpdateEngineInterface"
- send_member="GetStatus"/>
- <allow send_destination="org.chromium.UpdateEngine"
- send_interface="org.chromium.UpdateEngineInterface"
send_member="GetStatusAdvanced"/>
</policy>
<policy user="dlcservice">
diff --git a/client_library/client_dbus.cc b/client_library/client_dbus.cc
index 3497ce0..18b155b 100644
--- a/client_library/client_dbus.cc
+++ b/client_library/client_dbus.cc
@@ -98,24 +98,6 @@
nullptr /* brillo::ErrorPtr* */);
}
-bool DBusUpdateEngineClient::GetStatus(int64_t* out_last_checked_time,
- double* out_progress,
- UpdateStatus* out_update_status,
- string* out_new_version,
- int64_t* out_new_size) const {
- StatusResult status;
- if (!proxy_->GetStatusAdvanced(&status, nullptr)) {
- return false;
- }
-
- *out_last_checked_time = status.last_checked_time();
- *out_progress = status.progress();
- *out_new_version = status.new_version();
- *out_new_size = status.new_size();
- *out_update_status = static_cast<UpdateStatus>(status.current_operation());
- return true;
-}
-
bool DBusUpdateEngineClient::GetStatus(UpdateEngineStatus* out_status) const {
StatusResult status;
if (!proxy_->GetStatusAdvanced(&status, nullptr)) {
diff --git a/client_library/client_dbus.h b/client_library/client_dbus.h
index e964399..6d7784a 100644
--- a/client_library/client_dbus.h
+++ b/client_library/client_dbus.h
@@ -46,12 +46,6 @@
bool AttemptInstall(const std::string& omaha_url,
const std::vector<std::string>& dlc_module_ids) override;
- bool GetStatus(int64_t* out_last_checked_time,
- double* out_progress,
- UpdateStatus* out_update_status,
- std::string* out_new_version,
- int64_t* out_new_size) const override;
-
bool GetStatus(UpdateEngineStatus* out_status) const override;
bool SetCohortHint(const std::string& cohort_hint) override;
diff --git a/client_library/include/update_engine/client.h b/client_library/include/update_engine/client.h
index 1a0461c..d13359b 100644
--- a/client_library/include/update_engine/client.h
+++ b/client_library/include/update_engine/client.h
@@ -60,26 +60,6 @@
const std::string& omaha_url,
const std::vector<std::string>& dlc_module_ids) = 0;
- // Returns the current status of the Update Engine.
- //
- // |out_last_checked_time|
- // the last time the update engine checked for an update in seconds since
- // the epoc.
- // |out_progress|
- // when downloading an update, this is calculated as
- // (number of bytes received) / (total bytes).
- // |out_update_status|
- // See update_status.h.
- // |out_new_version|
- // string version of the new system image.
- // |out_new_size|
- // number of bytes in the new system image.
- virtual bool GetStatus(int64_t* out_last_checked_time,
- double* out_progress,
- UpdateStatus* out_update_status,
- std::string* out_new_version,
- int64_t* out_new_size) const = 0;
-
// Same as above but return the entire struct instead.
virtual bool GetStatus(UpdateEngineStatus* out_status) const = 0;
diff --git a/dbus_bindings/org.chromium.UpdateEngineInterface.dbus-xml b/dbus_bindings/org.chromium.UpdateEngineInterface.dbus-xml
index b9e0a47..afa34d7 100644
--- a/dbus_bindings/org.chromium.UpdateEngineInterface.dbus-xml
+++ b/dbus_bindings/org.chromium.UpdateEngineInterface.dbus-xml
@@ -51,14 +51,6 @@
</method>
<method name="ResetStatus">
</method>
- <method name="GetStatus">
- <!-- TODO(crbug.com/977320): Deprecate this method. -->
- <arg type="x" name="last_checked_time" direction="out" />
- <arg type="d" name="progress" direction="out" />
- <arg type="s" name="current_operation" direction="out" />
- <arg type="s" name="new_version" direction="out" />
- <arg type="x" name="new_size" direction="out" />
- </method>
<method name="GetStatusAdvanced">
<arg type="ay" name="status" direction="out">
<tp:docstring>
@@ -111,14 +103,6 @@
<method name="GetDurationSinceUpdate">
<arg type="x" name="usec_wallclock" direction="out" />
</method>
- <signal name="StatusUpdate">
- <!-- TODO(crbug.com/977320): Deprecate this method. -->
- <arg type="x" name="last_checked_time" />
- <arg type="d" name="progress" />
- <arg type="s" name="current_operation" />
- <arg type="s" name="new_version" />
- <arg type="x" name="new_size" />
- </signal>
<signal name="StatusUpdateAdvanced">
<arg type="ay" name="status" direction="out">
<tp:docstring>
diff --git a/dbus_service.cc b/dbus_service.cc
index 72e11eb..b1cc298 100644
--- a/dbus_service.cc
+++ b/dbus_service.cc
@@ -110,24 +110,6 @@
return common_->ResetStatus(error);
}
-bool DBusUpdateEngineService::GetStatus(ErrorPtr* error,
- int64_t* out_last_checked_time,
- double* out_progress,
- string* out_current_operation,
- string* out_new_version,
- int64_t* out_new_size) {
- UpdateEngineStatus status;
- if (!common_->GetStatus(error, &status)) {
- return false;
- }
- *out_last_checked_time = status.last_checked_time;
- *out_progress = status.progress;
- *out_current_operation = UpdateStatusToString(status.status);
- *out_new_version = status.new_version;
- *out_new_size = status.new_size_bytes;
- return true;
-}
-
bool DBusUpdateEngineService::GetStatusAdvanced(ErrorPtr* error,
StatusResult* out_status) {
UpdateEngineStatus status;
@@ -237,14 +219,6 @@
StatusResult status;
ConvertToStatusResult(update_engine_status, &status);
- // TODO(crbug.com/977320): Deprecate |StatusUpdate| signal.
- SendStatusUpdateSignal(status.last_checked_time(),
- status.progress(),
- UpdateStatusToString(static_cast<UpdateStatus>(
- status.current_operation())),
- status.new_version(),
- status.new_size());
-
// Send |StatusUpdateAdvanced| signal.
SendStatusUpdateAdvancedSignal(status);
}
diff --git a/dbus_service.h b/dbus_service.h
index 4ea1a53..28ba268 100644
--- a/dbus_service.h
+++ b/dbus_service.h
@@ -64,16 +64,6 @@
// update. This is used for development only.
bool ResetStatus(brillo::ErrorPtr* error) override;
- // Returns the current status of the Update Engine. If an update is in
- // progress, the number of operations, size to download and overall progress
- // is reported.
- bool GetStatus(brillo::ErrorPtr* error,
- int64_t* out_last_checked_time,
- double* out_progress,
- std::string* out_current_operation,
- std::string* out_new_version,
- int64_t* out_new_size) override;
-
// Similar to Above, but returns a protobuffer instead. In the future it will
// have more features and is easily extendable.
bool GetStatusAdvanced(brillo::ErrorPtr* error,