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

Commit f9254243 authored by Daniel Colascione's avatar Daniel Colascione Committed by android-build-merger
Browse files

Merge "Properly finish daemon init when initial USB scan complete" am: 2aabeed1 am: 2bbce946 

am: 1c844aee

Change-Id: I2fa1a52900ab9ed5ae86e44300aa7747dc912207
parents f73cc175 1c844aee

adb/client/usb_linux.cpp

+1 −0
Original line number Diff line number Diff line
@@ -609,6 +609,7 @@ static void device_poll_thread() { 
    while (true) {

        // TODO: Use inotify.

        find_usb_device("/dev/bus/usb", register_device);

        adb_notify_device_scan_complete();

        kick_disconnected_devices();

        std::this_thread::sleep_for(1s);

    }

adb/client/usb_osx.cpp

+1 −0
Original line number Diff line number Diff line
@@ -461,6 +461,7 @@ void usb_init() { 
            std::this_thread::sleep_for(100ms);

        }



        adb_notify_device_scan_complete();

        initialized = true;

    }

}

adb/client/usb_windows.cpp

+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ void device_poll_thread() { 


    while (true) {

        find_devices();

        adb_notify_device_scan_complete();

        std::this_thread::sleep_for(1s);

    }

}