tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Require serialno field for brick OTA package on release-key devices" am: 00bfe128f9 am: 421625f458

Browse source 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2486120

Change-Id: Iaa057500b6fd0dd67caee2dd3b45f2ca953b4060
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kelvin Zhang 2023-03-15 01:00:26 +00:00 committed by Automerger Merge Worker
commit d528b41591
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
install/install.cpp
View file

@ -70,6 +70,8 @@ static constexpr int VERIFICATION_PROGRESS_TIME = 60;
static constexpr float VERIFICATION_PROGRESS_FRACTION = 0.25; static constexpr float VERIFICATION_PROGRESS_FRACTION = 0.25;
// The charater used to separate dynamic fingerprints. e.x. sargo|aosp-sargo // The charater used to separate dynamic fingerprints. e.x. sargo|aosp-sargo
static const char* FINGERPRING_SEPARATOR = "|"; static const char* FINGERPRING_SEPARATOR = "|";
static constexpr auto&& RELEASE_KEYS_TAG = "release-keys";
static std::condition_variable finish_log_temperature; static std::condition_variable finish_log_temperature;
static bool isInStringList(const std::string& target_token, const std::string& str_list, static bool isInStringList(const std::string& target_token, const std::string& str_list,
const std::string& deliminator); const std::string& deliminator);
@ -213,6 +215,7 @@ bool CheckPackageMetadata(const std::map<std::string, std::string>& metadata, Ot
// We allow the package to not have any serialno; and we also allow it to carry multiple serial // We allow the package to not have any serialno; and we also allow it to carry multiple serial
// numbers split by "|"; e.g. serialno=serialno1|serialno2|serialno3 ... We will fail the // numbers split by "|"; e.g. serialno=serialno1|serialno2|serialno3 ... We will fail the
// verification if the device's serialno doesn't match any of these carried numbers. // verification if the device's serialno doesn't match any of these carried numbers.
auto pkg_serial_no = get_value(metadata, "serialno"); auto pkg_serial_no = get_value(metadata, "serialno");
if (!pkg_serial_no.empty()) { if (!pkg_serial_no.empty()) {
auto device_serial_no = android::base::GetProperty("ro.serialno", ""); auto device_serial_no = android::base::GetProperty("ro.serialno", "");
@ -226,6 +229,21 @@ bool CheckPackageMetadata(const std::map<std::string, std::string>& metadata, Ot
LOG(ERROR) << "Package is for serial " << pkg_serial_no; LOG(ERROR) << "Package is for serial " << pkg_serial_no;
return false; return false;
} }
} else if (ota_type == OtaType::BRICK) {
const auto device_build_tag = android::base::GetProperty("ro.build.tags", "");
if (device_build_tag.empty()) {
LOG(ERROR) << "Unable to determine device build tags, serial number is missing from package. "
"Rejecting the brick OTA package.";
return false;
}
if (device_build_tag == RELEASE_KEYS_TAG) {
LOG(ERROR) << "Device is release key build, serial number is missing from package. "
"Rejecting the brick OTA package.";
return false;
}
LOG(INFO)
<< "Serial number is missing from brick OTA package, permitting anyway because device is "
<< device_build_tag;
} }
if (ota_type == OtaType::AB) { if (ota_type == OtaType::AB) {