summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYifan Hong <elsk@google.com>2020-04-28 05:16:18 +0200
committerYifan Hong <elsk@google.com>2020-05-08 04:25:26 +0200
commit2a4afd29a15522ccf3d8ca902214e68445bcac81 (patch)
tree2db8c924e6bd7e4ecc10de7cb3000b06b4524e58
parentConsolidate the wait in recovery's reboot (diff)
downloadandroid_bootable_recovery-2a4afd29a15522ccf3d8ca902214e68445bcac81.tar
android_bootable_recovery-2a4afd29a15522ccf3d8ca902214e68445bcac81.tar.gz
android_bootable_recovery-2a4afd29a15522ccf3d8ca902214e68445bcac81.tar.bz2
android_bootable_recovery-2a4afd29a15522ccf3d8ca902214e68445bcac81.tar.lz
android_bootable_recovery-2a4afd29a15522ccf3d8ca902214e68445bcac81.tar.xz
android_bootable_recovery-2a4afd29a15522ccf3d8ca902214e68445bcac81.tar.zst
android_bootable_recovery-2a4afd29a15522ccf3d8ca902214e68445bcac81.zip
Diffstat (limited to '')
-rw-r--r--install/install.cpp27
1 files changed, 19 insertions, 8 deletions
diff --git a/install/install.cpp b/install/install.cpp
index 1c9bf2fd2..d404997dc 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -331,15 +331,25 @@ static InstallResult TryUpdateBinary(Package* package, bool* wipe_cache,
return INSTALL_CORRUPT;
}
- bool is_ab = android::base::GetBoolProperty("ro.build.ab_update", false);
- if (is_ab) {
+ bool package_is_ab = get_value(metadata, "ota-type") == OtaTypeToString(OtaType::AB);
+ 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);
+ bool device_only_supports_ab = device_supports_ab && !ab_device_supports_nonab;
+
+ if (package_is_ab) {
CHECK(package->GetType() == PackageType::kFile);
}
- // Verify against the metadata in the package first.
- if (is_ab && !CheckPackageMetadata(metadata, OtaType::AB)) {
- log_buffer->push_back(android::base::StringPrintf("error: %d", kUpdateBinaryCommandFailure));
- return INSTALL_ERROR;
+ // Verify against the metadata in the package first. Expects A/B metadata if:
+ // Package declares itself as an A/B package
+ // Package does not declare itself as an A/B package, but device only supports A/B;
+ // still calls CheckPackageMetadata to get a meaningful error message.
+ if (package_is_ab || device_only_supports_ab) {
+ if (!CheckPackageMetadata(metadata, OtaType::AB)) {
+ log_buffer->push_back(android::base::StringPrintf("error: %d", kUpdateBinaryCommandFailure));
+ return INSTALL_ERROR;
+ }
}
ReadSourceTargetBuild(metadata, log_buffer);
@@ -389,8 +399,9 @@ static InstallResult TryUpdateBinary(Package* package, bool* wipe_cache,
std::vector<std::string> args;
if (auto setup_result =
- is_ab ? SetUpAbUpdateCommands(package_path, zip, pipe_write.get(), &args)
- : SetUpNonAbUpdateCommands(package_path, zip, retry_count, pipe_write.get(), &args);
+ package_is_ab
+ ? SetUpAbUpdateCommands(package_path, zip, pipe_write.get(), &args)
+ : SetUpNonAbUpdateCommands(package_path, zip, retry_count, pipe_write.get(), &args);
!setup_result) {
log_buffer->push_back(android::base::StringPrintf("error: %d", kUpdateBinaryCommandFailure));
return INSTALL_CORRUPT;