| commit | 52ce3150b192821d8909fcb8156efc63f97bded0 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Jun 10 20:50:40 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 10 20:50:40 2020 +0000 |
| tree | 17c6b44ad58bd406e3dded496f2dcc7c35fd849a | |
| parent | 4a2c990dd76403ae56c7b17169d6ef67fc4a0526 [diff] | |
| parent | d5a237964f95c1a532ed0b7b4467e4134500b190 [diff] |
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: Ia904328b88b1fc2170ea6767b5b9766db07bc76c
diff --git a/automotive/vehicle/2.0/default/impl/vhal_v2_0/EmulatedUserHal.cpp b/automotive/vehicle/2.0/default/impl/vhal_v2_0/EmulatedUserHal.cpp index f712ea2..2c2f23c 100644 --- a/automotive/vehicle/2.0/default/impl/vhal_v2_0/EmulatedUserHal.cpp +++ b/automotive/vehicle/2.0/default/impl/vhal_v2_0/EmulatedUserHal.cpp
@@ -158,6 +158,20 @@ 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;