Snap for 6210127 from d39f7d46f1ea805964bf06faf3f5a03d547da0a1 to rvc-d1-release

Change-Id: I67feaf4826729e0e2d067fbec5eb4d6637134b01

2 files changed, 6 insertions, 0 deletions

diff --git a/gsi_service.cpp b/gsi_service.cpp
index 7d3a9d1..3705c5b 100644
--- a/gsi_service.cpp
+++ b/gsi_service.cpp
@@ -201,6 +201,7 @@ binder::Status GsiService::createPartition(const ::std::string& name, int64_t si
     }
     installer_ = std::make_unique<PartitionInstaller>(this, install_dir_, name,
                                                       GetDsuSlot(install_dir_), size, readOnly);
+    progress_ = {};
     int status = installer_->StartInstall();
     if (status != INSTALL_OK) {
         installer_ = nullptr;
@@ -247,6 +248,9 @@ binder::Status GsiService::getInstallProgress(::android::gsi::GsiProgress* _aidl
     ENFORCE_SYSTEM;
     std::lock_guard<std::mutex> guard(progress_lock_);
 
+    if (installer_ == nullptr) {
+        progress_ = {};
+    }
     *_aidl_return = progress_;
     return binder::Status::ok();
 }
diff --git a/include/libgsi/libgsi.h b/include/libgsi/libgsi.h
index 987797a..c824c57 100644
--- a/include/libgsi/libgsi.h
+++ b/include/libgsi/libgsi.h
@@ -31,6 +31,8 @@ static constexpr char kGsiLpNamesFile[] = DSU_METADATA_PREFIX "lp_names";
 
 static constexpr char kDsuActiveFile[] = DSU_METADATA_PREFIX "active";
 
+static constexpr char kDsuAvbKeyDir[] = DSU_METADATA_PREFIX "avb/";
+
 static inline std::string DsuLpMetadataFile(const std::string& dsu_slot) {
     return DSU_METADATA_PREFIX + dsu_slot + "/lp_metadata";
 }