diff options
| author | Krzysztof Kosiński <krzysio@google.com> | 2022-11-30 08:49:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-11-30 08:49:20 +0000 |
| commit | 51b7ac6e128050f7966c130e4d5b3cb6f73905d0 (patch) | |
| tree | 76642109e411961b0ba0bde6e8b618a6a5530033 | |
| parent | 8a0490039042c5aaa345f855f820d10d0b2fddc4 (diff) | |
| parent | 8caaa355cc56d557c9a4a4160225e78bb31f9823 (diff) | |
| download | native-51b7ac6e128050f7966c130e4d5b3cb6f73905d0.tar.gz | |
Merge changes from topic "revert-2313818-sensors_shared_convert-WBBPAAQJOV"
* changes:
Revert "libandroid_sensor_headers: make host_supported and vendo..."
Revert "sensorservice: use new convert functions"
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | services/sensorservice/aidl/utils.cpp | 2 | ||||
| -rw-r--r-- | services/sensorservice/hidl/utils.cpp | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp index 3992f82c3d..615a7a8727 100644 --- a/Android.bp +++ b/Android.bp @@ -56,8 +56,7 @@ subdirs = [ cc_library_headers { name: "libandroid_sensor_headers", - vendor_available: true, - host_supported: true, + vendor: true, export_include_dirs: ["include_sensor"], } diff --git a/services/sensorservice/aidl/utils.cpp b/services/sensorservice/aidl/utils.cpp index beb38b9f55..26bcdc5b24 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:: - convertFromASensorEvent(src, &dst); + convertFromSensorEvent(reinterpret_cast<const sensors_event_t&>(src), &dst); return dst; } diff --git a/services/sensorservice/hidl/utils.cpp b/services/sensorservice/hidl/utils.cpp index 5fa594d01d..2f9e922b59 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::convertFromASensorEvent( - src, &dst); + ::android::hardware::sensors::V1_0::implementation::convertFromSensorEvent( + reinterpret_cast<const sensors_event_t&>(src), &dst); return dst; } |