diff options
Diffstat (limited to 'recovery.cpp')
| -rw-r--r-- | recovery.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/recovery.cpp b/recovery.cpp index 134a80d7..4bf5f129 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -794,8 +794,13 @@ Device::BuiltinAction start_recovery(Device* device, const std::vector<std::stri } std::vector<std::string> title_lines = - android::base::Split(android::base::GetProperty("ro.build.fingerprint", ""), ":"); - title_lines.insert(std::begin(title_lines), "Android Recovery"); + android::base::Split(android::base::GetProperty("ro.ice.version", ""), ":"); + title_lines.insert(std::begin(title_lines), "Project ICE Recovery"); + if (android::base::GetBoolProperty("ro.build.ab_update", false)) { + std::string slot = android::base::GetProperty("ro.boot.slot_suffix", ""); + if (android::base::StartsWith(slot, "_")) slot.erase(0, 1); + title_lines.push_back("Active slot: " + slot); + } ui->SetTitle(title_lines); ui->ResetKeyInterruptStatus(); @@ -933,12 +938,10 @@ Device::BuiltinAction start_recovery(Device* device, const std::vector<std::stri status = ApplyFromAdb(device, true /* rescue_mode */, &next_action); ui->Print("\nInstall from ADB complete (status: %d).\n", status); } else if (!just_exit) { - // If this is an eng or userdebug build, automatically turn on the text display if no command - // is specified. Note that this should be called before setting the background to avoid + // Always show menu if no command is specified. + // Note that this should be called before setting the background to avoid // flickering the background image. - if (IsRoDebuggable()) { - ui->ShowText(true); - } + ui->ShowText(true); status = INSTALL_NONE; // No command specified ui->SetBackground(RecoveryUI::NO_COMMAND); } |