diff options
author | Sen Jiang <senj@google.com> | 2016-12-14 23:07:46 +0100 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-12-14 23:07:46 +0100 |
commit | ef45a88680ee00fe2283ee68dab884b150dc45ab (patch) | |
tree | 6066d58e37b89d85081c1f32ca5b406437b159fa /screen_ui.cpp | |
parent | Merge "updater: Fix the operator order." am: 2bb3a2270e (diff) | |
parent | Merge "Add a stub recovery UI." (diff) | |
download | android_bootable_recovery-ef45a88680ee00fe2283ee68dab884b150dc45ab.tar android_bootable_recovery-ef45a88680ee00fe2283ee68dab884b150dc45ab.tar.gz android_bootable_recovery-ef45a88680ee00fe2283ee68dab884b150dc45ab.tar.bz2 android_bootable_recovery-ef45a88680ee00fe2283ee68dab884b150dc45ab.tar.lz android_bootable_recovery-ef45a88680ee00fe2283ee68dab884b150dc45ab.tar.xz android_bootable_recovery-ef45a88680ee00fe2283ee68dab884b150dc45ab.tar.zst android_bootable_recovery-ef45a88680ee00fe2283ee68dab884b150dc45ab.zip |
Diffstat (limited to '')
-rw-r--r-- | screen_ui.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/screen_ui.cpp b/screen_ui.cpp index a7b03c50d..5b9e5a5a9 100644 --- a/screen_ui.cpp +++ b/screen_ui.cpp @@ -448,17 +448,22 @@ void ScreenRecoveryUI::SetSystemUpdateText(bool security_update) { Redraw(); } -void ScreenRecoveryUI::InitTextParams() { - gr_init(); +bool ScreenRecoveryUI::InitTextParams() { + if (gr_init() < 0) { + return false; + } gr_font_size(gr_sys_font(), &char_width_, &char_height_); text_rows_ = gr_fb_height() / char_height_; text_cols_ = gr_fb_width() / char_width_; + return true; } -void ScreenRecoveryUI::Init() { +bool ScreenRecoveryUI::Init() { RecoveryUI::Init(); - InitTextParams(); + if (!InitTextParams()) { + return false; + } density_ = static_cast<float>(android::base::GetIntProperty("ro.sf.lcd_density", 160)) / 160.f; @@ -493,6 +498,8 @@ void ScreenRecoveryUI::Init() { LoadAnimation(); pthread_create(&progress_thread_, nullptr, ProgressThreadStartRoutine, this); + + return true; } void ScreenRecoveryUI::LoadAnimation() { |