| commit | 33f6c0ad1b7fdfe8d58b3b945a888967be301929 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Jun 10 21:01:47 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 10 21:01:47 2020 +0000 |
| tree | 0313c82f81b37ddd2f730a2e69a072967b218b42 | |
| parent | 16ab890cc24e51068b15e841c809094d4d28edbd [diff] | |
| parent | 5ba48ac055865b5ee81776841cccce51288521c0 [diff] |
Merge "Fixed EmulatedUserHal so it doesn't reply to a LEGECY_ANDROID_LEGACY request." into rvc-dev am: d5a237964f am: 5ba48ac055 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11764584 Change-Id: I2bccdb6246e0384b23e45e96fcbf99fdd068cc71
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 c49fadc..6a6b12f 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
@@ -115,6 +115,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;