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-05-23 17:30:16 -0700
commitac2aa7d7b1ec4c292c0f9061fa758c61974d4ca0 (patch)
tree4547fa9c5748b14cc381830970af4c6077740e66 /healthd
parent428a6ffaf8fb3b9420180a6f54ad4e0f229c96d7 (diff)
downloadsystem_core-ac2aa7d7b1ec4c292c0f9061fa758c61974d4ca0.tar.gz
system_core-ac2aa7d7b1ec4c292c0f9061fa758c61974d4ca0.tar.bz2
system_core-ac2aa7d7b1ec4c292c0f9061fa758c61974d4ca0.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 61e746571..56a9f8691 100644
--- a/healthd/healthd_mode_charger.cpp
+++ b/healthd/healthd_mode_charger.cpp
@@ -308,6 +308,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);
@@ -331,9 +334,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);
@@ -635,7 +635,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");