From ec3ef81fd93bfa62d77bd58fafa0bfa6516f0c97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oleg=20Pet=C5=A1jonkin?= Date: Fri, 22 Dec 2023 10:17:25 +0000 Subject: [PATCH] Revert "Small fix: Use const value on IsHashreeDisabled" This reverts commit f5d8773169bbe355597d2a584560963670c99c70. Reason for revert: Identified as culprit for broken tests: b/317470107 Change-Id: If599c688bb4bbe800270881451fa5ac1f6898aff --- init/first_stage_mount.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init/first_stage_mount.cpp b/init/first_stage_mount.cpp index c0b928139..b5292a407 100644 --- a/init/first_stage_mount.cpp +++ b/init/first_stage_mount.cpp @@ -732,7 +732,7 @@ bool FirstStageMountVBootV2::GetDmVerityDevices(std::set* devices) return true; } -bool IsHashtreeDisabled(const AvbHandle& vbmeta, const std::string& mount_point) { +bool IsHashtreeDisabled(const AvbHandle& vbmeta, std::string mount_point) { if (vbmeta.status() == AvbHandleStatus::kHashtreeDisabled || vbmeta.status() == AvbHandleStatus::kVerificationDisabled) { LOG(ERROR) << "Top-level vbmeta is disabled, skip Hashtree setup for " << mount_point;