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 am: 7d413565cd

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17395650

Change-Id: Id847e39c485697dc2fc2eb170e6750c10933e529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ricky Niu 2022-03-25 10:52:34 +00:00 • committed by Automerger Merge Worker
commit 721ca06044
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");
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");