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

Commit f31a12aa authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

Merge "adbd: support ro.adb.nonblocking_ffs." am: affe3514 am: c94cec6d 

am: 1e43373c

Change-Id: Icdafb535240608d0e7ba927583c79199ef78747a
parents 7d95981d 1e43373c

adb/daemon/usb.cpp

+4 −1
Original line number Diff line number Diff line
@@ -640,7 +640,10 @@ static void usb_ffs_open_thread() { 
}



void usb_init() {

    bool use_nonblocking = android::base::GetBoolProperty("persist.adb.nonblocking_ffs", true);

    bool use_nonblocking = android::base::GetBoolProperty(

            "persist.adb.nonblocking_ffs",

            android::base::GetBoolProperty("ro.adb.nonblocking_ffs", true));



    if (use_nonblocking) {

        std::thread(usb_ffs_open_thread).detach();

    } else {