summaryrefslogtreecommitdiffstats
path: root/recovery_main.cpp
diff options
context:
space:
mode:
authorDavid Anderson <dvander@google.com>2018-10-31 21:38:46 +0100
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-10-31 21:38:46 +0100
commit023807fcf72cfaabeed251e2d1e760a6f89074ad (patch)
treeebf4be0805c18d4bb9f450be8bfcd2742e16845b /recovery_main.cpp
parentMerge "Add description for the new translation" (diff)
parentrecovery: Fix mounting /system with dynamic partitions. (diff)
downloadandroid_bootable_recovery-023807fcf72cfaabeed251e2d1e760a6f89074ad.tar
android_bootable_recovery-023807fcf72cfaabeed251e2d1e760a6f89074ad.tar.gz
android_bootable_recovery-023807fcf72cfaabeed251e2d1e760a6f89074ad.tar.bz2
android_bootable_recovery-023807fcf72cfaabeed251e2d1e760a6f89074ad.tar.lz
android_bootable_recovery-023807fcf72cfaabeed251e2d1e760a6f89074ad.tar.xz
android_bootable_recovery-023807fcf72cfaabeed251e2d1e760a6f89074ad.tar.zst
android_bootable_recovery-023807fcf72cfaabeed251e2d1e760a6f89074ad.zip
Diffstat (limited to 'recovery_main.cpp')
-rw-r--r--recovery_main.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/recovery_main.cpp b/recovery_main.cpp
index 78350944c..19ef4f3d0 100644
--- a/recovery_main.cpp
+++ b/recovery_main.cpp
@@ -478,8 +478,13 @@ int main(int argc, char** argv) {
break;
case Device::ENTER_FASTBOOT:
- LOG(INFO) << "Entering fastboot";
- fastboot = true;
+ if (logical_partitions_mapped()) {
+ ui->Print("Partitions may be mounted - rebooting to enter fastboot.");
+ android::base::SetProperty(ANDROID_RB_PROPERTY, "reboot,fastboot");
+ } else {
+ LOG(INFO) << "Entering fastboot";
+ fastboot = true;
+ }
break;
case Device::ENTER_RECOVERY: