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

Commit 3259213a authored by Devin Moore's avatar Devin Moore Committed by Gerrit Code Review
Browse files

Merge changes from topics "sensor_conver", "sensorservice_aidl" 

* changes:
  Add a convert library for sensor AIDL
  Add host_supported to sensors AIDL interface
parents 66808f0c 00721dc0

sensors/aidl/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -11,6 +11,7 @@ aidl_interface { 
    name: "android.hardware.sensors",

    name: "android.hardware.sensors",

    vendor_available: true,

    vendor_available: true,

    srcs: ["android/hardware/sensors/*.aidl"],

    srcs: ["android/hardware/sensors/*.aidl"],

    host_supported: true,

    imports: [

    imports: [

        "android.hardware.common-V2",

        "android.hardware.common-V2",

        "android.hardware.common.fmq-V1",

        "android.hardware.common.fmq-V1",

sensors/aidl/convert/Android.bp

0 → 100644
+43 −0
Original line number Original line 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 Original line 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