| commit | 14f6c6c1bdae13ff6ecdb68ccab3908a66fc9e34 | [log] [tgz] |
|---|---|---|
| author | Jason Macnak <natsu@google.com> | Wed Jan 26 20:43:38 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 26 20:43:38 2022 +0000 |
| tree | dab8a2b6b8260fdc552ed780aef4e59a9f940bb8 | |
| parent | 37e3612932ab0d98ce58f46733205ac3fedd97f6 [diff] | |
| parent | 16d955d1a31715cda1d51b349bbe4680b5d64678 [diff] |
Merge remote-tracking branch 'aosp/upstream-main' into 'aosp/master' am: e6295d18ec am: 5fb10fe25e am: f5cd75234b am: 16d955d1a3 Original change: https://android-review.googlesource.com/c/platform/external/drm_hwcomposer/+/1960322 Change-Id: I3e0778df499529a520dac41db62620f595382295
diff --git a/drm/VSyncWorker.cpp b/drm/VSyncWorker.cpp index 8d1cb99..dc52450 100644 --- a/drm/VSyncWorker.cpp +++ b/drm/VSyncWorker.cpp
@@ -101,7 +101,7 @@ vsync.tv_nsec = int(phased_timestamp - (vsync.tv_sec * kOneSecondNs)); do { ret = clock_nanosleep(CLOCK_MONOTONIC, TIMER_ABSTIME, &vsync, nullptr); - } while (ret == -1 && errno == EINTR); + } while (ret == EINTR); if (ret) return ret;