summaryrefslogtreecommitdiffstats
path: root/chromeos
diff options
context:
space:
mode:
authormerkulova@chromium.org <merkulova@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-03 13:24:37 +0000
committermerkulova@chromium.org <merkulova@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-03 13:24:37 +0000
commitda15e07a5ed02786174cbe6e209008307f12ac90 (patch)
treec8df1b1f40dfb956599056b8955a06cd42c7e780 /chromeos
parent6245357b39d3cf766f234cdeafeaa7b0b3656708 (diff)
downloadchromium_src-da15e07a5ed02786174cbe6e209008307f12ac90.zip
chromium_src-da15e07a5ed02786174cbe6e209008307f12ac90.tar.gz
chromium_src-da15e07a5ed02786174cbe6e209008307f12ac90.tar.bz2
Added processing for a lost status to UpdateEngineClient.
BUG=378865 Review URL: https://codereview.chromium.org/309533006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274504 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos')
-rw-r--r--chromeos/dbus/update_engine_client.cc3
-rw-r--r--chromeos/dbus/update_engine_client.h3
2 files changed, 5 insertions, 1 deletions
diff --git a/chromeos/dbus/update_engine_client.cc b/chromeos/dbus/update_engine_client.cc
index e9f68f8..309adc3 100644
--- a/chromeos/dbus/update_engine_client.cc
+++ b/chromeos/dbus/update_engine_client.cc
@@ -54,6 +54,8 @@ UpdateEngineClient::UpdateStatusOperation UpdateStatusFromString(
return UpdateEngineClient::UPDATE_STATUS_UPDATED_NEED_REBOOT;
if (str == update_engine::kUpdateStatusReportingErrorEvent)
return UpdateEngineClient::UPDATE_STATUS_REPORTING_ERROR_EVENT;
+ if (str == update_engine::kUpdateStatusAttemptingRollback)
+ return UpdateEngineClient::UPDATE_STATUS_ATTEMPTING_ROLLBACK;
return UpdateEngineClient::UPDATE_STATUS_ERROR;
}
@@ -478,6 +480,7 @@ class UpdateEngineClientFakeImpl : public UpdateEngineClientStubImpl {
case UPDATE_STATUS_IDLE:
case UPDATE_STATUS_UPDATED_NEED_REBOOT:
case UPDATE_STATUS_REPORTING_ERROR_EVENT:
+ case UPDATE_STATUS_ATTEMPTING_ROLLBACK:
return;
case UPDATE_STATUS_CHECKING_FOR_UPDATE:
next_status = UPDATE_STATUS_UPDATE_AVAILABLE;
diff --git a/chromeos/dbus/update_engine_client.h b/chromeos/dbus/update_engine_client.h
index 31af616..eddd912 100644
--- a/chromeos/dbus/update_engine_client.h
+++ b/chromeos/dbus/update_engine_client.h
@@ -34,7 +34,8 @@ class CHROMEOS_EXPORT UpdateEngineClient : public DBusClient {
UPDATE_STATUS_VERIFYING,
UPDATE_STATUS_FINALIZING,
UPDATE_STATUS_UPDATED_NEED_REBOOT,
- UPDATE_STATUS_REPORTING_ERROR_EVENT
+ UPDATE_STATUS_REPORTING_ERROR_EVENT,
+ UPDATE_STATUS_ATTEMPTING_ROLLBACK
};
// The status of the ongoing update attempt.