| commit | 1938f6aced45094d58a37b977b3a1de3e89875c5 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Nov 09 05:41:46 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 09 05:41:46 2022 +0000 |
| tree | fa19e813a7bccbc4379a8d52e5faea7fa0df22a8 | |
| parent | 6416b1f25a4408e0d069d245eb2969259229121e [diff] | |
| parent | 2d5be0dd24700d65df900401b8d30426970d2be1 [diff] |
Merge "USB Gadget v1.2: Remove redundant rndis gadget linking" am: 397a536206 am: 31e0bb7b5d am: 2d5be0dd24 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2200335 Change-Id: I32b7e988b9d6a1fec960a03a8fddff8281ec5e32 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/usb/gadget/1.2/default/lib/UsbGadgetUtils.cpp b/usb/gadget/1.2/default/lib/UsbGadgetUtils.cpp index fa50821..0924da7 100644 --- a/usb/gadget/1.2/default/lib/UsbGadgetUtils.cpp +++ b/usb/gadget/1.2/default/lib/UsbGadgetUtils.cpp
@@ -170,7 +170,6 @@ 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;