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

Commit b3b43be6 authored by Josh Gao's avatar Josh Gao
Browse files

Revert "Reland "adb: daemon: Assign valid fd to usb_handle ep0 file descriptor"" 

This reverts commit d9684d59.

This seems to be correlated with an increase in the rate of devices
going offline. Revert it to see if failure rates improve.

Bug: http://b/150863651
Test: treehugger
Change-Id: Ia6163fd9e31d2bf812628e028249662594ac2024
parent 04e3790d

adb/daemon/usb_ffs.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -300,7 +300,6 @@ bool open_functionfs(android::base::unique_fd* out_control, android::base::uniqu 
        }

        }

        // Signal only when writing the descriptors to ffs

        // Signal only when writing the descriptors to ffs

        android::base::SetProperty("sys.usb.ffs.ready", "1");

        android::base::SetProperty("sys.usb.ffs.ready", "1");

        *out_control = std::move(control);

    }

    }





    bulk_out.reset(adb_open(USB_FFS_ADB_OUT, O_RDONLY));

    bulk_out.reset(adb_open(USB_FFS_ADB_OUT, O_RDONLY));
@@ -315,6 +314,7 @@ bool open_functionfs(android::base::unique_fd* out_control, android::base::uniqu 
        return false;

        return false;

    }

    }





    *out_control = std::move(control);

    *out_bulk_in = std::move(bulk_in);

    *out_bulk_in = std::move(bulk_in);

    *out_bulk_out = std::move(bulk_out);

    *out_bulk_out = std::move(bulk_out);

    return true;

    return true;