msm8953: kang light hal from moto msm8937 tree

Android.bp

@@ -1,2 +1,3 @@
-soong_namespace {
+subdirs = [
-}
+    "light",
+]

light/Android.bp

@@ -1,24 +1,14 @@
 //
-// Copyright (C) 2017 The LineageOS Project
+// SPDX-License-Identifier: GPL-3.0-or-later
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Copyright (C) 2019, Harshit Jain
-// 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.
 
 cc_binary {
-    relative_install_path: "hw",
     defaults: ["hidl_defaults"],
-    name: "android.hardware.light@2.0-service.motorola_msm8953",
+    name: "android.hardware.light@2.0-service.msm8953",
-    proprietary: true,
+    init_rc: ["android.hardware.light@2.0-service.msm8953.rc"],
-    init_rc: ["android.hardware.light@2.0-service.motorola_msm8953.rc"],
     srcs: ["service.cpp", "Light.cpp"],
     shared_libs: [
 	"libhardware",
@@ -26,7 +16,10 @@ cc_binary {
 	"libhidltransport",
 	"liblog",
 	"libhwbinder",
+	"libcutils",
 	"libutils",
 	"android.hardware.light@2.0",
     ],
+    relative_install_path : "hw",
+    vendor: true,
 }

light/Light.cpp

@@ -1,26 +1,14 @@
 /*
- * Copyright (C) 2017 The LineageOS Project
+ * SPDX-License-Identifier: GPL-3.0-or-later
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Copyright (C) 2019, Harshit Jain
- * 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 "LightService"
+#define LOG_TAG "android.hardware.light@2.0-service.msm8953"
 
 #include <log/log.h>
-
-#include "Light.h"
-
 #include <fstream>
+#include "Light.h"
 
 namespace android {
 namespace hardware {
@@ -28,74 +16,66 @@ namespace light {
 namespace V2_0 {
 namespace implementation {
 
-#define LED_LIGHT_OFF          0
-#define LED_LIGHT_BLINK_FAST   1
-#define LED_LIGHT_BLINK_SLOW   2
-#define LED_LIGHT_SOLID_ON     3
-
 #define LEDS                       "/sys/class/leds/"
-
 #define LCD_LED                    LEDS "lcd-backlight/"
-#define CHARGING_LED    LEDS "charging/"
-
 #define BRIGHTNESS                 "brightness"
-
+#define WHITE                      LEDS "white/"
 
 /*
  * Write value to path and close file.
  */
 static void set(std::string path, std::string value) {
     std::ofstream file(path);
+    /* Only write brightness value if stream is open, alive & well */
+    if (file.is_open()) {
         file << value;
+    } else {
+        /* Fire a warning a bail out */
+        ALOGE("failed to write %s to %s", value.c_str(), path.c_str());
+        return;
+    }
 }
 
 static void set(std::string path, int value) {
     set(path, std::to_string(value));
 }
 
-static uint32_t is_lit(const LightState& state) {
+static inline bool isLit(const LightState& state) {
     return state.color & 0x00ffffff;
 }
 
-static uint32_t rgbToBrightness(const LightState& state) {
+/*
-    uint32_t color = state.color & 0x00ffffff;
+ * Device specific methods
-    return ((77 * ((color >> 16) & 0xff)) + (150 * ((color >> 8) & 0xff)) +
+ */
-            (29 * (color & 0xff))) >> 8;
+static void Backlight(const LightState& state) {
-}
+    uint32_t brightness = state.color & 0xFF;
-
-static void handleBacklight(const LightState& state) {
-    uint32_t brightness = rgbToBrightness(state);
     set(LCD_LED BRIGHTNESS, brightness);
 }
 
-static void handleBattery(const LightState& state) {
+static inline void Led(const LightState& state, uint32_t pattern) {
-    uint32_t Brightness;
+    isLit(state) ? set(WHITE BRIGHTNESS, pattern) : set(WHITE BRIGHTNESS, 0);
-
-    if (is_lit(state))
-        Brightness = LED_LIGHT_SOLID_ON;
-    else
-        Brightness = LED_LIGHT_OFF;
-    
-     set(CHARGING_LED BRIGHTNESS, Brightness);
 }
 
-static void handleNotification(const LightState& state) {
+static void Notification(const LightState& state) {
-    uint32_t Brightness;
+    /* Fast blink */
-
+    Led(state, 1);
-    if (is_lit(state))
-        Brightness = LED_LIGHT_BLINK_SLOW;
-    else
-        Brightness = LED_LIGHT_OFF;
-    
-     set(CHARGING_LED BRIGHTNESS, Brightness);
 }
 
+static void Attention(const LightState& state) {
+    /* Slow blink */
+    Led(state, 2);
+}
+
+static void ChargingNotification(const LightState& state) {
+    /* Steady Led */
+    Led(state, 3);
+}
 
 static std::map<Type, std::function<void(const LightState&)>> lights = {
-    {Type::BACKLIGHT, handleBacklight},
+    {Type::BACKLIGHT, Backlight},
-    {Type::BATTERY, handleBattery},
+    {Type::NOTIFICATIONS, Notification},
-    {Type::NOTIFICATIONS, handleNotification},
+    {Type::BATTERY, ChargingNotification},
-    {Type::ATTENTION, handleNotification},
+    {Type::ATTENTION, Attention},
 };
 
 Light::Light() {}
@@ -110,10 +90,9 @@ Return<Status> Light::setLight(Type type, const LightState& state) {
     /*
      * Lock global mutex until light state is updated.
      */
+
     std::lock_guard<std::mutex> lock(globalLock);
-
     it->second(state);
-
     return Status::SUCCESS;
 }
 
@@ -126,9 +105,9 @@ Return<void> Light::getSupportedTypes(getSupportedTypes_cb _hidl_cb) {
 
     return Void();
 }
-
+/* Close all the namespaces */
-}  // namespace implementation
+}
-}  // namespace V2_0
+}
-}  // namespace light
+}
-}  // namespace hardware
+}
-}  // namespace android
+}

light/Light.h

@@ -1,17 +1,7 @@
 /*
- * Copyright (C) 2017 The LineageOS Project
+ * SPDX-License-Identifier: GPL-3.0-or-later
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Copyright (C) 2019, Harshit Jain
- * 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

light/android.hardware.light@2.0-service.motorola_msm8953.rc

@@ -1,5 +0,0 @@
-service vendor.light-hal-2-0 /vendor/bin/hw/android.hardware.light@2.0-service.motorola_msm8953
-    class hal
-    user system
-    group system
-    shutdown critical

light/android.hardware.light@2.0-service.msm8953.rc

@@ -0,0 +1,12 @@
+on boot
+    # Notification LED
+    chown system system /sys/class/leds/white/brightness
+    chmod 660 /sys/class/leds/white/brightness
+ 
+service light-hal-2-0 /vendor/bin/hw/android.hardware.light@2.0-service.msm8953
+    interface android.hardware.light@2.0::ILight default
+    class hal
+    user system
+    group system
+    # shutting off lights while powering-off
+    shutdown critical

light/service.cpp

@@ -1,20 +1,14 @@
 /*
- * Copyright 2017 The LineageOS Project
+ * SPDX-License-Identifier: GPL-3.0-or-later
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Copyright (C) 2019, Harshit Jain
- * 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.motorola_msm8953"
+#define LOG_TAG "android.hardware.light@2.0-service.msm8953"
+
+/* dev-harsh1998: set page size to 32Kb for our hal */
+#include <hwbinder/ProcessState.h>
+#include <cutils/properties.h>
 
 #include <hidl/HidlTransportSupport.h>
 
@@ -30,8 +24,18 @@ using android::OK;
 using android::sp;
 using android::status_t;
 
+#define DEFAULT_LGTHAL_HW_BINDER_SIZE_KB 32
+size_t getHWBinderMmapSize() {
+    size_t value = 0;
+    value = property_get_int32("persist.vendor.msm8953.lighthal.hw.binder.size", DEFAULT_LGTHAL_HW_BINDER_SIZE_KB);
+    if (!value) value = DEFAULT_LGTHAL_HW_BINDER_SIZE_KB; // deafult to 1 page of 32 Kb
+     return 1024 * value;
+}
+
 int main() {
-    sp<ILight> service = new Light();
+    /* default to 32Kb */
+    android::hardware::ProcessState::initWithMmapSize(getHWBinderMmapSize());
+    android::sp<ILight> service = new Light();
 
     configureRpcThreadpool(1, true);
 

msm8953.mk

@@ -227,8 +227,7 @@ PRODUCT_COPY_FILES += \
 
 # Lights
 PRODUCT_PACKAGES += \
-    android.hardware.light@2.0-impl \
+    android.hardware.light@2.0-service.msm8953
-    android.hardware.light@2.0-service.motorola_msm8953
 
 # Media
 PRODUCT_COPY_FILES += \

overlay/frameworks/base/core/res/res/values/config.xml

@@ -49,6 +49,9 @@
     <!-- Is the battery LED intrusive? Used to decide if there should be a disable option -->
     <bool name="config_intrusiveBatteryLed">true</bool>
 
+    <!-- Is the notification LED intrusive? Used to decide if there should be a disable option -->
+    <bool name="config_intrusiveNotificationLed">true</bool>
+
      <!-- Does the battery LED support multiple colors?
          Used to decide if the user can change the colors -->
     <bool name="config_multiColorBatteryLed">false</bool>

rootdir/etc/init.target.rc

@@ -329,17 +329,3 @@ service energy-awareness /system/vendor/bin/energy-awareness
 on boot
     write /sys/devices/soc/78b8000.i2c/i2c-4/4-0020/input/input0/fw_name PR1702898-s3528t_00260005_00380008.img
     write /sys/devices/soc/78b8000.i2c/i2c-4/4-0020/input/input0/update_fw 1
-
-on boot
-    chown system iystem /sys/class/leds/red/blink
-    chown system system /sys/class/leds/red/breath
-    chown system system /sys/class/leds/red/delay_on
-    chown system system /sys/class/leds/red/delay_off
-    chown system system /sys/class/leds/green/blink
-    chown system system /sys/class/leds/green/breath
-    chown system system /sys/class/leds/green/delay_on
-    chown system system /sys/class/leds/green/delay_off
-    chown system system /sys/class/leds/blue/blink
-    chown system system /sys/class/leds/blue/breath
-    chown system system /sys/class/leds/blue/delay_on
-    chown system system /sys/class/leds/blue/delay_off

sepolicy/vendor/file_contexts

@@ -26,7 +26,7 @@
 
 /(vendor|system/vendor)/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.1-fpcservice    u:object_r:hal_fingerprint_fpc_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.1-service-ets   u:object_r:hal_fingerprint_fpc_exec:s0
-/(vendor|system/vendor)/bin/hw/android\.hardware\.light@2\.0-service.motorola_msm8953    u:object_r:hal_light_default_exec:s0
+/(vendor|system/vendor)/bin/hw/android\.hardware\.light@2\.0-service\.msm8953                u:object_r:hal_light_default_exec:s0
 /(vendor|system/vendor)/bin/hw/vendor\.dolby\.hardware\.dms@1\.0-service                     u:object_r:hal_dms_default_exec:s0
 /(vendor|system/vendor)/bin/init\.mmi\.(laser|usb)\.sh                          u:object_r:qti_init_shell_exec:s0
 /(vendor|system/vendor)/bin/init\.qcom\.power\.sh                               u:object_r:qti_init_shell_exec:s0