diff options
| author | Amin Hassani <ahassani@google.com> | 2018-03-12 14:07:43 -0700 |
|---|---|---|
| committer | Amin Hassani <ahassani@google.com> | 2018-03-12 14:37:30 -0700 |
| commit | 3e0b22afa4446f966bef15d0a513e3e9ab663d22 (patch) | |
| tree | fc125dc2d960ddc87ba211304fcbf7d7e1488010 /common/error_code_utils.cc | |
| parent | f7006be5079ed91c93223273f3ddb69d655ba858 (diff) | |
| parent | 42fa45e78aeee0985ecae558887d30276bfc45f0 (diff) | |
Merge remote-tracking branch 'remotes/cros/update_engine_aosp_merge'
In the follow up CLs we have to Reland:
eaad5d0f17a1b9d5652a350e1c785c7c5368cb54 Do not merge to AOSP: Fixes the link to brillo-clang-format in CrOS
740efad439e57e71d8d459c366edea3a90b19576 Reboot even if a system update is not available.
4b0d6032cbb86ce488c03b31936cda31283f97e3 Add functions to allow update over cellular (including tethered connection)
840703a4cc77228e2606f45665ae3a4bd75ff7dd Fix update over cellular network on guest account
Because they have been reverted in cros/upstream branch.
Also we have to partially revert:
2b9d2417722cd4052b0e22494886f93c5b4ef042 update_engine: Update libchrome APIS to r456626.
Because we have not upreved libchrome
BUG=chromium:815356
TEST=unittests
TEST=cl with squashfs merge passes
Change-Id: I0ec7f3fe3fd278ef1214868b42d3eb126ebeefe2
Diffstat (limited to 'common/error_code_utils.cc')
| -rw-r--r-- | common/error_code_utils.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/error_code_utils.cc b/common/error_code_utils.cc index 0169ab89..983d004d 100644 --- a/common/error_code_utils.cc +++ b/common/error_code_utils.cc @@ -144,10 +144,10 @@ string ErrorCodeToString(ErrorCode code) { return "ErrorCode::kUserCanceled"; case ErrorCode::kNonCriticalUpdateInOOBE: return "ErrorCode::kNonCriticalUpdateInOOBE"; - case ErrorCode::kOmahaUpdateIgnoredOverCellular: - return "ErrorCode::kOmahaUpdateIgnoredOverCellular"; - // Don't add a default case to let the compiler warn about newly added - // error codes which should be added here. + case ErrorCode::kUpdatedButNotActive: + return "ErrorCode::kUpdatedButNotActive"; + // Don't add a default case to let the compiler warn about newly added + // error codes which should be added here. } return "Unknown error: " + base::UintToString(static_cast<unsigned>(code)); |