From 48b3e5de64176fe92c572557a503f52f7f2cadac Mon Sep 17 00:00:00 2001
From: Ricky Niu <rickyniu@google.com>
Date: Wed, 24 Nov 2021 17:26:38 +0800
Subject: [PATCH] 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 | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/usb/UsbGadget.cpp b/usb/UsbGadget.cpp
index 0a6cea31..5c0021fe 100644
--- a/usb/UsbGadget.cpp
+++ b/usb/UsbGadget.cpp
@@ -228,9 +228,13 @@ static V1_0::Status validateAndSetVidPid(uint64_t functions) {
             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");