| commit | 9fdcffb46a45c0843abf113959fd549c61c4959f | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Jul 21 01:11:10 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 21 01:11:10 2020 +0000 |
| tree | 3077d9fd186d42d0ca1c83b14edc3985cf827d62 | |
| parent | 0368ffb7636a05cc07bf5524a567977162459f46 [diff] | |
| parent | cd4510d8d8fb6161b637c0a8404131f96db38ead [diff] |
Merge changes I6c1af92f,Icf594d40 into rvc-dev-plus-aosp am: ea758da957 am: cd4510d8d8 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12183964 Change-Id: Ib578973b70dedc14bbc74c94e977aa0039aabf81
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