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

Commit 8cd08557 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "charger: fix secondary display not turning off after first display was off" am: e18dd44f 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2199477



Change-Id: I11d8d878d1d41060f1dc7997dc024d50e59a2c3f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 298e4b84 e18dd44f

healthd/healthd_draw.cpp

+6 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ void HealthdDraw::blank_screen(bool blank, int drm) { 
    gr_fb_blank(blank, drm);

}



/* support screen rotation for foldable phone */

// support screen rotation for foldable phone

void HealthdDraw::rotate_screen(int drm) {

    if (!graphics_available) return;

    if (drm == 0)
@@ -108,6 +108,11 @@ void HealthdDraw::rotate_screen(int drm) { 
        gr_rotate(GRRotation::NONE /* Portrait mode */);

}



// detect dual display

bool HealthdDraw::has_multiple_connectors() {

    return graphics_available && gr_has_multiple_connectors();

}



void HealthdDraw::clear_screen(void) {

    if (!graphics_available) return;

    gr_color(0, 0, 0, 255);

healthd/healthd_draw.h

+3 −0
Original line number Diff line number Diff line
@@ -38,6 +38,9 @@ class HealthdDraw { 
  // Rotate screen.

  virtual void rotate_screen(int drm);



  // Detect dual display

  virtual bool has_multiple_connectors();



  static std::unique_ptr<HealthdDraw> Create(animation *anim);



 protected:

healthd/healthd_mode_charger.cpp

+15 −0
Original line number Diff line number Diff line
@@ -289,6 +289,18 @@ static void reset_animation(animation* anim) { 
    anim->run = false;

}



void Charger::BlankSecScreen() {

    int drm = drm_ == DRM_INNER ? 1 : 0;



    if (!init_screen_) {

        /* blank the secondary screen */

        healthd_draw_->blank_screen(false, drm);

        healthd_draw_->redraw_screen(&batt_anim_, surf_unknown_);

        healthd_draw_->blank_screen(true, drm);

        init_screen_ = true;

    }

}



void Charger::UpdateScreenState(int64_t now) {

    int disp_time;
@@ -315,6 +327,9 @@ void Charger::UpdateScreenState(int64_t now) { 
        reset_animation(&batt_anim_);

        next_screen_transition_ = -1;

        healthd_draw_->blank_screen(true, static_cast<int>(drm_));

        if (healthd_draw_->has_multiple_connectors()) {

            BlankSecScreen();

        }

        screen_blanked_ = true;

        LOGV("[%" PRId64 "] animation done\n", now);

        if (configuration_->ChargerIsOnline()) {

healthd/include_charger/charger/healthd_mode_charger.h

+2 −0
Original line number Diff line number Diff line
@@ -108,9 +108,11 @@ class Charger { 
    void InitAnimation();

    int RequestEnableSuspend();

    int RequestDisableSuspend();

    void BlankSecScreen();



    bool have_battery_state_ = false;

    bool screen_blanked_ = false;

    bool init_screen_ = false;

    int64_t next_screen_transition_ = 0;

    int64_t next_key_check_ = 0;

    int64_t next_pwr_check_ = 0;