commit 667961b4aada3bfc89036161e8e62edc45520151
author Mark Salyzyn <salyzyn@google.com> Thu Sep 08 09:26:35 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 08 09:26:35 2016 +0000
tree 99788e2414f66113c8f998a7f4e80a8a2c7ab415
parent 1cb7fff695b73830784aa08f5096417cd88b823f
parent 163216a415948c17698493b3c4bc667668df11ce

liblog: add __android_log_close() am: b1b5d507cb am: f72c9bc42d am: 49d5582f29 am: 1b1b6a4889  -s ours am: 4eb04cb32b am: 38f72ac44a
am: c11b9e1e31

Change-Id: I88d0778c99f77aaf61e20a0b9e7dfef906a61c3a

healthd/healthd_mode_charger.cpp

diff --git a/healthd/healthd_mode_charger.cpp b/healthd/healthd_mode_charger.cpp
index 5846626..66f9271 100644
--- a/healthd/healthd_mode_charger.cpp
+++ b/healthd/healthd_mode_charger.cpp
@@ -257,13 +257,13 @@
 
 static int draw_text(const char *str, int x, int y)
 {
-    int str_len_px = gr_measure(str);
+    int str_len_px = gr_measure(gr_sys_font(), str);
 
     if (x < 0)
         x = (gr_fb_width() - str_len_px) / 2;
     if (y < 0)
         y = (gr_fb_height() - char_height) / 2;
-    gr_text(x, y, str, 0);
+    gr_text(gr_sys_font(), x, y, str, 0);
 
     return y + char_height;
 }
@@ -364,7 +364,7 @@
         }
 
         gr_init();
-        gr_font_size(&char_width, &char_height);
+        gr_font_size(gr_sys_font(), &char_width, &char_height);
 
 #ifndef CHARGER_DISABLE_INIT_BLANK
         gr_fb_blank(true);