Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5d05a12 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "Check if we need to Poll for devices after RegenerateUevents" am: 06e6b855 

am: 25ccd571

Change-Id: Ie42f56d0d4af3a6b18f0afdd1b4667fcd5bfd97a
parents 507be15c 25ccd571

init/first_stage_mount.cpp

+8 −1
Original line number Diff line number Diff line
@@ -580,7 +580,14 @@ bool FirstStageMount::MountPartitions() { 
            required_devices_partition_names_.emplace(basename(device.c_str()));

            auto uevent_callback = [this](const Uevent& uevent) { return UeventCallback(uevent); };

            uevent_listener_.RegenerateUevents(uevent_callback);

            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);

        }