summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2018-06-14 06:17:06 +0200
committerandroid-build-merger <android-build-merger@google.com>2018-06-14 06:17:06 +0200
commita17782bbf8f07867e44a74cebec7a4fbbf819dd2 (patch)
treedfe3df8df801887980c7893f04744603c89adff4
parentMerge "screen_ui: Call gr_exit() from dtor." am: 4cd2cf96a0 (diff)
parentMerge "screen_ui: Move the call to gr_init() into Init()." (diff)
downloadandroid_bootable_recovery-a17782bbf8f07867e44a74cebec7a4fbbf819dd2.tar
android_bootable_recovery-a17782bbf8f07867e44a74cebec7a4fbbf819dd2.tar.gz
android_bootable_recovery-a17782bbf8f07867e44a74cebec7a4fbbf819dd2.tar.bz2
android_bootable_recovery-a17782bbf8f07867e44a74cebec7a4fbbf819dd2.tar.lz
android_bootable_recovery-a17782bbf8f07867e44a74cebec7a4fbbf819dd2.tar.xz
android_bootable_recovery-a17782bbf8f07867e44a74cebec7a4fbbf819dd2.tar.zst
android_bootable_recovery-a17782bbf8f07867e44a74cebec7a4fbbf819dd2.zip
-rw-r--r--screen_ui.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/screen_ui.cpp b/screen_ui.cpp
index e8444b6ca..f9c4a06c1 100644
--- a/screen_ui.cpp
+++ b/screen_ui.cpp
@@ -702,10 +702,10 @@ void ScreenRecoveryUI::SetSystemUpdateText(bool security_update) {
}
bool ScreenRecoveryUI::InitTextParams() {
- if (gr_init() < 0) {
+ // gr_init() would return successfully on font initialization failure.
+ if (gr_sys_font() == nullptr) {
return false;
}
-
gr_font_size(gr_sys_font(), &char_width_, &char_height_);
text_rows_ = (ScreenHeight() - kMarginHeight * 2) / char_height_;
text_cols_ = (ScreenWidth() - kMarginWidth * 2) / char_width_;
@@ -715,6 +715,10 @@ bool ScreenRecoveryUI::InitTextParams() {
bool ScreenRecoveryUI::Init(const std::string& locale) {
RecoveryUI::Init(locale);
+ if (gr_init() == -1) {
+ return false;
+ }
+
if (!InitTextParams()) {
return false;
}