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

usb: Add dm condition in NCM am: 48b3e5de64 am: ac257ea3eb

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

Change-Id: I1aee4efc8f73f95952d60de58c5832ded800b813
This commit is contained in:
Ricky Niu 2021-11-26 08:52:04 +00:00 • committed by Automerger Merge Worker
commit 21e4cda7de
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
usb/UsbGadget.cpp
View file

@ -228,9 +228,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");