summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Lee <rgl@google.com>2019-07-09 02:47:55 +0200
committerandroid-build-merger <android-build-merger@google.com>2019-07-09 02:47:55 +0200
commit0bbe38ed1e84f963c5d7502fed6142e8ebfcf449 (patch)
tree1b994112419da21f4c5ee5c33235ef2516515663
parent[automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master" into stage-aosp-master am: 317fc9a2f1 -s ours (diff)
parentMerge "Add a GetMappedPackageLength to Updater" am: 5135d1f095 (diff)
downloadandroid_bootable_recovery-0bbe38ed1e84f963c5d7502fed6142e8ebfcf449.tar
android_bootable_recovery-0bbe38ed1e84f963c5d7502fed6142e8ebfcf449.tar.gz
android_bootable_recovery-0bbe38ed1e84f963c5d7502fed6142e8ebfcf449.tar.bz2
android_bootable_recovery-0bbe38ed1e84f963c5d7502fed6142e8ebfcf449.tar.lz
android_bootable_recovery-0bbe38ed1e84f963c5d7502fed6142e8ebfcf449.tar.xz
android_bootable_recovery-0bbe38ed1e84f963c5d7502fed6142e8ebfcf449.tar.zst
android_bootable_recovery-0bbe38ed1e84f963c5d7502fed6142e8ebfcf449.zip
-rw-r--r--edify/include/edify/updater_interface.h1
-rw-r--r--updater/include/updater/updater.h4
2 files changed, 4 insertions, 1 deletions
diff --git a/edify/include/edify/updater_interface.h b/edify/include/edify/updater_interface.h
index a4d581eec..aa977e3c8 100644
--- a/edify/include/edify/updater_interface.h
+++ b/edify/include/edify/updater_interface.h
@@ -44,4 +44,5 @@ class UpdaterInterface {
virtual ZipArchiveHandle GetPackageHandle() const = 0;
virtual std::string GetResult() const = 0;
virtual uint8_t* GetMappedPackageAddress() const = 0;
+ virtual size_t GetMappedPackageLength() const = 0;
};
diff --git a/updater/include/updater/updater.h b/updater/include/updater/updater.h
index 08816bf36..8676b6038 100644
--- a/updater/include/updater/updater.h
+++ b/updater/include/updater/updater.h
@@ -62,10 +62,12 @@ class Updater : public UpdaterInterface {
std::string GetResult() const override {
return result_;
}
-
uint8_t* GetMappedPackageAddress() const override {
return mapped_package_.addr;
}
+ size_t GetMappedPackageLength() const override {
+ return mapped_package_.length;
+ }
private:
friend class UpdaterTestBase;