commit 392676c1a12a9a5b9e96e0fb37bafafcc84ad7b1
author Narayan Kamath <narayan@google.com> Wed Sep 07 19:30:23 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 07 19:30:23 2016 +0000
tree b8bfe30a59dad45ddbe9c79c3aaa6d1c2b05d5d4
parent 896e512225a9ac5ebcea37564a7da8c1e3881f93
parent 3ff62f7b0d9d25e79e9884719dd91ac3d2353bf9

Merge "liblog: add __android_log_close()" into lmp-dev am: 0414412007 am: 2f16f2b9b3 am: 0f6c4a0e8f am: ffb34de445 am: baa3f2bdb2 am: 8013db9c75 am: a55e9f01fb am: e5a1c7d8e4 am: ed4d8ac634 am: 309dde12b3
am: e3b604de11

Change-Id: I369c4b721fc802673b345bd6e341c4f588f59618

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);