Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3819103a authored by Devin Moore's avatar Devin Moore Committed by Automerger Merge Worker
Browse files

Merge changes from topic "sensors_shared_convert" am: 82c3b18f am: ac863e8b am: 857211e9 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2313819



Change-Id: I4f47a261830619a95ec30d111b90ed6acd49413d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fe648323 857211e9

Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -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"],

}

services/sensorservice/aidl/utils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

services/sensorservice/hidl/utils.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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;

}