| commit | 4b5417906b15af978d9188659abaefcaf75aeb4e | [log] [tgz] |
|---|---|---|
| author | felipeal <felipeal@google.com> | Tue Sep 15 04:32:04 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 15 04:32:04 2020 +0000 |
| tree | 250e3d5507ba3091c7316839725a65b3cb4624c6 | |
| parent | 653a02f03dab26e4f42648fac372ba25ab108dcf [diff] | |
| parent | d4918ea19499d6229abd95ff342d84f1194a1856 [diff] |
Fixed EmulatedUserHal so it supports SwitchUserMessageType::VEHICLE_REQUEST am: 5d40b783d1 am: 645bd8a6fa am: d4918ea194 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1425311 Change-Id: I48a33bd0033c9d3c133fcdcbc026f53a957e94ac
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 ea38cb3..d0011a8 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
@@ -155,6 +155,15 @@ } if (value.areaId != 0) { + if (value.value.int32Values.size() >= 2 && + static_cast<SwitchUserMessageType>(value.value.int32Values[1]) == + SwitchUserMessageType::VEHICLE_REQUEST) { + // User HAL can also request a user switch, so we need to check it first + ALOGD("set(SWITCH_USER) called from lshal to emulate a vehicle request: %s", + toString(value).c_str()); + return std::unique_ptr<VehiclePropValue>(new VehiclePropValue(value)); + } + // Otherwise, we store it ALOGD("set(SWITCH_USER) called from lshal; storing it: %s", toString(value).c_str()); mSwitchUserResponseFromCmd.reset(new VehiclePropValue(value)); return {};