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

Commit 74521c93 authored by Siqi Lin's avatar Siqi Lin Committed by android-build-merger
Browse files

Revert "adb: close ep0 on disconnection." 

am: 57de0514

* commit '57de0514':
  Revert "adb: close ep0 on disconnection."

Change-Id: I5a5b577579a9e00b814ce956461e0c983cfb47ba
parents a06dc0bb 57de0514

adb/usb_linux_client.cpp

+25 −24
Original line number Diff line number Diff line
@@ -400,6 +400,7 @@ static bool init_functionfs(struct usb_handle *h) 
    v2_descriptor.os_header = os_desc_header;

    v2_descriptor.os_desc = os_desc_compat;



    if (h->control < 0) { // might have already done this before

        D("OPENING %s", USB_FFS_ADB_EP0);

        h->control = adb_open(USB_FFS_ADB_EP0, O_RDWR);

        if (h->control < 0) {
@@ -428,6 +429,7 @@ static bool init_functionfs(struct usb_handle *h) 
            D("[ %s: writing strings failed: errno=%d]", USB_FFS_ADB_EP0, errno);

            goto err;

        }

    }



    h->bulk_out = adb_open(USB_FFS_ADB_OUT, O_RDWR);

    if (h->bulk_out < 0) {
@@ -554,7 +556,6 @@ static void usb_ffs_close(usb_handle *h) { 
    h->kicked = false;

    adb_close(h->bulk_out);

    adb_close(h->bulk_in);

    adb_close(h->control);

    // Notify usb_adb_open_thread to open a new connection.

    adb_mutex_lock(&h->lock);

    h->open_new_connection = true;