commit 2cbb069d65b1da20b3323022e12fe863bc0b98d0
author Amin Hassani <ahassani@chromium.org> Wed Oct 30 13:36:17 2019 -0700
committer Commit Bot <commit-bot@chromium.org> Thu Nov 07 02:17:51 2019 +0000
tree d9c01a490a15a93306899e992b6e95849df61f45
parent 55c75417e22d5026971276997924a345d9973bbc

update_engine: Deprecate EOL Status

This is not used anymore. It has been replaced by date based EOL.

It has been deprecated from Chrome per CL:1891467

BUG=chromium:1005511
TEST=sudo FEATURES=test emerge update_engine-client update_engine

Change-Id: I047ca8d641906208728e89adb7c430b71ab11239
Reviewed-on: https://chromium-review.googlesource.com/c/aosp/platform/system/update_engine/+/1891571
Tested-by: Amin Hassani <ahassani@chromium.org>
Commit-Queue: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Jae Hoon Kim <kimjae@chromium.org>

omaha_request_action.cc

diff --git a/omaha_request_action.cc b/omaha_request_action.cc
index 7ca4372..6ebab0d 100644
--- a/omaha_request_action.cc
+++ b/omaha_request_action.cc
@@ -108,7 +108,7 @@
 constexpr char kValNoUpdate[] = "noupdate";
 
 // updatecheck attributes (without the underscore prefix).
-constexpr char kAttrEol[] = "eol";
+// Deprecated: "eol"
 constexpr char kAttrEolDate[] = "eol_date";
 constexpr char kAttrRollback[] = "rollback";
 constexpr char kAttrFirmwareVersion[] = "firmware_version";
@@ -699,8 +699,8 @@
     }
   }
 
-  // Parse the updatecheck attributes.
-  PersistEolStatus(parser_data->updatecheck_attrs);
+  PersistEolInfo(parser_data->updatecheck_attrs);
+
   // Rollback-related updatecheck attributes.
   // Defaults to false if attribute is not present.
   output_object->is_rollback =
@@ -1317,30 +1317,16 @@
   return true;
 }
 
-bool OmahaRequestAction::PersistEolStatus(const map<string, string>& attrs) {
-  bool ret = true;
-
-  // Set EOL date.
+bool OmahaRequestAction::PersistEolInfo(const map<string, string>& attrs) {
   auto eol_date_attr = attrs.find(kAttrEolDate);
   if (eol_date_attr == attrs.end()) {
     system_state_->prefs()->Delete(kPrefsOmahaEolDate);
   } else if (!system_state_->prefs()->SetString(kPrefsOmahaEolDate,
                                                 eol_date_attr->second)) {
     LOG(ERROR) << "Setting EOL date failed.";
-    ret = false;
+    return false;
   }
-
-  // Set EOL.
-  auto eol_attr = attrs.find(kAttrEol);
-  if (eol_attr == attrs.end()) {
-    system_state_->prefs()->Delete(kPrefsOmahaEolStatus);
-  } else if (!system_state_->prefs()->SetString(kPrefsOmahaEolStatus,
-                                                eol_attr->second)) {
-    LOG(ERROR) << "Setting EOL status failed.";
-    ret = false;
-  }
-
-  return ret;
+  return true;
 }
 
 void OmahaRequestAction::ActionCompleted(ErrorCode code) {