commit 48b3e5de64176fe92c572557a503f52f7f2cadac
author Ricky Niu <rickyniu@google.com> Wed Nov 24 17:26:38 2021 +0800
committer TreeHugger Robot <treehugger-gerrit@google.com> Fri Nov 26 08:22:03 2021 +0000
tree 14dbfb6feefab57bd386dda859f139b3b8085c04
parent e5036ffd10c78fc3043745c930317e96fbd3687b

usb: Add dm condition in NCM

Add vid/pid 04e8/6862 for dm condition in NCM

Test: The usb gadget functions work normally
Bug: 206565428
Signed-off-by: Ricky Niu <rickyniu@google.com>
Change-Id: I04fba9fc137848d7f1c97a288bb12d76a613badc

usb/UsbGadget.cpp

diff --git a/usb/UsbGadget.cpp b/usb/UsbGadget.cpp
index 0a6cea3..5c0021f 100644
--- a/usb/UsbGadget.cpp
+++ b/usb/UsbGadget.cpp
@@ -228,9 +228,13 @@
             ret = setVidPid("0x18d1", "0x4eeb");
             break;
         case GadgetFunction::ADB | GadgetFunction::NCM:
-            if (!(vendorFunctions == "user" || vendorFunctions == ""))
-                ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str());
-            ret = setVidPid("0x18d1", "0x4eec");
+            if (vendorFunctions == "dm") {
+                ret = setVidPid("0x04e8", "0x6862");
+            } else {
+                if (!(vendorFunctions == "user" || vendorFunctions == ""))
+                    ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str());
+                ret = setVidPid("0x18d1", "0x4eec");
+            }
             break;
         default:
             ALOGE("Combination not supported");