From 5aa06dad35b26325ac71fa44f73449d0ff911ee1 Mon Sep 17 00:00:00 2001
From: Devin Moore <devinmoore@google.com>
Date: Tue, 22 Nov 2022 19:17:22 +0000
Subject: libandroid_sensor_headers: make host_supported and vendor_available

These headers are now used in a shared convert library for AIDL/HIDL
sensorservice implementations.
They are host_supported.
They are on /system so they need vendor_available: true to be on both
system and vendor.

Test: atest VtsHalSensorManagerTargetTest
Test: atest VtsHalSensorManagerV1_0TargetTest
Bug: 259711109
Change-Id: Ibc6ed5566dc50de5b40719b4c66c6b8982df9613
---
 Android.bp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Android.bp b/Android.bp
index 615a7a8727..3992f82c3d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -56,7 +56,8 @@ subdirs = [
 
 cc_library_headers {
     name: "libandroid_sensor_headers",
-    vendor: true,
+    vendor_available: true,
+    host_supported: true,
     export_include_dirs: ["include_sensor"],
 }
 
-- 
cgit v1.2.3-59-g8ed1b


From cca5818a9b702108584a71272600df992aaed908 Mon Sep 17 00:00:00 2001
From: Devin Moore <devinmoore@google.com>
Date: Tue, 22 Nov 2022 01:12:19 +0000
Subject: sensorservice: use new convert functions

Avoid the reinterpret_cast that has no guarentees.

Test: atest VtsHalSensorManagerTargetTest
Test: atest VtsHalSensorManagerV1_0TargetTest
Bug: 259711109

Change-Id: Icf64c8809f0575957fe17a607986288fce351972
---
 services/sensorservice/aidl/utils.cpp | 2 +-
 services/sensorservice/hidl/utils.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/sensorservice/aidl/utils.cpp b/services/sensorservice/aidl/utils.cpp
index 26bcdc5b24..beb38b9f55 100644
--- a/services/sensorservice/aidl/utils.cpp
+++ b/services/sensorservice/aidl/utils.cpp
@@ -58,7 +58,7 @@ ndk::ScopedAStatus convertResult(status_t src) {
 ::aidl::android::hardware::sensors::Event convertEvent(const ::ASensorEvent& src) {
     ::aidl::android::hardware::sensors::Event dst;
     ::android::hardware::sensors::implementation::
-            convertFromSensorEvent(reinterpret_cast<const sensors_event_t&>(src), &dst);
+            convertFromASensorEvent(src, &dst);
     return dst;
 }
 
diff --git a/services/sensorservice/hidl/utils.cpp b/services/sensorservice/hidl/utils.cpp
index 2f9e922b59..5fa594d01d 100644
--- a/services/sensorservice/hidl/utils.cpp
+++ b/services/sensorservice/hidl/utils.cpp
@@ -76,8 +76,8 @@ Result convertResult(status_t status) {
 
 ::android::hardware::sensors::V1_0::Event convertEvent(const ::ASensorEvent& src) {
     ::android::hardware::sensors::V1_0::Event dst;
-    ::android::hardware::sensors::V1_0::implementation::convertFromSensorEvent(
-            reinterpret_cast<const sensors_event_t&>(src), &dst);
+    ::android::hardware::sensors::V1_0::implementation::convertFromASensorEvent(
+            src, &dst);
     return dst;
 }
 
-- 
cgit v1.2.3-59-g8ed1b