Merge "Snap for 11692525 from 3bf54b57d2abe885fbcbf886b13d69c8287732da to sdk-release" into sdk-release

3 files changed, 23 insertions, 3 deletions

diff --git a/install/install.cpp b/install/install.cpp
index a9786cfd..6294a3dc 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -189,6 +189,17 @@ static bool CheckAbSpecificMetadata(const std::map<std::string, std::string>& me
       return false;
     }
   }
+  const auto post_build = get_value(metadata, "post-build");
+  const auto build_fingerprint = android::base::Tokenize(post_build, "/");
+  if (!build_fingerprint.empty()) {
+    const auto& post_build_tag = build_fingerprint.back();
+    const auto build_tag = android::base::GetProperty("ro.build.tags", "");
+    if (build_tag != post_build_tag) {
+      LOG(ERROR) << "Post build-tag " << post_build_tag << " does not match device build tag "
+                 << build_tag;
+      return false;
+    }
+  }
 
   return true;
 }
diff --git a/recovery.cpp b/recovery.cpp
index e7a33a9e..fbfe6468 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -176,6 +176,11 @@ static bool ask_to_wipe_data(Device* device) {
 }
 
 static InstallResult prompt_and_wipe_data(Device* device) {
+  // Reset to normal system boot so recovery won't cycle indefinitely.
+  std::string err;
+  if (!clear_bootloader_message(&err)) {
+    LOG(ERROR) << "Failed to clear BCB message: " << err;
+  }
   // Use a single string and let ScreenRecoveryUI handles the wrapping.
   std::vector<std::string> wipe_data_menu_headers{
     "Can't load Android system. Your data may be corrupt. "
diff --git a/recovery_main.cpp b/recovery_main.cpp
index cb3f0c13..903a3173 100644
--- a/recovery_main.cpp
+++ b/recovery_main.cpp
@@ -155,9 +155,13 @@ static std::vector<std::string> get_args(const int argc, char** const argv, std:
   // Write the arguments (excluding the filename in args[0]) back into the
   // bootloader control block. So the device will always boot into recovery to
   // finish the pending work, until FinishRecovery() is called.
-  std::vector<std::string> options(args.cbegin() + 1, args.cend());
-  if (!update_bootloader_message(options, &err)) {
-    LOG(ERROR) << "Failed to set BCB message: " << err;
+  // This should only be done for boot-recovery command so that other commands
+  // won't be overwritten.
+  if (boot_command == "boot-recovery") {
+    std::vector<std::string> options(args.cbegin() + 1, args.cend());
+    if (!update_bootloader_message(options, &err)) {
+      LOG(ERROR) << "Failed to set BCB message: " << err;
+    }
   }
 
   // Finally, if no arguments were specified, check whether we should boot