ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
am: 06e6b8551a

Change-Id: I569e3564d78636b1f79d4c20a161ff1120b94276
This commit is contained in:
Mark Salyzyn 2019-03-18 14:11:10 -07:00 • committed by android-build-merger
commit 25ccd57180
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
init/first_stage_mount.cpp
View file

@ -580,7 +580,14 @@ bool FirstStageMount::MountPartitions() {
required_devices_partition_names_.emplace(basename(device.c_str())); required_devices_partition_names_.emplace(basename(device.c_str()));
auto uevent_callback = [this](const Uevent& uevent) { return UeventCallback(uevent); }; auto uevent_callback = [this](const Uevent& uevent) { return UeventCallback(uevent); };
uevent_listener_.RegenerateUevents(uevent_callback); 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 { } else {
InitMappedDevice(device); InitMappedDevice(device);
} }