Snap for 7949225 from 21e4cda7de to tm-release

Change-Id: I866ecd39ea6a55b2aa82702ec7be3b822241f57b
This commit is contained in:
Android Build Coastguard Worker 2021-11-27 04:01:17 +00:00
commit 246b0d79a9

View file

@ -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");