From 7b5c38f8eb7fc83006e1cc7366397a2441c88604 Mon Sep 17 00:00:00 2001 From: Yi-Yo Chiang Date: Sat, 29 Jul 2023 17:46:32 +0800 Subject: [PATCH] libfstab: Unexport InRecovery() It was accidentally moved to the public header when I was previously refactoring the code. It hasn't caused any harm yet, but we probably don't want to export this, too. Bug: 293695109 Test: build Change-Id: Id81c802cc6cc697c5a4204638aa467966bea1562 --- fs_mgr/fs_mgr_priv.h | 3 +++ fs_mgr/include_fstab/fstab/fstab.h | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/fs_mgr/fs_mgr_priv.h b/fs_mgr/fs_mgr_priv.h index c3b18c85c..678dd69cb 100644 --- a/fs_mgr/fs_mgr_priv.h +++ b/fs_mgr/fs_mgr_priv.h @@ -109,6 +109,9 @@ OverlayfsValidResult fs_mgr_overlayfs_valid(); namespace android { namespace fs_mgr { + bool UnmapDevice(const std::string& name); +bool InRecovery(); + } // namespace fs_mgr } // namespace android diff --git a/fs_mgr/include_fstab/fstab/fstab.h b/fs_mgr/include_fstab/fstab/fstab.h index 80b45ba93..9cb1546c5 100644 --- a/fs_mgr/include_fstab/fstab/fstab.h +++ b/fs_mgr/include_fstab/fstab/fstab.h @@ -131,7 +131,5 @@ std::set GetBootDevices(); // expected name. std::string GetVerityDeviceName(const FstabEntry& entry); -bool InRecovery(); - } // namespace fs_mgr } // namespace android