Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 604622cb authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

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

am: a2f1e65d

* commit 'a2f1e65d':
  healthd: Track the API change of res_create_multi_display_surface().
parents 9369c576 a2f1e65d

healthd/healthd_mode_charger.cpp

+4 −1
Original line number Original line Diff line number Diff line
@@ -699,7 +699,10 @@ void healthd_mode_charger_init(struct healthd_config* config) 




    GRSurface** scale_frames;

    GRSurface** scale_frames;

    int scale_count;

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

    if (ret < 0) {

        LOGE("Cannot load battery_scale image\n");

        LOGE("Cannot load battery_scale image\n");

        charger->batt_anim->num_frames = 0;

        charger->batt_anim->num_frames = 0;