commit 5e592083b5fd40becc080884ef9a510dd5290d56
author Elliott Hughes <enh@google.com> Wed Apr 15 12:15:00 2015 -0700
committer Elliott Hughes <enh@google.com> Wed Apr 15 12:15:00 2015 -0700
tree 8d00fe12edae5611eab5b10375c529d848a421d0
parent f4887de4c7464e0a9bf9e885aea2816229d669f7
parent c55d837218b589d3ec832ca788c1eb0089547d64

resolved conflicts for merge of 6e9b28b2 to master

Change-Id: Icd1bbc33283c504691934256a4cf5989868d3caf

healthd/healthd_mode_charger.cpp

diff --git a/healthd/healthd_mode_charger.cpp b/healthd/healthd_mode_charger.cpp
index 352510b..6800ad2 100644
--- a/healthd/healthd_mode_charger.cpp
+++ b/healthd/healthd_mode_charger.cpp
@@ -88,7 +88,7 @@
     int min_capacity;
     bool level_only;
 
-    gr_surface surface;
+    GRSurface* surface;
 };
 
 struct animation {
@@ -115,7 +115,7 @@
     struct key_state keys[KEY_MAX + 1];
 
     struct animation *batt_anim;
-    gr_surface surf_unknown;
+    GRSurface* surf_unknown;
     int boot_min_cap;
 };
 
@@ -274,7 +274,7 @@
 }
 
 /* returns the last y-offset of where the surface ends */
-static int draw_surface_centered(struct charger* /*charger*/, gr_surface surface)
+static int draw_surface_centered(struct charger* /*charger*/, GRSurface* surface)
 {
     int w;
     int h;
@@ -697,7 +697,7 @@
 
     charger->batt_anim = &battery_animation;
 
-    gr_surface* scale_frames;
+    GRSurface** scale_frames;
     int scale_count;
     ret = res_create_multi_display_surface("charger/battery_scale", &scale_count, &scale_frames);
     if (ret < 0) {