diff options
| author | Tao Bao <tbao@google.com> | 2019-05-11 06:12:19 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-11 06:12:19 +0200 |
| commit | 8ffec8944c3632f33f145a1190c8ab624f31f042 (patch) | |
| tree | d385b79a784e8e3927e321008c2a1e95e46c0637 /recovery_main.cpp | |
| parent | Merge "Import translations. DO NOT MERGE" (diff) | |
| parent | Merge "roots: Remove get_system_root and logical_partitions_mapped." am: ba8f38d741 (diff) | |
| download | android_bootable_recovery-8ffec8944c3632f33f145a1190c8ab624f31f042.tar android_bootable_recovery-8ffec8944c3632f33f145a1190c8ab624f31f042.tar.gz android_bootable_recovery-8ffec8944c3632f33f145a1190c8ab624f31f042.tar.bz2 android_bootable_recovery-8ffec8944c3632f33f145a1190c8ab624f31f042.tar.lz android_bootable_recovery-8ffec8944c3632f33f145a1190c8ab624f31f042.tar.xz android_bootable_recovery-8ffec8944c3632f33f145a1190c8ab624f31f042.tar.zst android_bootable_recovery-8ffec8944c3632f33f145a1190c8ab624f31f042.zip | |
Diffstat (limited to 'recovery_main.cpp')
| -rw-r--r-- | recovery_main.cpp | 3 |
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 { |