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

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

Merge "Revert "Revert "adbd: switch the default USB implementation.""" am: f97193d9 

am: d9e34215

Change-Id: I1a742436986ce08235f1d6b5901afd3a33f26d2b
parents 3642244f d9e34215

adb/daemon/usb.cpp

+4 −3
Original line number Diff line number Diff line
@@ -654,9 +654,10 @@ static void usb_ffs_open_thread() { 
}



void usb_init() {

    if (!android::base::GetBoolProperty("persist.adb.nonblocking_ffs", false)) {

        usb_init_legacy();

    } else {

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

    if (use_nonblocking) {

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

    } else {

        usb_init_legacy();

    }

}