summaryrefslogtreecommitdiffstats
path: root/screen_ui.cpp
diff options
context:
space:
mode:
authorSen Jiang <senj@google.com>2016-12-10 01:20:49 +0100
committerSen Jiang <senj@google.com>2016-12-13 22:29:33 +0100
commitd530449e54bd327e9c26209ffa0490c6508afe6c (patch)
tree0b1d25af5cad4e0e4b1035b5dad3a86c06835e0a /screen_ui.cpp
parentMerge "clang-format: Adjust short functions / if settings." (diff)
downloadandroid_bootable_recovery-d530449e54bd327e9c26209ffa0490c6508afe6c.tar
android_bootable_recovery-d530449e54bd327e9c26209ffa0490c6508afe6c.tar.gz
android_bootable_recovery-d530449e54bd327e9c26209ffa0490c6508afe6c.tar.bz2
android_bootable_recovery-d530449e54bd327e9c26209ffa0490c6508afe6c.tar.lz
android_bootable_recovery-d530449e54bd327e9c26209ffa0490c6508afe6c.tar.xz
android_bootable_recovery-d530449e54bd327e9c26209ffa0490c6508afe6c.tar.zst
android_bootable_recovery-d530449e54bd327e9c26209ffa0490c6508afe6c.zip
Diffstat (limited to '')
-rw-r--r--screen_ui.cpp15
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() {