commit 30fa4cfae4a6f8e79de4a8f217f9bf261784ef1d
author Bowgo Tsai <bowgotsai@google.com> Mon Jun 11 09:20:55 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jun 11 09:20:55 2018 -0700
tree 8a424f0cc50a7e9ef028d3a279589eb0277f7ca9
parent 6509ee82670ee4a14cfbc2f057ad0eddb73bab84
parent f8f9bbc3dce60fc26ce29880e323ba9022bc19dd

Merge "fs_mg: allow getting VBMeta Digest from device-tree"
am: ec9b6b73ff

Change-Id: I7a70a3a367bf12499c9271bc2c1aba584d3a726d

fs_mgr/fs_mgr_avb.cpp

diff --git a/fs_mgr/fs_mgr_avb.cpp b/fs_mgr/fs_mgr_avb.cpp
index 5d688e1..2020fa6 100644
--- a/fs_mgr/fs_mgr_avb.cpp
+++ b/fs_mgr/fs_mgr_avb.cpp
@@ -146,7 +146,7 @@
     }
 
     std::string value;
-    if (!fs_mgr_get_boot_config_from_kernel_cmdline("vbmeta.size", &value) ||
+    if (!fs_mgr_get_boot_config("vbmeta.size", &value) ||
         !android::base::ParseUint(value.c_str(), &avb_verifier->vbmeta_size_)) {
         LERROR << "Invalid hash size: " << value.c_str();
         return nullptr;
@@ -155,7 +155,7 @@
     // Reads hash algorithm.
     size_t expected_digest_size = 0;
     std::string hash_alg;
-    fs_mgr_get_boot_config_from_kernel_cmdline("vbmeta.hash_alg", &hash_alg);
+    fs_mgr_get_boot_config("vbmeta.hash_alg", &hash_alg);
     if (hash_alg == "sha256") {
         expected_digest_size = SHA256_DIGEST_LENGTH * 2;
         avb_verifier->hash_alg_ = kSHA256;
@@ -169,7 +169,7 @@
 
     // Reads digest.
     std::string digest;
-    fs_mgr_get_boot_config_from_kernel_cmdline("vbmeta.digest", &digest);
+    fs_mgr_get_boot_config("vbmeta.digest", &digest);
     if (digest.size() != expected_digest_size) {
         LERROR << "Unexpected digest size: " << digest.size()
                << " (expected: " << expected_digest_size << ")";