commit 896e512225a9ac5ebcea37564a7da8c1e3881f93
author Mark Salyzyn <salyzyn@google.com> Wed Sep 07 19:30:22 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 07 19:30:22 2016 +0000
tree b8bfe30a59dad45ddbe9c79c3aaa6d1c2b05d5d4
parent 4bde7c2d94dd5196e29c5bcd7862afc0fe16a726
parent b9ebcf93947407a255f8e62e314dbcd927552a57

liblog: add __android_log_close() am: 2d14969155 am: 3b2fa3eaef am: 7b16dcf969 am: 94ebdd6b39 am: 5f04ac60d6 am: 4d12c20a5e am: e09c5d2ce4 am: 68afb4588f  -s ours am: 3213ec221c am: c006a8c832
am: 9a94f3b1e3

Change-Id: Icb2157e6712fb2cc7d6cc5176a0ec85a43152d56

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