commit 80ac4ea495e33ce0e645eb9aeb57355a06a10ed2
author qctecmdr <qctecmdr@localhost> Fri Sep 23 07:51:01 2022 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Sep 23 07:51:01 2022 -0700
tree 2f961b0a771fdf20d08c29f1001ecdd32b6dc182
parent dd3afffa70b8c2940586db0679091b4ba3666ca9
parent 43bae52708d450ed48e91daf88ed1751f71ce801

Merge "composer: Reset TUI event if other display is off"

composer/hwc_display.cpp

diff --git a/composer/hwc_display.cpp b/composer/hwc_display.cpp
index 88e71db..0717993 100644
--- a/composer/hwc_display.cpp
+++ b/composer/hwc_display.cpp
@@ -3128,6 +3128,10 @@
   if (secure_event == kTUITransitionEnd || secure_event == kTUITransitionUnPrepare) {
     DLOGI("Resume display %d-%d",  sdm_id_, type_);
     display_paused_ = false;
+    if (*needs_refresh == false) {
+      secure_event_ = kSecureEventMax;
+      return kErrorNone;
+    }
   } else if (secure_event == kTUITransitionPrepare || secure_event == kTUITransitionStart) {
     if (*needs_refresh) {
       display_pause_pending_ = true;

sdm/libs/core/display_base.cpp

diff --git a/sdm/libs/core/display_base.cpp b/sdm/libs/core/display_base.cpp
index 03dba0e..ee063c0 100644
--- a/sdm/libs/core/display_base.cpp
+++ b/sdm/libs/core/display_base.cpp
@@ -3837,6 +3837,9 @@
         return err;
       }
     }
+    if (state == kStateOff) {
+      *needs_refresh = false;
+    }
   }
   if (*needs_refresh) {
     validated_ = false;