Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 408ba4f9 authored by Yi-Yo Chiang's avatar Yi-Yo Chiang Committed by Automerger Merge Worker
Browse files

Merge "libfstab: Unexport InRecovery()" into main am: f6dc8ee3 am:... 

Merge "libfstab: Unexport InRecovery()" into main am: f6dc8ee3 am: ea70c490 am: 5bdea0d3 am: 37a5342b am: 9fc87279

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2682015



Change-Id: I3fc1d72bc5f4db8ddd479e821d8822ef0c50fdb4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e2c091a7 9fc87279

fs_mgr/fs_mgr_priv.h

+3 −0
Original line number Diff line number Diff line
@@ -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

fs_mgr/include_fstab/fstab/fstab.h

+0 −2
Original line number Diff line number Diff line
@@ -131,7 +131,5 @@ std::set<std::string> GetBootDevices(); 
// expected name.

std::string GetVerityDeviceName(const FstabEntry& entry);



bool InRecovery();



}  // namespace fs_mgr

}  // namespace android