commit f0e97ac601446d6ef1a014b03e7c54f76830613c
author Treehugger Robot <treehugger-gerrit@google.com> Mon Mar 18 21:03:11 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 18 21:03:11 2019 +0000
tree dc59c16954c58247352431f77660a8ef0df5d755
parent 27db692634e48cf03083dffc8e61656d2970456e
parent 9cf7cc0f1842411e889d672dda744dc50a96530e

Merge "Check if we need to Poll for devices after RegenerateUevents"

init/first_stage_mount.cpp

diff --git a/init/first_stage_mount.cpp b/init/first_stage_mount.cpp
index 17cd470..4b0f05d 100644
--- a/init/first_stage_mount.cpp
+++ b/init/first_stage_mount.cpp
@@ -580,7 +580,14 @@
             required_devices_partition_names_.emplace(basename(device.c_str()));
             auto uevent_callback = [this](const Uevent& uevent) { return UeventCallback(uevent); };
             uevent_listener_.RegenerateUevents(uevent_callback);
-            uevent_listener_.Poll(uevent_callback, 10s);
+            if (!required_devices_partition_names_.empty()) {
+                uevent_listener_.Poll(uevent_callback, 10s);
+                if (!required_devices_partition_names_.empty()) {
+                    LOG(ERROR) << __PRETTY_FUNCTION__
+                               << ": partition(s) not found after polling timeout: "
+                               << android::base::Join(required_devices_partition_names_, ", ");
+                }
+            }
         } else {
             InitMappedDevice(device);
         }