From 7d413565cd99456d37b14289f80e780d1d47395d Mon Sep 17 00:00:00 2001 From: Ricky Niu Date: Fri, 25 Mar 2022 14:38:33 +0800 Subject: usb: Add dm condition in NCM Add vid/pid 04e8/6862 for dm condition in NCM Test: The usb gadget functions work normally Bug: 226682477 Signed-off-by: Ricky Niu Change-Id: I263f125d2ff961a6967b5b536c71fcbdcd87ed05 --- usb/gadget/UsbGadget.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'usb') diff --git a/usb/gadget/UsbGadget.cpp b/usb/gadget/UsbGadget.cpp index 9fdf2ac..2a1e16c 100644 --- a/usb/gadget/UsbGadget.cpp +++ b/usb/gadget/UsbGadget.cpp @@ -270,9 +270,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"); -- cgit v1.2.3