summaryrefslogtreecommitdiffstats
path: root/healthd
diff options
context:
space:
mode:
authorThierry Strudel <tstrudel@google.com>2018-05-23 15:48:46 -0700
committerThierry Strudel <tstrudel@google.com>2018-07-30 00:18:06 -0700
commit2cbe2c7b29b90e71dcaf3820071a62b31e6faa51 (patch)
tree313e20cf3308d9fd9d2f7fc6cc643bbf14f21fd3 /healthd
parent2756339c77154d528ead079edddbbe6babc76325 (diff)
downloadsystem_core-2cbe2c7b29b90e71dcaf3820071a62b31e6faa51.tar.gz
system_core-2cbe2c7b29b90e71dcaf3820071a62b31e6faa51.tar.bz2
system_core-2cbe2c7b29b90e71dcaf3820071a62b31e6faa51.zip
healthd_mode_charger: unblank the screen only on first frame
Original code is unblank screen for all frames of the first cycle, unblank is needed only before the first frame of the first cycle. Bug: 74771887 Change-Id: I51d8390e359335a0b1cb127b096db1a8b889b169 Signed-off-by: Thierry Strudel <tstrudel@google.com>
Diffstat (limited to 'healthd')
-rw-r--r--healthd/healthd_mode_charger.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/healthd/healthd_mode_charger.cpp b/healthd/healthd_mode_charger.cpp
index 4f77e7a1e..f1fe5cd21 100644
--- a/healthd/healthd_mode_charger.cpp
+++ b/healthd/healthd_mode_charger.cpp
@@ -307,6 +307,9 @@ static void update_screen_state(charger* charger, int64_t now) {
disp_time = batt_anim->frames[batt_anim->cur_frame].disp_time;
+ /* unblank the screen on first cycle and first frame */
+ if (batt_anim->cur_cycle == 0 && batt_anim->cur_frame == 0) healthd_draw->blank_screen(false);
+
/* animation starting, set up the animation */
if (batt_anim->cur_frame == 0) {
LOGV("[%" PRId64 "] animation starting\n", now);
@@ -330,9 +333,6 @@ static void update_screen_state(charger* charger, int64_t now) {
}
}
- /* unblank the screen on first cycle */
- if (batt_anim->cur_cycle == 0) healthd_draw->blank_screen(false);
-
/* draw the new frame (@ cur_frame) */
healthd_draw->redraw_screen(charger->batt_anim, charger->surf_unknown);
@@ -632,7 +632,7 @@ void healthd_mode_charger_init(struct healthd_config* config) {
ret = res_create_display_surface(anim->fail_file.c_str(), &charger->surf_unknown);
if (ret < 0) {
- LOGE("Cannot load custom battery_fail image. Reverting to built in.\n");
+ LOGE("Cannot load custom battery_fail image. Reverting to built in: %d\n", ret);
ret = res_create_display_surface("charger/battery_fail", &charger->surf_unknown);
if (ret < 0) {
LOGE("Cannot load built in battery_fail image\n");