From c755af1f0d765f36b55cb2586b0fe79fb29ed50b Mon Sep 17 00:00:00 2001 From: Sebastiano Barezzi Date: Sat, 8 May 2021 16:32:07 +0200 Subject: [PATCH] sm6250-common: Pull in AOSP lights AIDL * From https://github.com/LineageOS/android_hardware_interfaces/commit/ee34a8ce6ec3027a4710adf92981293c9564b3af Change-Id: Id83b242a850119c83f1b7b2d9b7a74928a7d5e67 --- atoll.mk | 4 ++++ lights/Android.bp | 16 ++++++++++++++++ lights/Lights.cpp | 39 +++++++++++++++++++++++++++++++++++++++ lights/Lights.h | 35 +++++++++++++++++++++++++++++++++++ lights/lights-default.rc | 5 +++++ lights/lights-default.xml | 6 ++++++ lights/main.cpp | 35 +++++++++++++++++++++++++++++++++++ 7 files changed, 140 insertions(+) create mode 100644 lights/Android.bp create mode 100644 lights/Lights.cpp create mode 100644 lights/Lights.h create mode 100644 lights/lights-default.rc create mode 100644 lights/lights-default.xml create mode 100644 lights/main.cpp diff --git a/atoll.mk b/atoll.mk index 6d69933..aed4151 100644 --- a/atoll.mk +++ b/atoll.mk @@ -188,6 +188,10 @@ PRODUCT_PACKAGES += \ android.hardware.ir@1.0-impl \ android.hardware.ir@1.0-service +# Lights +PRODUCT_PACKAGES += \ + android.hardware.lights-service.example + # Rootdir PRODUCT_PACKAGES += \ init.qcom.early_boot.sh \ diff --git a/lights/Android.bp b/lights/Android.bp new file mode 100644 index 0000000..ae3f463 --- /dev/null +++ b/lights/Android.bp @@ -0,0 +1,16 @@ +cc_binary { + name: "android.hardware.lights-service.example", + relative_install_path: "hw", + init_rc: ["lights-default.rc"], + vintf_fragments: ["lights-default.xml"], + vendor: true, + shared_libs: [ + "libbase", + "libbinder_ndk", + "android.hardware.light-ndk_platform", + ], + srcs: [ + "Lights.cpp", + "main.cpp", + ], +} diff --git a/lights/Lights.cpp b/lights/Lights.cpp new file mode 100644 index 0000000..74747d5 --- /dev/null +++ b/lights/Lights.cpp @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2019 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 "Lights.h" + +#include + +namespace aidl { +namespace android { +namespace hardware { +namespace light { + +ndk::ScopedAStatus Lights::setLightState(int id, const HwLightState& state) { + LOG(INFO) << "Lights setting state for id=" << id << " to color " << std::hex << state.color; + return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION); +} + +ndk::ScopedAStatus Lights::getLights(std::vector* /*lights*/) { + LOG(INFO) << "Lights reporting supported lights"; + return ndk::ScopedAStatus::ok(); +} + +} // namespace light +} // namespace hardware +} // namespace android +} // namespace aidl diff --git a/lights/Lights.h b/lights/Lights.h new file mode 100644 index 0000000..8cba5a1 --- /dev/null +++ b/lights/Lights.h @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2020 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 + +namespace aidl { +namespace android { +namespace hardware { +namespace light { + +// Default implementation that reports no supported lights. +class Lights : public BnLights { + ndk::ScopedAStatus setLightState(int id, const HwLightState& state) override; + ndk::ScopedAStatus getLights(std::vector* types) override; +}; + +} // namespace light +} // namespace hardware +} // namespace android +} // namespace aidl diff --git a/lights/lights-default.rc b/lights/lights-default.rc new file mode 100644 index 0000000..687ec97 --- /dev/null +++ b/lights/lights-default.rc @@ -0,0 +1,5 @@ +service vendor.light-default /vendor/bin/hw/android.hardware.lights-service.example + class hal + user nobody + group nobody + shutdown critical diff --git a/lights/lights-default.xml b/lights/lights-default.xml new file mode 100644 index 0000000..db604d6 --- /dev/null +++ b/lights/lights-default.xml @@ -0,0 +1,6 @@ + + + android.hardware.light + ILights/default + + diff --git a/lights/main.cpp b/lights/main.cpp new file mode 100644 index 0000000..a860bf4 --- /dev/null +++ b/lights/main.cpp @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2020 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 "Lights.h" + +#include +#include +#include + +using ::aidl::android::hardware::light::Lights; + +int main() { + ABinderProcess_setThreadPoolMaxThreadCount(0); + std::shared_ptr lights = ndk::SharedRefBase::make(); + + const std::string instance = std::string() + Lights::descriptor + "/default"; + binder_status_t status = AServiceManager_addService(lights->asBinder().get(), instance.c_str()); + CHECK(status == STATUS_OK); + + ABinderProcess_joinThreadPool(); + return EXIT_FAILURE; // should not reached +}