| commit | e3dbdc8770ece64b8f83083e542518681c461976 | [log] [tgz] |
|---|---|---|
| author | Roshan Pius <rpius@google.com> | Thu Aug 06 16:57:28 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 06 16:57:28 2020 +0000 |
| tree | 33c293abe0fb44ec5895ad9ef4cc7a3485f00129 | |
| parent | 7941bf02ce7e07d9c16afa19ab6e5820877aa2ff [diff] | |
| parent | daa82145980ded0ce8bc14c63aa1f03610df022b [diff] |
[automerger skipped] wifi(vts): Use blocking getService to wait for service to come up am: 2329bba9fe -s ours am: 1deae073f4 -s ours am: 62576bd239 -s ours am: daa8214598 -s ours am skip reason: Change-Id Ia05f93ba4a28c036315558edbba30f19c2e6ac95 with SHA-1 6d0af445ee is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12266126 Change-Id: I9b38a79f2c01ff8fecd9d7c0b1334d76d280fd7e
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