| commit | 640d98101dd6e8a6308682540775b8122843192e | [log] [tgz] |
|---|---|---|
| author | Devin Moore <devinmoore@google.com> | Tue Jul 21 00:19:02 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 21 00:19:02 2020 +0000 |
| tree | 86789af7cd46d583760a7b958fb5ad7e58c27b28 | |
| parent | 997402f8eedf7840a8443fe601062d33b858d2f3 [diff] | |
| parent | 806c8613b6df37b7bb31d94315b798796a8fd043 [diff] |
[automerger skipped] Merge changes from topic "nativehandle" am: d0fd93097c am: 19de4b7e04 -s ours am: efbc84068d -s ours am: 806c8613b6 -s ours am skip reason: Change-Id Ie1d92a50dddf7e3e1bd473e2a957279c6dadb865 with SHA-1 926aa80f04 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1364080 Change-Id: Ia08b2f21c696c70d4926e212c7ab86dfe19cab59
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 {};
diff --git a/wifi/1.4/default/android.hardware.wifi@1.0-service-lazy.rc b/wifi/1.4/default/android.hardware.wifi@1.0-service-lazy.rc index cf917b5..061689d 100644 --- a/wifi/1.4/default/android.hardware.wifi@1.0-service-lazy.rc +++ b/wifi/1.4/default/android.hardware.wifi@1.0-service-lazy.rc
@@ -1,5 +1,9 @@ service vendor.wifi_hal_legacy /vendor/bin/hw/android.hardware.wifi@1.0-service-lazy interface android.hardware.wifi@1.0::IWifi default + interface android.hardware.wifi@1.1::IWifi default + interface android.hardware.wifi@1.2::IWifi default + interface android.hardware.wifi@1.3::IWifi default + interface android.hardware.wifi@1.4::IWifi default oneshot disabled class hal