commit 7a3d7c96fcddf3d484f83d4bb6af3e042341643b
author felipeal <felipeal@google.com> Fri Jun 05 17:09:29 2020 -0700
committer felipeal <felipeal@google.com> Mon Jun 08 12:06:16 2020 -0700
tree 9f1fc84e6ca6e722ab42a6fdb40ba8d30e8df1d3
parent ac4ee9626849c00ac58da0c3f4be59a778e61de5

Fixed EmulatedUserHal so it doesn't reply to a LEGECY_ANDROID_LEGACY request.

Bug: 158336360
Test: m -j android.hardware.automotive.vehicle@2.0-service && adb push $OUT/vendor/bin/hw/android.hardware.automotive.vehicle@2.0-service /vendor/bin/hw/ && adb shell kill `pid android.hardware.automotive.vehicle`

Change-Id: I0b506ba5a4b53ada94bc4afc081d3e4222f5e92d

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 f712ea2..2c2f23c 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
@@ -158,6 +158,20 @@
         return sendUserHalResponse(std::move(mSwitchUserResponseFromCmd), requestId);
     }
 
+    if (value.value.int32Values.size() > 1) {
+        auto messageType = static_cast<SwitchUserMessageType>(value.value.int32Values[1]);
+        switch (messageType) {
+            case SwitchUserMessageType::LEGACY_ANDROID_SWITCH:
+                ALOGI("request is LEGACY_ANDROID_SWITCH; ignoring it");
+                return {};
+            case SwitchUserMessageType::ANDROID_POST_SWITCH:
+                ALOGI("request is ANDROID_POST_SWITCH; ignoring it");
+                return {};
+            default:
+                break;
+        }
+    }
+
     // Returns default response
     auto updatedValue = std::unique_ptr<VehiclePropValue>(new VehiclePropValue);
     updatedValue->prop = SWITCH_USER;