From 765937cfac316fdc2c834fd09a5abd803eb74596 Mon Sep 17 00:00:00 2001
From: "fan.lv" <Fan.lv@unisoc.com>
Date: Fri, 20 Oct 2023 17:14:05 +0800
Subject: [PATCH] lnitialize payload of additionallnfo for VTS
 InjectSensorEventData test

If the payload of additionalInfo event isn't initialized, system will
crash when execute to the function of convertToHidlEvent in
HalProxyAidl::injectSensorData. Because there is an operation to get
the payload in the function of convertToHidlEvent.

Bug:306109770
Test:VtsAidlHalSensorsTargetTest.Sensors/SensorsAidlTest #InjectSensorEventData
Change-Id:I649de10451914ddfdb9d735ca1359521bf810bca
---
 sensors/aidl/vts/VtsAidlHalSensorsTargetTest.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/sensors/aidl/vts/VtsAidlHalSensorsTargetTest.cpp b/sensors/aidl/vts/VtsAidlHalSensorsTargetTest.cpp
index 618acbb1d4..be11b87690 100644
--- a/sensors/aidl/vts/VtsAidlHalSensorsTargetTest.cpp
+++ b/sensors/aidl/vts/VtsAidlHalSensorsTargetTest.cpp
@@ -41,6 +41,7 @@ using aidl::android::hardware::sensors::ISensors;
 using aidl::android::hardware::sensors::SensorInfo;
 using aidl::android::hardware::sensors::SensorStatus;
 using aidl::android::hardware::sensors::SensorType;
+using aidl::android::hardware::sensors::AdditionalInfo;
 using android::ProcessState;
 using std::chrono::duration_cast;
 
@@ -629,6 +630,15 @@ TEST_P(SensorsAidlTest, InjectSensorEventData) {
     Event additionalInfoEvent;
     additionalInfoEvent.sensorType = SensorType::ADDITIONAL_INFO;
     additionalInfoEvent.timestamp = android::elapsedRealtimeNano();
+    AdditionalInfo info;
+    info.type = AdditionalInfo::AdditionalInfoType::AINFO_BEGIN;
+    info.serial = 1;
+    AdditionalInfo::AdditionalInfoPayload::Int32Values infoData;
+    for (int32_t i = 0; i < 14; i++) {
+        infoData.values[i] = i;
+    }
+    info.payload.set<AdditionalInfo::AdditionalInfoPayload::Tag::dataInt32>(infoData);
+    additionalInfoEvent.payload.set<Event::EventPayload::Tag::additional>(info);
 
     Event injectedEvent;
     injectedEvent.timestamp = android::elapsedRealtimeNano();