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

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

Merge changes from topics "sensor_conver", "sensorservice_aidl" am: 3259213a 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2298582



Change-Id: Ic04b5ac0b4861118834a7de98e3cbc97a7f01a2f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f52079e9 3259213a

sensors/aidl/convert/Android.bp

0 → 100644
+43 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "hardware_interfaces_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["hardware_interfaces_license"],

}



cc_library_static {

    name: "android.hardware.sensors-V1-convert",

    vendor_available: true,

    srcs: ["convert.cpp"],

    export_include_dirs: ["include"],

    shared_libs: [

        "liblog",

        "libcutils",

        "libhardware",

        "libbase",

        "libutils",

        "android.hardware.sensors-V1-ndk",

    ],

    local_include_dirs: ["include/aidl/sensors"],

    export_shared_lib_headers: [

        "libhardware",

    ],

}

sensors/aidl/convert/convert.cpp

0 → 100644
+496 −0

File added.

Preview size limit exceeded, changes collapsed.

sensors/aidl/convert/include/aidl/sensors/convert.h

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#pragma once



#include <aidl/android/hardware/sensors/ISensors.h>

#include <hardware/sensors.h>



namespace android {

namespace hardware {

namespace sensors {

namespace implementation {



status_t convertToStatus(ndk::ScopedAStatus status);

void convertToSensor(const aidl::android::hardware::sensors::SensorInfo& src, sensor_t* dst);

void convertToSensorEvent(const aidl::android::hardware::sensors::Event& src, sensors_event_t* dst);

void convertFromSensorEvent(const sensors_event_t& src,

                            aidl::android::hardware::sensors::Event* dst);



}  // namespace implementation

}  // namespace sensors

}  // namespace hardware

}  // namespace android