summaryrefslogtreecommitdiffstats
path: root/recovery.cpp
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2018-05-10 05:53:13 +0200
committerTao Bao <tbao@google.com>2018-05-10 06:22:26 +0200
commit551d2c3181b7c481b76a6a20dfadcd213455c9d2 (patch)
tree114915a36d07c85ec5c4276291ba37c19d2bb009 /recovery.cpp
parentMerge "screen_ui: Fix an issue when displaying wrapped text." (diff)
downloadandroid_bootable_recovery-551d2c3181b7c481b76a6a20dfadcd213455c9d2.tar
android_bootable_recovery-551d2c3181b7c481b76a6a20dfadcd213455c9d2.tar.gz
android_bootable_recovery-551d2c3181b7c481b76a6a20dfadcd213455c9d2.tar.bz2
android_bootable_recovery-551d2c3181b7c481b76a6a20dfadcd213455c9d2.tar.lz
android_bootable_recovery-551d2c3181b7c481b76a6a20dfadcd213455c9d2.tar.xz
android_bootable_recovery-551d2c3181b7c481b76a6a20dfadcd213455c9d2.tar.zst
android_bootable_recovery-551d2c3181b7c481b76a6a20dfadcd213455c9d2.zip
Diffstat (limited to 'recovery.cpp')
-rw-r--r--recovery.cpp20
1 files changed, 9 insertions, 11 deletions
diff --git a/recovery.cpp b/recovery.cpp
index 95118ffb6..b11298fb4 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -230,8 +230,8 @@ static void set_sdcard_update_bootloader_message() {
// Clear the recovery command and prepare to boot a (hopefully working) system,
// copy our log file to cache as well (for the system to read). This function is
// idempotent: call it as many times as you like.
-static void finish_recovery(Device* device) {
- std::string locale = device->GetUI()->GetLocale();
+static void finish_recovery() {
+ std::string locale = ui->GetLocale();
// Save the locale to cache, so if recovery is next started up without a '--locale' argument
// (e.g., directly from the bootloader) it will use the last-known locale.
if (!locale.empty() && has_cache) {
@@ -808,7 +808,7 @@ static int apply_from_sdcard(Device* device, bool* wipe_cache) {
// which is to reboot or shutdown depending on if the --shutdown_after flag was passed to recovery.
static Device::BuiltinAction prompt_and_wait(Device* device, int status) {
for (;;) {
- finish_recovery(device);
+ finish_recovery();
switch (status) {
case INSTALL_SUCCESS:
case INSTALL_NONE:
@@ -1173,16 +1173,14 @@ int start_recovery(int argc, char** argv) {
Device* device = make_device();
if (android::base::GetBoolProperty("ro.boot.quiescent", false)) {
printf("Quiescent recovery mode.\n");
- ui = new StubRecoveryUI();
+ device->ResetUI(new StubRecoveryUI());
} else {
- ui = device->GetUI();
-
- if (!ui->Init(locale)) {
- printf("Failed to initialize UI, use stub UI instead.\n");
- ui = new StubRecoveryUI();
+ if (!device->GetUI()->Init(locale)) {
+ printf("Failed to initialize UI; using stub UI instead.\n");
+ device->ResetUI(new StubRecoveryUI());
}
}
- device->SetUI(ui);
+ ui = device->GetUI();
// Set background string to "installing security update" for security update,
// otherwise set it to "installing system update".
@@ -1349,7 +1347,7 @@ int start_recovery(int argc, char** argv) {
}
// Save logs and clean up before rebooting or shutting down.
- finish_recovery(device);
+ finish_recovery();
switch (after) {
case Device::SHUTDOWN: