| commit | d1c37433d9a6f9467f50808620f7cad89998bbb6 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Nov 17 20:19:49 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 17 20:19:49 2021 +0000 |
| tree | 9a2f5e39f7f0ef57709e0340e1f494dac7ff3fe2 | |
| parent | 9aedd9f0c52c6f7342b62d5d912638eb26e40752 [diff] | |
| parent | 8fada8aa90879628b4ef609a96f1855aa5c7d466 [diff] |
[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: ac850066c3 -s ours am: 163d99edee -s ours am: 8fada8aa90 -s ours am skip reason: Merged-In I302491d47346aa48eebcac6498991fda95f62b58 with SHA-1 a976c15a02 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/drm_hwcomposer/+/16277420 Change-Id: Ib8f8630cd1c551ecb5bc4b98286733f3ad077d59
diff --git a/drm/VSyncWorker.cpp b/drm/VSyncWorker.cpp index 6e92838..ed5fd9b 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;