commit a2f1e65d1309706928729e94119d248e25504a20
author Tao Bao <tbao@google.com> Fri Dec 18 22:20:32 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 18 22:20:32 2015 +0000
tree bbefc6068373583666a5e6c61c468fdaf357370c
parent c57c622e7687ea82ab1de7581b27f068ebe3a9ad
parent 0db80236f387aed9740f9765a65699827660059d

Merge "healthd: Track the API change of res_create_multi_display_surface()."

healthd/healthd_mode_charger.cpp

diff --git a/healthd/healthd_mode_charger.cpp b/healthd/healthd_mode_charger.cpp
index 6800ad2..46bad4e 100644
--- a/healthd/healthd_mode_charger.cpp
+++ b/healthd/healthd_mode_charger.cpp
@@ -699,7 +699,10 @@
 
     GRSurface** scale_frames;
     int scale_count;
-    ret = res_create_multi_display_surface("charger/battery_scale", &scale_count, &scale_frames);
+    int scale_fps;  // Not in use (charger/battery_scale doesn't have FPS text
+                    // chunk). We are using hard-coded frame.disp_time instead.
+    ret = res_create_multi_display_surface("charger/battery_scale", &scale_count, &scale_fps,
+                                           &scale_frames);
     if (ret < 0) {
         LOGE("Cannot load battery_scale image\n");
         charger->batt_anim->num_frames = 0;