commit e8b4e700b8950a07ea4155a31b742254002b7fad
author Xin Li <delphij@google.com> Sat Aug 29 01:34:09 2020 -0700
committer Xin Li <delphij@google.com> Sat Aug 29 01:34:09 2020 -0700
tree 2d41d10a4615e16694be0eb20487ce96a128e41c
parent 9592c9d586e606d0d762b4334981159d2236295b
parent 3fab51ee7064bc478ebaeadf068ceb628ca2365a

Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)

Bug: 166295507
Merged-In: I70ea776b8589ac3a7982c710c5c8b2941d86e55b
Change-Id: Ic1d535e9d2d6f80d95215240dbdb024995b045f8

libs/vr/libpdx/service_dispatcher.cpp

diff --git a/libs/vr/libpdx/service_dispatcher.cpp b/libs/vr/libpdx/service_dispatcher.cpp
index b112fa3..ba0d69c 100644
--- a/libs/vr/libpdx/service_dispatcher.cpp
+++ b/libs/vr/libpdx/service_dispatcher.cpp
@@ -92,9 +92,9 @@
   if (thread_count_ > 0)
     return -EBUSY;
 
-  epoll_event dummy;  // See BUGS in man 2 epoll_ctl.
+  epoll_event ee;  // See BUGS in man 2 epoll_ctl.
   if (epoll_ctl(epoll_fd_.Get(), EPOLL_CTL_DEL, service->endpoint()->epoll_fd(),
-                &dummy) < 0) {
+                &ee) < 0) {
     ALOGE("Failed to remove service from dispatcher because: %s\n",
           strerror(errno));
     return -errno;