2022-10-15 07:53:14 -04:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Daniel Micay <danielmicay@gmail.com>
|
|
|
|
|
Date: Wed, 19 Aug 2020 09:31:04 -0400
|
|
|
|
|
Subject: [PATCH] reject updates with serialno constraints
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
|
install/install.cpp | 16 ++--------------
|
|
|
|
|
1 file changed, 2 insertions(+), 14 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/install/install.cpp b/install/install.cpp
|
2022-10-17 06:39:52 -04:00
|
|
|
index 61bab17b..e14cbf50 100644
|
2022-10-15 07:53:14 -04:00
|
|
|
--- a/install/install.cpp
|
|
|
|
|
+++ b/install/install.cpp
|
|
|
|
|
@@ -221,22 +221,10 @@ bool CheckPackageMetadata(const std::map<std::string, std::string>& metadata, Ot
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- // 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
|
|
|
|
|
- // verification if the device's serialno doesn't match any of these carried numbers.
|
|
|
|
|
auto pkg_serial_no = get_value(metadata, "serialno");
|
|
|
|
|
if (!pkg_serial_no.empty()) {
|
|
|
|
|
- auto device_serial_no = android::base::GetProperty("ro.serialno", "");
|
|
|
|
|
- bool serial_number_match = false;
|
|
|
|
|
- for (const auto& number : android::base::Split(pkg_serial_no, "|")) {
|
|
|
|
|
- if (device_serial_no == android::base::Trim(number)) {
|
|
|
|
|
- serial_number_match = true;
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
- if (!serial_number_match) {
|
|
|
|
|
- LOG(ERROR) << "Package is for serial " << pkg_serial_no;
|
|
|
|
|
- return false;
|
|
|
|
|
- }
|
|
|
|
|
+ LOG(ERROR) << "Serial number constraint not permitted: " << pkg_serial_no;
|
|
|
|
|
+ return INSTALL_ERROR;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (ota_type == OtaType::AB) {
|
