commit fdbcee5903aa5b97101bd6cef9ff0069cc6a3efd
author qctecmdr <qctecmdr@localhost> Wed Mar 29 05:34:35 2023 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Mar 29 05:34:35 2023 -0700
tree 6a79a57260decc5acc4bdcf17884b4ca134ffce1
parent cf5c2dd33116f0cac51fa24a13ea46dedec1c047
parent 772c2eec50144dc7976e8e3a0cbc176665c40c3a

Merge "sdm: handle power on during TUITransitionEnd"

composer/hwc_session.cpp

diff --git a/composer/hwc_session.cpp b/composer/hwc_session.cpp
index 03920fa..9204192 100644
--- a/composer/hwc_session.cpp
+++ b/composer/hwc_session.cpp
@@ -4059,7 +4059,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;
 }
 
@@ -4290,7 +4290,7 @@
         DLOGE("Device unassign failed with error %d", ret);
       }
       TUITransitionUnPrepare(disp_id);
-      return -EINVAL;
+      return 0;
     }
   }
 
@@ -4329,6 +4329,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) {