summaryrefslogtreecommitdiffstats
path: root/screen_ui.cpp
diff options
context:
space:
mode:
authorSen Jiang <senj@google.com>2016-12-14 22:50:49 +0100
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-12-14 22:50:49 +0100
commit8c1584feaf72c088928104ca5d4da18cba31a7cc (patch)
treeeb2f2cab3101dbdba307df52910ee9d0fb8bbdf4 /screen_ui.cpp
parentMerge "updater: Fix the operator order." (diff)
parentAdd a stub recovery UI. (diff)
downloadandroid_bootable_recovery-8c1584feaf72c088928104ca5d4da18cba31a7cc.tar
android_bootable_recovery-8c1584feaf72c088928104ca5d4da18cba31a7cc.tar.gz
android_bootable_recovery-8c1584feaf72c088928104ca5d4da18cba31a7cc.tar.bz2
android_bootable_recovery-8c1584feaf72c088928104ca5d4da18cba31a7cc.tar.lz
android_bootable_recovery-8c1584feaf72c088928104ca5d4da18cba31a7cc.tar.xz
android_bootable_recovery-8c1584feaf72c088928104ca5d4da18cba31a7cc.tar.zst
android_bootable_recovery-8c1584feaf72c088928104ca5d4da18cba31a7cc.zip
Diffstat (limited to 'screen_ui.cpp')
-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() {