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

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

Merge "USB Gadget v1.2: Remove redundant rndis gadget linking" am: 397a5362 am: 31e0bb7b 

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



Change-Id: I05863540801040b27211c7e12551afb85ccffe8e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3f49e2ed 31e0bb7b

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

+0 −1
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ Status addGenericAndroidFunctions(MonitorFfs* monitorFfs, uint64_t functions, bo 


    if ((functions & GadgetFunction::RNDIS) != 0) {

        ALOGI("setCurrentUsbFunctions rndis");

        if (linkFunction("gsi.rndis", (*functionCount)++)) return Status::ERROR;

        std::string rndisFunction = GetProperty(kVendorRndisConfig, "");

        if (rndisFunction != "") {

            if (linkFunction(rndisFunction.c_str(), (*functionCount)++)) return Status::ERROR;