AU: Include a bit flag (bit 31) in error codes to indicate non-normal boot mode.

omaha_request_action.cc

 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "update_engine/omaha_request_action.h"
 
 #include <inttypes.h>
 
 #include <sstream>
 
@@ skipping 101 matching lines @@
       body += StringPrintf(
           "        <o:event eventtype=\"%d\" eventresult=\"%d\" "
           "previousversion=\"%s\"></o:event>\n",
           OmahaEvent::kTypeUpdateComplete,
           OmahaEvent::kResultSuccessReboot,
           prev_version.c_str());
       LOG_IF(WARNING, !prefs->SetString(kPrefsPreviousVersion, ""))
           << "Unable to reset the previous version.";
     }
   } else {
-    // The error code is an optional attribute so append it only if
-    // the result is not success.
+    // The error code is an optional attribute so append it only if the result
+    // is not success.
     string error_code;
     if (event->result != OmahaEvent::kResultSuccess) {
-      error_code = StringPrintf(" errorcode=\"%d\"", event->error_code);
+      int code = event->error_code;
+      if (!utils::IsNormalBootMode()) {
+        code |= kActionCodeBootModeFlag;
+      }
+      error_code = StringPrintf(" errorcode=\"%d\"", code);
     }
     body = StringPrintf(
         "        <o:event eventtype=\"%d\" eventresult=\"%d\"%s></o:event>\n",
         event->type, event->result, error_code.c_str());
   }
   return "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
       "<o:gupdate xmlns:o=\"http://www.google.com/update2/request\" "
       "version=\"" + XmlEncode(kGupdateVersion) + "\" "
       "updaterversion=\"" + XmlEncode(kGupdateVersion) + "\" "
       "protocol=\"2.0\" ismachine=\"1\">\n"
@@ skipping 307 matching lines @@
   output_object.needs_admin =
       XmlGetProperty(updatecheck_node, "needsadmin") == "true";
   output_object.prompt = XmlGetProperty(updatecheck_node, "Prompt") == "true";
   output_object.is_delta =
       XmlGetProperty(updatecheck_node, "IsDelta") == "true";
   output_object.deadline = XmlGetProperty(updatecheck_node, "deadline");
   SetOutputObject(output_object);
 }
 
 };  // namespace chromeos_update_engine