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

Commit 8fc9d258 authored by Yabin Cui's avatar Yabin Cui Committed by android-build-merger
Browse files

Merge "adb: close ep0 on disconnection." into nyc-dev 

am: fcab9a85

* commit 'fcab9a85':
  adb: close ep0 on disconnection.

Change-Id: I2597ec4471378b341ef92b6aa0362511e09ac3ac
parents 12f788e7 fcab9a85

adb/usb_linux_client.cpp

+24 −25
Original line number Diff line number Diff line
@@ -400,7 +400,6 @@ 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) {
@@ -429,7 +428,6 @@ 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) {
@@ -556,6 +554,7 @@ 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;