diff options
Diffstat (limited to 'install/install.cpp')
| -rw-r--r-- | install/install.cpp | 40 |
1 files changed, 38 insertions, 2 deletions
diff --git a/install/install.cpp b/install/install.cpp index 83f3cad6b..a9786cfdf 100644 --- a/install/install.cpp +++ b/install/install.cpp @@ -48,6 +48,7 @@ #include "install/spl_check.h" #include "install/wipe_data.h" +#include "install/wipe_device.h" #include "otautil/error_code.h" #include "otautil/package.h" #include "otautil/paths.h" @@ -70,6 +71,10 @@ static constexpr int VERIFICATION_PROGRESS_TIME = 60; static constexpr float VERIFICATION_PROGRESS_FRACTION = 0.25; // The charater used to separate dynamic fingerprints. e.x. sargo|aosp-sargo static const char* FINGERPRING_SEPARATOR = "|"; +static constexpr auto&& RELEASE_KEYS_TAG = "release-keys"; +// If brick packages are smaller than |MEMORY_PACKAGE_LIMIT|, read the entire package into memory +static constexpr size_t MEMORY_PACKAGE_LIMIT = 1024 * 1024; + static std::condition_variable finish_log_temperature; static bool isInStringList(const std::string& target_token, const std::string& str_list, const std::string& deliminator); @@ -213,6 +218,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 // 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", ""); @@ -226,6 +232,21 @@ bool CheckPackageMetadata(const std::map<std::string, std::string>& metadata, Ot LOG(ERROR) << "Package is for serial " << pkg_serial_no; 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) { @@ -364,7 +385,20 @@ static InstallResult TryUpdateBinary(Package* package, bool* wipe_cache, return INSTALL_CORRUPT; } - bool package_is_ab = get_value(metadata, "ota-type") == OtaTypeToString(OtaType::AB); + const bool package_is_ab = get_value(metadata, "ota-type") == OtaTypeToString(OtaType::AB); + const bool package_is_brick = get_value(metadata, "ota-type") == OtaTypeToString(OtaType::BRICK); + if (package_is_brick) { + LOG(INFO) << "Installing a brick package"; + if (package->GetType() == PackageType::kFile && + package->GetPackageSize() < MEMORY_PACKAGE_LIMIT) { + std::vector<uint8_t> content(package->GetPackageSize()); + if (package->ReadFullyAtOffset(content.data(), content.size(), 0)) { + auto memory_package = Package::CreateMemoryPackage(std::move(content), {}); + return WipeAbDevice(device, memory_package.get()) ? INSTALL_SUCCESS : INSTALL_ERROR; + } + } + return WipeAbDevice(device, package) ? INSTALL_SUCCESS : INSTALL_ERROR; + } bool device_supports_ab = android::base::GetBoolProperty("ro.build.ab_update", false); bool ab_device_supports_nonab = android::base::GetBoolProperty("ro.virtual_ab.allow_non_ab", false); @@ -551,7 +585,9 @@ static InstallResult TryUpdateBinary(Package* package, bool* wipe_cache, } else { LOG(FATAL) << "Invalid status code " << status; } - PerformPowerwashIfRequired(zip, device); + if (package_is_ab) { + PerformPowerwashIfRequired(zip, device); + } return INSTALL_SUCCESS; } |