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

Commit b2d79c5e authored by Hemant Kumar's avatar Hemant Kumar Committed by Josh Gao
Browse files

adb: daemon: Assign valid fd to usb_handle ep0 file descriptor 

Bug: http://b/129283234
Test: treehugger
Change-Id: I2d005e17ccb45af95351c074cc53f6cfc53b5fdd
Merged-In: I2d005e17ccb45af95351c074cc53f6cfc53b5fdd
(cherry picked from commit 1cbe5edb)
parent 4e5fddd5

adb/daemon/usb_ffs.cpp

+1 −1
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ 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));
@@ -271,7 +272,6 @@ 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;