commit 5353df6c52b713f3c7b75e006978a0809565f775
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 31 01:46:35 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 31 01:46:35 2020 +0000
tree ed847764060afc6e328aeb8383140f10ccc1e9e7
parent d8ade017b0b232dfe701243a18144c09cfcb744c
parent f96d0495b7e7ad976f05b541a7f7195e7fc7c6eb

[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" am: 0aa2a2f3ef am: f11d07055e -s ours am: a1c2dbc94e -s ours am: f96d0495b7 -s ours

am skip reason: Change-Id I3c0d02e1ee94c575c3a18291d438b464d7396463 with SHA-1 e442f7f4a7 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1378757

Change-Id: I2b4a89a27e91c1d9cf1dc43793549c74588bdcb7

automotive/vehicle/2.0/default/impl/vhal_v2_0/EmulatedUserHal.cpp

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 {};

wifi/1.4/default/android.hardware.wifi@1.0-service-lazy.rc

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