diff options
| author | Alex Deymo <deymo@google.com> | 2016-02-03 09:22:17 -0800 |
|---|---|---|
| committer | Alex Deymo <deymo@google.com> | 2016-02-03 20:52:47 -0800 |
| commit | 1f19dccb115cf608104b1cb0d192a53ae32f238f (patch) | |
| tree | 7f9ba9eab7aafb5d7727852a3ed369e086a3acb5 /common/error_code.h | |
| parent | 12542ace0f43c5afaf1e7112556b71aea8454c79 (diff) | |
Add ErrorCode::kUserCanceled.
To accomodate the posibility of canceling an ongoing update, this patch
adds a new ErrorCode signaling a user canceling the update.
This patch also removes the now useless unittests that checks if you
added a new error code since the compiler fails if you don't add the
error code to the method mentioned in the test.
Bug: None
TEST=FEATURES=test emerge-link update_engine
TEST=`mmma system/update_engine` on edison-eng and aosp_arm-eng
Change-Id: I991dab1dd8b6c0bb0c24d51cca4e1b75440a86b4
Diffstat (limited to 'common/error_code.h')
| -rw-r--r-- | common/error_code.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/common/error_code.h b/common/error_code.h index 2bbdcfa1..32155f27 100644 --- a/common/error_code.h +++ b/common/error_code.h @@ -71,6 +71,7 @@ enum class ErrorCode : int { kUnsupportedMinorPayloadVersion = 45, kOmahaRequestXMLHasEntityDecl = 46, kFilesystemVerifierError = 47, + kUserCanceled = 48, // VERY IMPORTANT! When adding new error codes: // @@ -122,8 +123,8 @@ enum class ErrorCode : int { // Mask that indicates bit positions that are used to indicate special flags // that are embedded in the error code to provide additional context about // the system in which the error was encountered. - kSpecialFlags = (kDevModeFlag | kResumedFlag | kTestImageFlag | - kTestOmahaUrlFlag) + kSpecialFlags = + (kDevModeFlag | kResumedFlag | kTestImageFlag | kTestOmahaUrlFlag) }; inline std::ostream& operator<<(std::ostream& os, ErrorCode val) { |