Evolution-X-Tensor/device_google_gs201
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

usb: Add dm condition in NCM

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

Test: The usb gadget functions work normally
Bug: 226682477

Signed-off-by: Ricky Niu <rickyniu@google.com>
Change-Id: I263f125d2ff961a6967b5b536c71fcbdcd87ed05
This commit is contained in:
Ricky Niu 2022-03-25 14:38:33 +08:00 • committed by TreeHugger Robot
parent 6bfa5980f9
commit 7d413565cd
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
usb/gadget/UsbGadget.cpp
View file

@ -270,9 +270,13 @@ static V1_0::Status validateAndSetVidPid(uint64_t functions) {
ret = setVidPid("0x18d1", "0x4eeb"); ret = setVidPid("0x18d1", "0x4eeb");
break; break;
case GadgetFunction::ADB | GadgetFunction::NCM: case GadgetFunction::ADB | GadgetFunction::NCM:
if (!(vendorFunctions == "user" || vendorFunctions == "")) if (vendorFunctions == "dm") {
ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); ret = setVidPid("0x04e8", "0x6862");
ret = setVidPid("0x18d1", "0x4eec"); } else {
if (!(vendorFunctions == "user" || vendorFunctions == ""))
ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str());
ret = setVidPid("0x18d1", "0x4eec");
}
break; break;
default: default:
ALOGE("Combination not supported"); ALOGE("Combination not supported");