diff --git a/common.mk b/common.mk index 6cb632c..ea51105 100644 --- a/common.mk +++ b/common.mk @@ -140,10 +140,6 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/idc/gf_input.idc:$(TARGET_COPY_OUT_SYSTEM)/usr/idc/gf_input.idc \ $(LOCAL_PATH)/keylayout/gf_input.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/gf_input.kl -# Lights -PRODUCT_PACKAGES += \ - android.hardware.light@2.0-service.oneplus_kona - # LiveDisplay PRODUCT_PACKAGES += \ lineage.livedisplay@2.0-service.oneplus_kona diff --git a/lights/Android.mk b/lights/Android.mk deleted file mode 100644 index b1a33cf..0000000 --- a/lights/Android.mk +++ /dev/null @@ -1,40 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := android.hardware.light@2.0-service.oneplus_kona -LOCAL_MODULE_TAGS := optional - -LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_TARGET_VNDK_VERSION)/bin -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_MODULE_STEM := android.hardware.light@2.0-service - -LOCAL_SRC_FILES := \ - service.cpp \ - Light.cpp - -LOCAL_REQUIRED_MODULES := \ - android.hardware.light@2.0-service.oneplus_kona.rc - -LOCAL_SHARED_LIBRARIES := \ - libbase \ - libhardware \ - libhidlbase \ - liblog \ - libutils \ - android.hardware.light@2.0 - -include $(BUILD_EXECUTABLE) - -include $(CLEAR_VARS) - -LOCAL_MODULE := android.hardware.light@2.0-service.oneplus_kona.rc -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := ETC - -LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_TARGET_VNDK_VERSION)/etc/init -LOCAL_MODULE_STEM := android.hardware.light@2.0-service.rc - -LOCAL_SRC_FILES := android.hardware.light@2.0-service.oneplus_kona.rc - -include $(BUILD_PREBUILT) diff --git a/lights/Light.cpp b/lights/Light.cpp deleted file mode 100644 index 2288cfd..0000000 --- a/lights/Light.cpp +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Copyright (C) 2014, 2017-2018 The Linux Foundation. All rights reserved. - * Not a contribution - * Copyright (C) 2008 The Android Open Source Project - * Copyright (C) 2018 The LineageOS 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. - */ - -#define LOG_TAG "LightsService" - -#include "Light.h" -#include -#include -#include - -namespace android { -namespace hardware { -namespace light { -namespace V2_0 { -namespace implementation { - -/* - * Write value to path and close file. - */ -template -static void set(const std::string& path, const T& value) { - std::ofstream file(path); - file << value; -} - -template -static T get(const std::string& path, const T& def) { - std::ifstream file(path); - T result; - - file >> result; - return file.fail() ? def : result; -} - -static int rgbToBrightness(const LightState& state) { - int color = state.color & 0x00ffffff; - return ((77 * ((color >> 16) & 0x00ff)) - + (150 * ((color >> 8) & 0x00ff)) - + (29 * (color & 0x00ff))) >> 8; -} - -Light::Light() { - mLights.emplace(Type::BACKLIGHT, std::bind(&Light::handleBacklight, this, std::placeholders::_1)); -} - -void Light::handleBacklight(const LightState& state) { - int maxBrightness = get("/sys/class/backlight/panel0-backlight/max_brightness", -1); - if (maxBrightness < 0) { - maxBrightness = 255; - } - int sentBrightness = rgbToBrightness(state); - int brightness = sentBrightness * maxBrightness / 255; - LOG(DEBUG) << "Writing backlight brightness " << brightness - << " (orig " << sentBrightness << ")"; - set("/sys/class/backlight/panel0-backlight/brightness", brightness); -} - -Return Light::setLight(Type type, const LightState& state) { - auto it = mLights.find(type); - - if (it == mLights.end()) { - return Status::LIGHT_NOT_SUPPORTED; - } - - /* - * Lock global mutex until light state is updated. - */ - std::lock_guard lock(mLock); - - it->second(state); - - return Status::SUCCESS; -} - -Return Light::getSupportedTypes(getSupportedTypes_cb _hidl_cb) { - std::vector types; - - for (auto const& light : mLights) { - types.push_back(light.first); - } - - _hidl_cb(types); - - return Void(); -} - -} // namespace implementation -} // namespace V2_0 -} // namespace light -} // namespace hardware -} // namespace android diff --git a/lights/Light.h b/lights/Light.h deleted file mode 100644 index 6ea3495..0000000 --- a/lights/Light.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (C) 2018 The LineageOS 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_HARDWARE_LIGHT_V2_0_LIGHT_H -#define ANDROID_HARDWARE_LIGHT_V2_0_LIGHT_H - -#include -#include -#include -#include -#include - -namespace android { -namespace hardware { -namespace light { -namespace V2_0 { -namespace implementation { - -using ::android::hardware::Return; -using ::android::hardware::Void; -using ::android::hardware::hidl_vec; -using ::android::hardware::light::V2_0::ILight; -using ::android::hardware::light::V2_0::LightState; -using ::android::hardware::light::V2_0::Status; -using ::android::hardware::light::V2_0::Type; - -class Light : public ILight { - public: - Light(); - - Return setLight(Type type, const LightState& state) override; - Return getSupportedTypes(getSupportedTypes_cb _hidl_cb) override; - - private: - void handleBacklight(const LightState& state); - void handleRgb(const LightState& state, size_t index); - std::mutex mLock; - std::unordered_map> mLights; -}; - -} // namespace implementation -} // namespace V2_0 -} // namespace light -} // namespace hardware -} // namespace android - -#endif // ANDROID_HARDWARE_LIGHT_V2_0_LIGHT_H diff --git a/lights/android.hardware.light@2.0-service.oneplus_kona.rc b/lights/android.hardware.light@2.0-service.oneplus_kona.rc deleted file mode 100644 index b54ca95..0000000 --- a/lights/android.hardware.light@2.0-service.oneplus_kona.rc +++ /dev/null @@ -1,7 +0,0 @@ -service vendor.light-hal-2-0 /vendor/bin/hw/android.hardware.light@2.0-service - interface android.hardware.light@2.0::ILight default - class hal - user system - group system - # shutting off lights while powering-off - shutdown critical diff --git a/lights/service.cpp b/lights/service.cpp deleted file mode 100644 index c37925f..0000000 --- a/lights/service.cpp +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2018 The LineageOS 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. - */ - -#define LOG_TAG "android.hardware.light@2.0-service.oneplus_kona" - -#include -#include - -#include "Light.h" - -using android::hardware::configureRpcThreadpool; -using android::hardware::joinRpcThreadpool; - -using android::hardware::light::V2_0::ILight; -using android::hardware::light::V2_0::implementation::Light; - -using android::OK; -using android::status_t; - -int main() { - android::sp service = new Light(); - - configureRpcThreadpool(1, true); - - status_t status = service->registerAsService(); - if (status != OK) { - LOG(ERROR) << "Cannot register Light HAL service."; - return 1; - } - - LOG(INFO) << "Light HAL service ready."; - - joinRpcThreadpool(); - - LOG(ERROR) << "Light HAL service failed to join thread pool."; - return 1; -} diff --git a/sepolicy/private/file_contexts b/sepolicy/private/file_contexts index 805fa2e..3e368d5 100644 --- a/sepolicy/private/file_contexts +++ b/sepolicy/private/file_contexts @@ -9,7 +9,6 @@ /sys/devices/platform/soc/soc:goodix_fp/proximity_state u:object_r:sysfs_fpc_proximity:s0 # HALs -/(product|system/product)/vendor_overlay/[0-9]+/bin/hw/android\.hardware\.light@2\.0-service u:object_r:hal_light_default_exec:s0 /(product|system/product)/vendor_overlay/[0-9]+/bin/hw/android\.hardware\.power@1\.2-service u:object_r:hal_power_default_exec:s0 /system/bin/hw/lineage\.biometrics\.fingerprint\.inscreen@1.0-service\.oneplus_kona u:object_r:hal_fod_kona_exec:s0 /system/bin/hw/lineage\.livedisplay@2\.0-service\.oneplus_kona u:object_r:hal_livedisplay_kona_exec:s0 diff --git a/sepolicy/private/hal_light.te b/sepolicy/private/hal_light.te deleted file mode 100644 index 530ad70..0000000 --- a/sepolicy/private/hal_light.te +++ /dev/null @@ -1 +0,0 @@ -allow hal_light sysfs_oem:file getattr;