commit eadfc812f0247dc13fa72286b30e8acac4e24ea8
author Krzysztof Kosiński <krzysio@google.com> Wed Nov 30 05:16:15 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 30 05:16:19 2022 +0000
tree a7a8711d2d4d9c30b4b5327c3b389b7bf6135fc9
parent cca5818a9b702108584a71272600df992aaed908

Revert "sensorservice: use new convert functions"

Revert "sensors: adding a common convert lib"

Revert submission 2313818-sensors_shared_convert

Reason for revert: Breaks wembley_2GB-userdebug
Reverted Changes:
Icf64c8809:sensorservice: use new convert functions
Ibc6ed5566:libandroid_sensor_headers: make host_supported and...
Ib80130fc0:sensors: adding a common convert lib

Change-Id: I97972670832188d53d97a4b6918323a3e4581677

services/sensorservice/aidl/utils.cpp

diff --git a/services/sensorservice/aidl/utils.cpp b/services/sensorservice/aidl/utils.cpp
index beb38b9..26bcdc5 100644
--- a/services/sensorservice/aidl/utils.cpp
+++ b/services/sensorservice/aidl/utils.cpp
@@ -58,7 +58,7 @@
 ::aidl::android::hardware::sensors::Event convertEvent(const ::ASensorEvent& src) {
     ::aidl::android::hardware::sensors::Event dst;
     ::android::hardware::sensors::implementation::
-            convertFromASensorEvent(src, &dst);
+            convertFromSensorEvent(reinterpret_cast<const sensors_event_t&>(src), &dst);
     return dst;
 }
 

services/sensorservice/hidl/utils.cpp

diff --git a/services/sensorservice/hidl/utils.cpp b/services/sensorservice/hidl/utils.cpp
index 5fa594d..2f9e922 100644
--- a/services/sensorservice/hidl/utils.cpp
+++ b/services/sensorservice/hidl/utils.cpp
@@ -76,8 +76,8 @@
 
 ::android::hardware::sensors::V1_0::Event convertEvent(const ::ASensorEvent& src) {
     ::android::hardware::sensors::V1_0::Event dst;
-    ::android::hardware::sensors::V1_0::implementation::convertFromASensorEvent(
-            src, &dst);
+    ::android::hardware::sensors::V1_0::implementation::convertFromSensorEvent(
+            reinterpret_cast<const sensors_event_t&>(src), &dst);
     return dst;
 }