| commit | 31e0bb7b5dc31e5396f810c827512276e876d6ef | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Nov 09 04:32:53 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 09 04:32:53 2022 +0000 |
| tree | ca0408407b6a85a5b04b58f2e668e7ba6f49c2c8 | |
| parent | c93642ad9bcde3f0fe6a916d83ba013be5c3c045 [diff] | |
| parent | 397a536206eb8128d87d1d4a551fad8fa57aa4f0 [diff] |
Merge "USB Gadget v1.2: Remove redundant rndis gadget linking" am: 397a536206 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2200335 Change-Id: If5aa16ce3f1e5f149cd22f3829a5057a2fc808a1 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;