berlna: Fit in the lights aidl

Signed-off-by: electimon <electimon@gmail.com>
Change-Id: Id5a24e52ade5001136ba52e3ea90a3bb085af263

lights/Android.bp

@@ -13,31 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-cc_binary {
-    name: "android.hardware.light@2.0-service.berlna",
-    defaults: ["hidl_defaults"],
-    init_rc: ["hidl/android.hardware.light@2.0-service.berlna.rc"],
-    vintf_fragments: ["hidl/android.hardware.light@2.0-service.berlna.xml"],
-    srcs: [
-        "hidl/service.cpp",
-        "hidl/Light.cpp",
-    ],
-    shared_libs: [
-        "libbase",
-        "libhidlbase",
-        "liblog",
-        "libutils",
-        "android.hardware.light@2.0",
-    ],
-    relative_install_path: "hw",
-    vendor: true,
-}
-
 cc_binary {
     name: "android.hardware.lights-service.berlna",
     relative_install_path: "hw",
-    init_rc: ["aidl/android.hardware.lights.berlna.rc"],
+    init_rc: ["android.hardware.lights.berlna.rc"],
-    vintf_fragments: ["aidl/android.hardware.lights.berlna.xml"],
+    vintf_fragments: ["android.hardware.lights.berlna.xml"],
     vendor: true,
     shared_libs: [
         "libbase",
@@ -47,7 +27,7 @@ cc_binary {
         "android.hardware.light-ndk_platform",
     ],
     srcs: [
-        "aidl/Lights.cpp",
+        "Lights.cpp",
-        "aidl/main.cpp",
+        "main.cpp",
     ],
 }

lights/hidl/Light.cpp

@@ -1,140 +0,0 @@
-/*
- * Copyright (C) 2017 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.berlna"
-
-#include <log/log.h>
-
-#include "Light.h"
-
-#include <fstream>
-
-namespace android {
-namespace hardware {
-namespace light {
-namespace V2_0 {
-namespace implementation {
-
-#define LEDS            "/sys/class/leds/"
-
-#define LCD_LED         LEDS "lcd-backlight/"
-#define CHARGING_LED    LEDS "charging/"
-
-#define BRIGHTNESS      "brightness"
-#define BREATH          "breath"
-#define DELAY_OFF       "delay_off"
-#define DELAY_ON        "delay_on"
-
-/*
- * Write value to path and close file.
- */
-static void set(std::string path, std::string value) {
-    std::ofstream file(path);
-
-    if (!file.is_open()) {
-        ALOGE("failed to write %s to %s", value.c_str(), path.c_str());
-        return;
-    }
-
-    file << value;
-}
-
-static void set(std::string path, int value) {
-    set(path, std::to_string(value));
-}
-    
-static uint32_t rgbToBrightness(const LightState& state) {
-    uint32_t color = state.color & 0x00ffffff;
-    return ((77 * ((color >> 16) & 0xff)) + (150 * ((color >> 8) & 0xff)) +
-            (29 * (color & 0xff))) >> 8;
-}
-
-static void handleBacklight(const LightState& state) {
-    uint32_t brightness = rgbToBrightness(state);
-    set(LCD_LED BRIGHTNESS, brightness);
-}
-
-static void handleNotification(const LightState& state) {
-    uint32_t alpha, brightness;
-
-    /*
-     * Extract brightness from AARRGGBB.
-     */
-    alpha = (state.color >> 24) & 0xFF;
-    brightness = rgbToBrightness(state);
-
-    /*
-     * Scale brightness if the Alpha brightness is not 0xFF.
-     */
-    if (alpha != 0xFF)
-        brightness = (brightness * alpha) / 0xFF;
-    
-    /* Disable blinking. */
-    set(CHARGING_LED BREATH, 0);
-
-    if (state.flashMode == Flash::TIMED) {
-        /* Set LED */
-        set(CHARGING_LED DELAY_OFF, state.flashOffMs);
-        set(CHARGING_LED DELAY_ON, state.flashOnMs);
-
-        /* Enable blinking. */
-        set(CHARGING_LED BREATH, 1);
-    } else {
-        set(CHARGING_LED BRIGHTNESS, brightness);
-    }
-}
-
-static std::map<Type, std::function<void(const LightState&)>> lights = {
-    {Type::BACKLIGHT, handleBacklight},
-    {Type::BATTERY, handleNotification},
-    {Type::NOTIFICATIONS, handleNotification},
-    {Type::ATTENTION, handleNotification},
-};
-
-Light::Light() {}
-
-Return<Status> Light::setLight(Type type, const LightState& state) {
-    auto it = lights.find(type);
-
-    if (it == lights.end()) {
-        return Status::LIGHT_NOT_SUPPORTED;
-    }
-
-    /*
-     * Lock global mutex until light state is updated.
-     */
-    std::lock_guard<std::mutex> lock(globalLock);
-
-    it->second(state);
-
-    return Status::SUCCESS;
-}
-
-Return<void> Light::getSupportedTypes(getSupportedTypes_cb _hidl_cb) {
-    std::vector<Type> types;
-
-    for (auto const& light : lights) types.push_back(light.first);
-
-    _hidl_cb(types);
-
-    return Void();
-}
-
-}  // namespace implementation
-}  // namespace V2_0
-}  // namespace light
-}  // namespace hardware
-}  // namespace android

lights/hidl/Light.h

@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2017 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 <android/hardware/light/2.0/ILight.h>
-#include <hidl/Status.h>
-#include <map>
-#include <mutex>
-
-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<Status> setLight(Type type, const LightState& state) override;
-    Return<void> getSupportedTypes(getSupportedTypes_cb _hidl_cb) override;
-
-   private:
-    std::mutex globalLock;
-};
-
-}  // namespace implementation
-}  // namespace V2_0
-}  // namespace light
-}  // namespace hardware
-}  // namespace android
-
-#endif  // ANDROID_HARDWARE_LIGHT_V2_0_LIGHT_H

lights/hidl/android.hardware.light@2.0-service.berlna.rc

@@ -1,16 +0,0 @@
-service vendor.light-hal-2-0 /vendor/bin/hw/android.hardware.light@2.0-service.berlna
-    class hal
-    user system
-    group system
-
-on boot
-    # Change ownership and permission for leds backlight
-    chmod 0664 /sys/class/leds/lcd-backlight/brightness
-    chown system system /sys/class/leds/charging/brightness
-    chmod 0664 /sys/class/leds/charging/brightness
-    chown system system /sys/class/leds/charging/breath
-    chmod 660 /sys/class/leds/charging/breath
-    chown system system /sys/class/leds/charging/delay_off
-    chmod 660 /sys/class/leds/charging/delay_off
-    chown system system /sys/class/leds/charging/delay_on
-    chmod 660 /sys/class/leds/charging/delay_on

lights/hidl/android.hardware.light@2.0-service.berlna.xml

@@ -1,11 +0,0 @@
-<manifest version="1.0" type="device">
-    <hal format="hidl">
-        <name>android.hardware.light</name>
-        <transport>hwbinder</transport>
-        <version>2.0</version>
-        <interface>
-            <name>ILight</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-</manifest>

lights/hidl/service.cpp

@@ -1,50 +0,0 @@
-/*
- * Copyright 2017 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.berlna"
-
-#include <hidl/HidlTransportSupport.h>
-
-#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::sp;
-using android::status_t;
-
-int main() {
-    android::sp<ILight> service = new Light();
-
-    configureRpcThreadpool(1, true);
-
-    status_t status = service->registerAsService();
-    if (status != OK) {
-        ALOGE("Cannot register Light HAL service.");
-        return 1;
-    }
-
-    ALOGI("Light HAL service ready.");
-
-    joinRpcThreadpool();
-
-    ALOGI("Light HAL service failed to join thread pool.");
-    return 1;
-}