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

Commit 57169537 authored by Josh Gao's avatar Josh Gao Committed by Automerger Merge Worker
Browse files

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

Merge "Revert "Reland "adb: daemon: Assign valid fd to usb_handle ep0 file descriptor""" into rvc-dev am: 60375b7c

Change-Id: I5d42da9d5a9143f3ca0b38ab8a4f374f6a1e80be
parents 3af4fd42 60375b7c

adb/daemon/usb_ffs.cpp

+1 −1
Original line number 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

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

        *out_control = std::move(control);

    }



    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;

    }



    *out_control = std::move(control);

    *out_bulk_in = std::move(bulk_in);

    *out_bulk_out = std::move(bulk_out);

    return true;