commit a2403916992147d6c3638da526ad64ee8312f4b6
author Linux Build Service Account <lnxbuild@localhost> Sun Mar 26 02:42:28 2023 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sun Mar 26 02:42:28 2023 -0700
tree 0060f6573d20163b9b90d1b3b670c52afdbfe544
parent db261daec13f3723245948f172f49fc86ad2912e
parent 1e6f31d0a9f291eed67f3732d36bd6e8c96d33d0

Merge "sdm: handle power on during TUITransitionEnd" into display.lnx.9.0.r1-rel

composer/hwc_session.cpp

diff --git a/composer/hwc_session.cpp b/composer/hwc_session.cpp
index d576bb9..f4e8c2b 100644
--- a/composer/hwc_session.cpp
+++ b/composer/hwc_session.cpp
@@ -4116,7 +4116,7 @@
                                       return session->WaitForCommitDone(display, client_id);
                                      }, this, display, client_id);
   auto ret = (commit_done_future_[display].wait_for(span) == std::future_status::timeout) ?
-             -EINVAL : commit_done_future_[display].get();
+             -ETIMEDOUT : commit_done_future_[display].get();
   return ret;
 }
 
@@ -4347,7 +4347,7 @@
         DLOGE("Device unassign failed with error %d", ret);
       }
       TUITransitionUnPrepare(disp_id);
-      return -EINVAL;
+      return 0;
     }
   }
 
@@ -4386,6 +4386,9 @@
   for (auto &info : map_info) {
     bool needs_refresh = false;
     {
+      if (info.client_id == target_display) {
+        continue;
+      }
       SEQUENCE_WAIT_SCOPE_LOCK(locker_[info.client_id]);
       if (hwc_display_[info.client_id]) {
         if (info.disp_type == kPluggable && pending_hotplug_event_ == kHotPlugEvent) {