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

Commit c34f57fe authored by Yifan Hong's avatar Yifan Hong
Browse files

Add implementation for android.frameworks.sensorservice@1.0 

Test: marlin boots
Test: lshal -ipm | grep android.frameworks.sensorservice@1.0
Bug: 35219747
Change-Id: Idc2823c674ef452102766a1331c962d3f3f66c53
parent 373a0800

services/sensorservice/Android.bp

0 → 100644
+3 −0
Original line number Diff line number Diff line 
subdirs = [

    "hidl"

]

services/sensorservice/hidl/Android.bp

0 → 100644
+28 −0
Original line number Diff line number Diff line 
cc_library_shared {

    name: "libsensorservicehidl",

    srcs: [

        "DirectReportChannel.cpp",

        "SensorManager.cpp",

        "utils.cpp",

    ],

    cflags: [

        "-Wall",

        "-Werror",

    ],

    shared_libs: [

        "libbase",

        "libhidlbase",

        "libhidltransport",

        "libutils",

        "libsensor",

        "android.frameworks.sensorservice@1.0",

        "android.hardware.sensors@1.0",

        "android.hidl.base@1.0",

    ],

    export_include_dirs: [

        "include/"

    ],

    local_include_dirs: [

        "include/sensorservicehidl/"

    ]

}

services/sensorservice/hidl/DirectReportChannel.cpp

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

 * Copyright (C) 2017 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.

 */



#include "DirectReportChannel.h"

#include "utils.h"



namespace android {

namespace frameworks {

namespace sensorservice {

namespace V1_0 {

namespace implementation {



DirectReportChannel::DirectReportChannel(::android::SensorManager& manager, int channelId)

        : mManager(manager), mId(channelId) {}



DirectReportChannel::~DirectReportChannel() {

    mManager.destroyDirectChannel(mId);

}



// Methods from ::android::frameworks::sensorservice::V1_0::IDirectReportChannel follow.

Return<Result> DirectReportChannel::configure(int32_t sensorHandle, RateLevel rate) {

    return convertResult(mManager.configureDirectChannel(mId,

            static_cast<int>(sensorHandle), static_cast<int>(rate)));

}





}  // namespace implementation

}  // namespace V1_0

}  // namespace sensorservice

}  // namespace frameworks

}  // namespace android

services/sensorservice/hidl/DirectReportChannel.h

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

 * Copyright (C) 2017 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.

 */



#ifndef ANDROID_FRAMEWORKS_SENSORSERVICE_V1_0_DIRECTREPORTCHANNEL_H

#define ANDROID_FRAMEWORKS_SENSORSERVICE_V1_0_DIRECTREPORTCHANNEL_H



#include <android/frameworks/sensorservice/1.0/IDirectReportChannel.h>

#include <android/frameworks/sensorservice/1.0/types.h>

#include <hidl/MQDescriptor.h>

#include <hidl/Status.h>

#include <sensor/SensorManager.h>



namespace android {

namespace frameworks {

namespace sensorservice {

namespace V1_0 {

namespace implementation {



using ::android::frameworks::sensorservice::V1_0::IDirectReportChannel;

using ::android::hardware::sensors::V1_0::RateLevel;

using ::android::hidl::base::V1_0::DebugInfo;

using ::android::hidl::base::V1_0::IBase;

using ::android::hardware::hidl_array;

using ::android::hardware::hidl_memory;

using ::android::hardware::hidl_string;

using ::android::hardware::hidl_vec;

using ::android::hardware::Return;

using ::android::hardware::Void;

using ::android::sp;



struct DirectReportChannel : public IDirectReportChannel {



    DirectReportChannel(::android::SensorManager& manager, int channelId);

    ~DirectReportChannel();



    // Methods from ::android::frameworks::sensorservice::V1_0::IDirectReportChannel follow.

    Return<Result> configure(int32_t sensorHandle, RateLevel rate) override;



private:

    ::android::SensorManager& mManager;

    const int mId;

};



}  // namespace implementation

}  // namespace V1_0

}  // namespace sensorservice

}  // namespace frameworks

}  // namespace android



#endif  // ANDROID_FRAMEWORKS_SENSORSERVICE_V1_0_DIRECTREPORTCHANNEL_H

services/sensorservice/hidl/SensorManager.cpp

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

 * Copyright (C) 2017 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.

 */



// LOG_TAG defined via build flag.

#ifndef LOG_TAG

#define LOG_TAG "HidlSensorManager"

#endif

#include <android-base/logging.h>



#include "DirectReportChannel.h"

#include "SensorManager.h"

#include "utils.h"



namespace android {

namespace frameworks {

namespace sensorservice {

namespace V1_0 {

namespace implementation {



using ::android::frameworks::sensorservice::V1_0::IDirectReportChannel;

using ::android::hardware::sensors::V1_0::SensorInfo;

using ::android::hardware::hidl_vec;

using ::android::hardware::Void;

using ::android::sp;



SensorManager::SensorManager()

        : mManager{::android::SensorManager::getInstanceForPackage(

            String16(ISensorManager::descriptor))} {

}



// Methods from ::android::frameworks::sensorservice::V1_0::ISensorManager follow.

Return<void> SensorManager::getSensorList(getSensorList_cb _hidl_cb) {

    ::android::Sensor const* const* list;

    ssize_t count = mManager.getSensorList(&list);

    if (count < 0 || !list) {

        LOG(ERROR) << "::android::SensorManager::getSensorList encounters " << count;

        _hidl_cb({}, Result::UNKNOWN_ERROR);

        return Void();

    }

    hidl_vec<SensorInfo> ret;

    ret.resize(static_cast<size_t>(count));

    for (ssize_t i = 0; i < count; ++i) {

        ret[i] = convertSensor(*list[i]);

    }

    _hidl_cb(ret, Result::OK);

    return Void();

}



Return<void> SensorManager::getDefaultSensor(SensorType type, getDefaultSensor_cb _hidl_cb) {

    ::android::Sensor const* sensor = mManager.getDefaultSensor(static_cast<int>(type));

    if (!sensor) {

        _hidl_cb({}, Result::NOT_EXIST);

        return Void();

    }

    _hidl_cb(convertSensor(*sensor), Result::OK);

    return Void();

}



template<typename Callback>

void createDirectChannel(::android::SensorManager& manager, size_t size, int type,

        const native_handle_t* handle, const Callback& _hidl_cb) {



    int channelId = manager.createDirectChannel(

        size, type, handle);

    if (channelId < 0) {

        _hidl_cb(nullptr, convertResult(channelId));

        return;

    }

    if (channelId == 0) {

        _hidl_cb(nullptr, Result::UNKNOWN_ERROR);

        return;

    }



    _hidl_cb(sp<IDirectReportChannel>(new DirectReportChannel(manager, channelId)),

            Result::OK);

}



Return<void> SensorManager::createAshmemDirectChannel(

        const hidl_memory& mem, uint64_t size,

        createAshmemDirectChannel_cb _hidl_cb) {

    if (size > mem.size()) {

        _hidl_cb(nullptr, Result::BAD_VALUE);

        return Void();

    }



    createDirectChannel(mManager, size, SENSOR_DIRECT_MEM_TYPE_ASHMEM,

            mem.handle(), _hidl_cb);



    return Void();

}



Return<void> SensorManager::createGrallocDirectChannel(

        const hidl_handle& buffer, uint64_t size,

        createGrallocDirectChannel_cb _hidl_cb) {



    createDirectChannel(mManager, size, SENSOR_DIRECT_MEM_TYPE_GRALLOC,

            buffer.getNativeHandle(), _hidl_cb);



    return Void();

}



}  // namespace implementation

}  // namespace V1_0

}  // namespace sensorservice

}  // namespace frameworks

}  // namespace android