Merge "USB Gadget v1.2: Remove redundant rndis gadget linking"

This commit is contained in:
Treehugger Robot
2022-11-09 04:00:32 +00:00
committed by Gerrit Code Review

View File

@@ -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;