summaryrefslogtreecommitdiffstats
path: root/install/include
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2019-04-30 09:25:41 +0200
committerTao Bao <tbao@google.com>2019-04-30 22:58:03 +0200
commit36c7276cb29c0990933de6da8dbcf7ea2dc2741d (patch)
tree34fc209da376e6237f12c976629e319583ff528b /install/include
parentMerge "tests: Merge recovery_component_test into recovery_unit_test." (diff)
downloadandroid_bootable_recovery-36c7276cb29c0990933de6da8dbcf7ea2dc2741d.tar
android_bootable_recovery-36c7276cb29c0990933de6da8dbcf7ea2dc2741d.tar.gz
android_bootable_recovery-36c7276cb29c0990933de6da8dbcf7ea2dc2741d.tar.bz2
android_bootable_recovery-36c7276cb29c0990933de6da8dbcf7ea2dc2741d.tar.lz
android_bootable_recovery-36c7276cb29c0990933de6da8dbcf7ea2dc2741d.tar.xz
android_bootable_recovery-36c7276cb29c0990933de6da8dbcf7ea2dc2741d.tar.zst
android_bootable_recovery-36c7276cb29c0990933de6da8dbcf7ea2dc2741d.zip
Diffstat (limited to 'install/include')
-rw-r--r--install/include/install/install.h8
-rw-r--r--install/include/private/setup_commands.h8
2 files changed, 8 insertions, 8 deletions
diff --git a/install/include/install/install.h b/install/include/install/install.h
index d90c20f3a..cc595f6b0 100644
--- a/install/include/install/install.h
+++ b/install/include/install/install.h
@@ -62,7 +62,7 @@ bool ReadMetadataFromPackage(ZipArchiveHandle zip, std::map<std::string, std::st
// entry doesn't exist.
bool verify_package_compatibility(ZipArchiveHandle package_zip);
-// Checks if the the metadata in the OTA package has expected values. Returns 0 on success.
-// Mandatory checks: ota-type, pre-device and serial number(if presents)
-// AB OTA specific checks: pre-build version, fingerprint, timestamp.
-int CheckPackageMetadata(const std::map<std::string, std::string>& metadata, OtaType ota_type);
+// Checks if the metadata in the OTA package has expected values. Mandatory checks: ota-type,
+// pre-device and serial number (if presents). A/B OTA specific checks: pre-build version,
+// fingerprint, timestamp.
+bool CheckPackageMetadata(const std::map<std::string, std::string>& metadata, OtaType ota_type);
diff --git a/install/include/private/setup_commands.h b/install/include/private/setup_commands.h
index 7fdc741d6..dcff76112 100644
--- a/install/include/private/setup_commands.h
+++ b/install/include/private/setup_commands.h
@@ -27,13 +27,13 @@
// |zip| located at |package|. Stores the command line that should be called into |cmd|. The
// |status_fd| is the file descriptor the child process should use to report back the progress of
// the update.
-int SetUpNonAbUpdateCommands(const std::string& package, ZipArchiveHandle zip, int retry_count,
- int status_fd, std::vector<std::string>* cmd);
+bool SetUpNonAbUpdateCommands(const std::string& package, ZipArchiveHandle zip, int retry_count,
+ int status_fd, std::vector<std::string>* cmd);
// Sets up the commands for an A/B update. Extracts the needed entries from the open zip archive
// |zip| located at |package|. Stores the command line that should be called into |cmd|. The
// |status_fd| is the file descriptor the child process should use to report back the progress of
// the update. Note that since this applies to the sideloading flow only, it takes one less
// parameter |retry_count| than the non-A/B version.
-int SetUpAbUpdateCommands(const std::string& package, ZipArchiveHandle zip, int status_fd,
- std::vector<std::string>* cmd);
+bool SetUpAbUpdateCommands(const std::string& package, ZipArchiveHandle zip, int status_fd,
+ std::vector<std::string>* cmd);