| commit | 645bd8a6fa4a6de8007d87b83be520adb197ce3b | [log] [tgz] |
|---|---|---|
| author | felipeal <felipeal@google.com> | Tue Sep 15 03:24:28 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 15 03:24:28 2020 +0000 |
| tree | a433f98ef4bb4baef32d52271f3ceef5c4068e2b | |
| parent | 10d58f6f16d7bc0b3af9a1eebd6aba4af2b4d2ce [diff] | |
| parent | 5d40b783d139050bdaa680c6de36be21fed5a439 [diff] |
Fixed EmulatedUserHal so it supports SwitchUserMessageType::VEHICLE_REQUEST am: 5d40b783d1 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1425311 Change-Id: Ie0e3affd1fd6865fe3b19bbb961494c4322e5785
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 {};