commit 15d1167815010eb2d4331b18a18f1fc9afb13342
author Daniel Colascione <dancol@google.com> Tue Nov 05 15:56:21 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Nov 05 15:56:21 2019 -0800
tree 4bea9dd03832d7834ab4415678e5d756e92d1246
parent 111139d1eb0b1fe1724edcc81073e764cc424376
parent 764be4908b6fbd2a15d0acad03d55fa803171c26

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

Change-Id: I0f687584e247d339952794713c0a5a7d7c62127a

adb/client/usb_linux.cpp

diff --git a/adb/client/usb_linux.cpp b/adb/client/usb_linux.cpp
index 24e722e..343e7b5 100644
--- a/adb/client/usb_linux.cpp
+++ b/adb/client/usb_linux.cpp
@@ -609,6 +609,7 @@
     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

diff --git a/adb/client/usb_osx.cpp b/adb/client/usb_osx.cpp
index 5c0da47..7207ca7 100644
--- a/adb/client/usb_osx.cpp
+++ b/adb/client/usb_osx.cpp
@@ -461,6 +461,7 @@
             std::this_thread::sleep_for(100ms);
         }
 
+        adb_notify_device_scan_complete();
         initialized = true;
     }
 }

adb/client/usb_windows.cpp

diff --git a/adb/client/usb_windows.cpp b/adb/client/usb_windows.cpp
index f23c3a5..197c6fa 100644
--- a/adb/client/usb_windows.cpp
+++ b/adb/client/usb_windows.cpp
@@ -172,6 +172,7 @@
 
     while (true) {
         find_devices();
+        adb_notify_device_scan_complete();
         std::this_thread::sleep_for(1s);
     }
 }