| commit | 2f441c8462b7a64977462f218d634a944bfd2663 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Aug 03 17:41:33 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 03 17:41:33 2020 +0000 |
| tree | a79b2507d6e0ab5c889ff4ad86528853d595579a | |
| parent | 545553ce65b7e9fe8510d7ae7ae7b43f3aa14b17 [diff] | |
| parent | 8cefc211967a3732b9c98c374701904d5b1960b6 [diff] |
[automerger skipped] Merge "remove stopAllRecognitions VTS test" am: 643c8239ed am: 4933fe4636 -s ours am: d884427fc2 -s ours am: 8cefc21196 -s ours am skip reason: Change-Id If14ed8177e0ff2730d2ed78ba8fbbbd058c4d57a with SHA-1 34de57d194 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1383508 Change-Id: I2876b1757e04d2877f019cb9d3f687a6bc959c79
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