summaryrefslogtreecommitdiffstats
path: root/recovery_main.cpp
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2019-05-11 02:40:31 +0200
committerandroid-build-merger <android-build-merger@google.com>2019-05-11 02:40:31 +0200
commitc53856dca7d231e325df8ad5642c14ca0e676876 (patch)
treea95adea292d94af550e1a1c8c0ed1c036d63f340 /recovery_main.cpp
parent[automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." (diff)
parentMerge "roots: Remove get_system_root and logical_partitions_mapped." (diff)
downloadandroid_bootable_recovery-c53856dca7d231e325df8ad5642c14ca0e676876.tar
android_bootable_recovery-c53856dca7d231e325df8ad5642c14ca0e676876.tar.gz
android_bootable_recovery-c53856dca7d231e325df8ad5642c14ca0e676876.tar.bz2
android_bootable_recovery-c53856dca7d231e325df8ad5642c14ca0e676876.tar.lz
android_bootable_recovery-c53856dca7d231e325df8ad5642c14ca0e676876.tar.xz
android_bootable_recovery-c53856dca7d231e325df8ad5642c14ca0e676876.tar.zst
android_bootable_recovery-c53856dca7d231e325df8ad5642c14ca0e676876.zip
Diffstat (limited to 'recovery_main.cpp')
-rw-r--r--recovery_main.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/recovery_main.cpp b/recovery_main.cpp
index b999505fb..aba9c5d75 100644
--- a/recovery_main.cpp
+++ b/recovery_main.cpp
@@ -42,6 +42,7 @@
#include <android-base/unique_fd.h>
#include <bootloader_message/bootloader_message.h>
#include <cutils/sockets.h>
+#include <fs_mgr/roots.h>
#include <private/android_logger.h> /* private pmsg functions */
#include <selinux/android.h>
#include <selinux/label.h>
@@ -505,7 +506,7 @@ int main(int argc, char** argv) {
}
case Device::ENTER_FASTBOOT:
- if (logical_partitions_mapped()) {
+ if (android::fs_mgr::LogicalPartitionsMapped()) {
ui->Print("Partitions may be mounted - rebooting to enter fastboot.");
Reboot("fastboot");
} else {