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

Commit 006cf308 authored by Luis Hector Chavez's avatar Luis Hector Chavez Committed by android-build-merger
Browse files

Merge "adb: Open FunctionFS files with more restrictive access modes" am: f78ff013 

am: e74b0f22

Change-Id: I0d11be7750f0a05838ecb9b9accd02e6a0b0fb2f
parents 3c3e8ad0 e74b0f22

adb/daemon/usb.cpp

+3 −3
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ bool init_functionfs(struct usb_handle* h) { 


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

        LOG(INFO) << "opening control endpoint " << USB_FFS_ADB_EP0;

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

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

        if (h->control < 0) {

            PLOG(ERROR) << "cannot open control endpoint " << USB_FFS_ADB_EP0;

            goto err;
@@ -300,13 +300,13 @@ bool init_functionfs(struct usb_handle* h) { 
        android::base::SetProperty("sys.usb.ffs.ready", "1");

    }



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

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

    if (h->bulk_out < 0) {

        PLOG(ERROR) << "cannot open bulk-out endpoint " << USB_FFS_ADB_OUT;

        goto err;

    }



    h->bulk_in = adb_open(USB_FFS_ADB_IN, O_RDWR);

    h->bulk_in = adb_open(USB_FFS_ADB_IN, O_WRONLY);

    if (h->bulk_in < 0) {

        PLOG(ERROR) << "cannot open bulk-in endpoint " << USB_FFS_ADB_IN;

        goto err;