commit 4cbedee541d92b408c591e4fc16d88a0653c076c
author Sandeep Patil <sspatil@google.com> Wed Jun 21 13:02:57 2017 -0700
committer Sandeep Patil <sspatil@google.com> Wed Jun 21 15:04:57 2017 -0700
tree ff1e517d92a5bdfe306351e731c9959c9a7cf86d
parent cd2ba0d184c3fa9bbf0881a5d1fb3d3e205da1f9

Revert "Revert "init: poll in first stage mount if required devices are not found""

This reverts commit d6fccea093ebe5a5d929549d721185b0f1b52ac0.

Bug: 62681642
Bug: 62682821
Bug: 62864413

Change-Id: Ic9c27552acbd2ae312e44ea2cdf060dcf493bfe6
Signed-off-by: Sandeep Patil <sspatil@google.com>

init/ueventd.cpp

diff --git a/init/ueventd.cpp b/init/ueventd.cpp
index 28c1c07..4982b77 100644
--- a/init/ueventd.cpp
+++ b/init/ueventd.cpp
@@ -138,7 +138,7 @@
         HandleFirmwareEvent(uevent);
 
         uevent_queue_.emplace_back(std::move(uevent));
-        return RegenerationAction::kContinue;
+        return ListenerAction::kContinue;
     });
 }
 
@@ -266,9 +266,10 @@
         cold_boot.Run();
     }
 
-    uevent_listener.DoPolling([&device_handler](const Uevent& uevent) {
+    uevent_listener.Poll([&device_handler](const Uevent& uevent) {
         HandleFirmwareEvent(uevent);
         device_handler.HandleDeviceEvent(uevent);
+        return ListenerAction::kContinue;
     });
 
     return 0;