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

Commit 48294211 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Enable MS OS descriptors for adb." am: cbb51b15 am: e6cd9943 am: cda67e1a 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1797476

Change-Id: Ic3804b02ed8c27596cfeb77e61bef5bd99d75073
parents 072433f5 cda67e1a

usb/gadget/1.1/default/lib/UsbGadgetUtils.cpp

+3 −0
Original line number Diff line number Diff line
@@ -178,6 +178,9 @@ Status addGenericAndroidFunctions(MonitorFfs* monitorFfs, uint64_t functions, bo 


Status addAdb(MonitorFfs* monitorFfs, int* functionCount) {

    ALOGI("setCurrentUsbFunctions Adb");

    if (!WriteStringToFile("1", DESC_USE_PATH))

        return Status::ERROR;



    if (!monitorFfs->addInotifyFd("/dev/usb-ffs/adb/")) return Status::ERROR;



    if (linkFunction("ffs.adb", (*functionCount)++)) return Status::ERROR;

usb/gadget/1.2/default/lib/UsbGadgetUtils.cpp

+3 −0
Original line number Diff line number Diff line
@@ -190,6 +190,9 @@ Status addGenericAndroidFunctions(MonitorFfs* monitorFfs, uint64_t functions, bo 


Status addAdb(MonitorFfs* monitorFfs, int* functionCount) {

    ALOGI("setCurrentUsbFunctions Adb");

    if (!WriteStringToFile("1", DESC_USE_PATH))

        return Status::ERROR;



    if (!monitorFfs->addInotifyFd("/dev/usb-ffs/adb/")) return Status::ERROR;



    if (linkFunction("ffs.adb", (*functionCount)++)) return Status::ERROR;