Merge SP1A.210208.001

Change-Id: I16e0e3c65461673b714dd66a389670445608d017

1 files changed, 5 insertions, 0 deletions

diff --git a/init/builtins.cpp b/init/builtins.cpp
index 628698230..50f254c89 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -868,6 +868,11 @@ static Result<void> do_verity_update_state(const BuiltinArguments& args) {
         // for system as root, so it has property [partition.system.verified].
         std::string partition = entry.mount_point == "/" ? "system" : Basename(entry.mount_point);
         SetProperty("partition." + partition + ".verified", std::to_string(mode));
+
+        std::string hash_alg = fs_mgr_get_hashtree_algorithm(entry);
+        if (!hash_alg.empty()) {
+            SetProperty("partition." + partition + ".verified.hash_alg", hash_alg);
+        }
     }
 
     return {};