Merge "Fixed EmulatedUserHal so it doesn't reply to a LEGECY_ANDROID_LEGACY request." into rvc-dev am: d5a237964f

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11764584

Change-Id: I362b3966717e7d41cbad820347691b07ef30d7be
This commit is contained in:
TreeHugger Robot
2020-06-10 20:49:57 +00:00
committed by Automerger Merge Worker

View File

@@ -115,6 +115,20 @@ android::base::Result<std::unique_ptr<VehiclePropValue>> EmulatedUserHal::onSetS
return sendUserHalResponse(std::move(mSwitchUserResponseFromCmd), requestId);
}
if (value.value.int32Values.size() > 1) {
auto messageType = static_cast<SwitchUserMessageType>(value.value.int32Values[1]);
switch (messageType) {
case SwitchUserMessageType::LEGACY_ANDROID_SWITCH:
ALOGI("request is LEGACY_ANDROID_SWITCH; ignoring it");
return {};
case SwitchUserMessageType::ANDROID_POST_SWITCH:
ALOGI("request is ANDROID_POST_SWITCH; ignoring it");
return {};
default:
break;
}
}
// Returns default response
auto updatedValue = std::unique_ptr<VehiclePropValue>(new VehiclePropValue);
updatedValue->prop = SWITCH_USER;