summaryrefslogtreecommitdiffstats
path: root/install.h
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-05-02 04:24:05 +0200
committerandroid-build-merger <android-build-merger@google.com>2017-05-02 04:24:05 +0200
commit76003673a167596ce5a7b1a1cf82e7005e5efeb5 (patch)
tree30aa1fec1dfa5470731590437dec72e53b29f5f8 /install.h
parentMerge "adb_install: Stop passing RecoveryUI as a parameter." am: e58dabade9 am: dc534a9481 am: 139a6dd9e2 (diff)
parentMerge "recovery: Change install_package() to take std::string." am: ba365180d3 am: c0c4ae1583 (diff)
downloadandroid_bootable_recovery-76003673a167596ce5a7b1a1cf82e7005e5efeb5.tar
android_bootable_recovery-76003673a167596ce5a7b1a1cf82e7005e5efeb5.tar.gz
android_bootable_recovery-76003673a167596ce5a7b1a1cf82e7005e5efeb5.tar.bz2
android_bootable_recovery-76003673a167596ce5a7b1a1cf82e7005e5efeb5.tar.lz
android_bootable_recovery-76003673a167596ce5a7b1a1cf82e7005e5efeb5.tar.xz
android_bootable_recovery-76003673a167596ce5a7b1a1cf82e7005e5efeb5.tar.zst
android_bootable_recovery-76003673a167596ce5a7b1a1cf82e7005e5efeb5.zip
Diffstat (limited to 'install.h')
-rw-r--r--install.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/install.h b/install.h
index 68f0a8d47..f3fda3051 100644
--- a/install.h
+++ b/install.h
@@ -23,10 +23,9 @@
enum { INSTALL_SUCCESS, INSTALL_ERROR, INSTALL_CORRUPT, INSTALL_NONE, INSTALL_SKIPPED,
INSTALL_RETRY };
-// Install the package specified by root_path. If INSTALL_SUCCESS is
-// returned and *wipe_cache is true on exit, caller should wipe the
-// cache partition.
-int install_package(const char* root_path, bool* wipe_cache, const char* install_file,
+// Installs the given update package. If INSTALL_SUCCESS is returned and *wipe_cache is true on
+// exit, caller should wipe the cache partition.
+int install_package(const std::string& package, bool* wipe_cache, const std::string& install_file,
bool needs_mount, int retry_count);
// Verify the package by ota keys. Return true if the package is verified successfully,
@@ -35,9 +34,9 @@ bool verify_package(const unsigned char* package_data, size_t package_size);
// Read meta data file of the package, write its content in the string pointed by meta_data.
// Return true if succeed, otherwise return false.
-bool read_metadata_from_package(ZipArchiveHandle zip, std::string* meta_data);
+bool read_metadata_from_package(ZipArchiveHandle zip, std::string* metadata);
-// Verifes the compatibility info in a Treble-compatible package. Returns true directly if the
+// Verifies the compatibility info in a Treble-compatible package. Returns true directly if the
// entry doesn't exist.
bool verify_package_compatibility(ZipArchiveHandle package_zip);