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

Commit 65b6e83e authored by Krzysztof Kosiński's avatar Krzysztof Kosiński Committed by Automerger Merge Worker
Browse files

Merge changes from topic "revert-2313818-sensors_shared_convert-WBBPAAQJOV"... 

Merge changes from topic "revert-2313818-sensors_shared_convert-WBBPAAQJOV" am: 51b7ac6e am: 42aa8170 am: 00878b2a

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



Change-Id: I0622dd088fe32be5e39d31b35eba27cdb31169bc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a93dfbd1 00878b2a

Android.bp

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

}

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::

            convertFromASensorEvent(src, &dst);

            convertFromSensorEvent(reinterpret_cast<const sensors_event_t&>(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::convertFromASensorEvent(

            src, &dst);

    ::android::hardware::sensors::V1_0::implementation::convertFromSensorEvent(

            reinterpret_cast<const sensors_event_t&>(src), &dst);

    return dst;

}