MiPad4/android_device_xiaomi_sdm660-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sdm660-common: Improve lights HAL

Browse source 
* Use libbase logging and file utils
 * Read max brightness from sysfs
 * Convert constants to constexpr
 * Move helper functions to anonymous namespace
 * Bug fixes
 * Remove redundant chmod
 * Start the service after permissions are set up because it reads max
   brightness in constructor.

Change-Id: I145d393c785e182060c5651e796d489f8c4d697b
This commit is contained in:
dianlujitao 2020-04-14 23:05:38 +02:00 committed by OdSazib
parent cc63fa4306
commit 4a0d509d3c
No known key found for this signature in database
GPG key ID: CB336514F9F5CF69
6 changed files with 181 additions and 177 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.clang-format Symbolic link
View file

@ -0,0 +1 @@
../../../build/soong/scripts/system-clang-format

6
light/Android.bp
View file

@ -19,14 +19,12 @@ cc_binary {
init_rc: ["android.hardware.light@2.0-service.xiaomi_sdm660.rc"], init_rc: ["android.hardware.light@2.0-service.xiaomi_sdm660.rc"],
srcs: ["service.cpp", "Light.cpp"], srcs: ["service.cpp", "Light.cpp"],
shared_libs: [ shared_libs: [
"libhardware", "libbase",
"libhidlbase", "libhidlbase",
"libhidltransport", "libhidltransport",
"liblog",
"libhwbinder",
"libutils", "libutils",
"android.hardware.light@2.0", "android.hardware.light@2.0",
], ],
relative_install_path : "hw", relative_install_path : "hw",
proprietary: true, vendor: true,
} }

261
light/Light.cpp
View file

@ -1,5 +1,6 @@
/* /*
* Copyright (C) 2018 The Android Open Source Project * Copyright (C) 2018 The Android Open Source Project
* Copyright (C) 2020 The LineageOS Project
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -16,20 +17,20 @@
#define LOG_TAG "android.hardware.light@2.0-service.xiaomi_sdm660" #define LOG_TAG "android.hardware.light@2.0-service.xiaomi_sdm660"
#include <log/log.h>
#include <fstream>
#include "Light.h" #include "Light.h"
namespace android { #include <android-base/file.h>
namespace hardware { #include <android-base/logging.h>
namespace light {
namespace V2_0 { #include <iomanip>
namespace implementation {
namespace {
#define LEDS "/sys/class/leds/" #define LEDS "/sys/class/leds/"
#define LCD_LED LEDS "lcd-backlight/" #define LCD_LED LEDS "lcd-backlight/"
#define BRIGHTNESS "brightness"
#define WHITE LEDS "white/" #define WHITE LEDS "white/"
#define BRIGHTNESS "brightness"
#define MAX_BRIGHTNESS "max_brightness"
#define BLINK "blink" #define BLINK "blink"
#define DUTY_PCTS "duty_pcts" #define DUTY_PCTS "duty_pcts"
#define PAUSE_HI "pause_hi" #define PAUSE_HI "pause_hi"
@ -37,55 +38,38 @@ namespace implementation {
#define RAMP_STEP_MS "ramp_step_ms" #define RAMP_STEP_MS "ramp_step_ms"
#define START_IDX "start_idx" #define START_IDX "start_idx"
#define MAX_LED_BRIGHTNESS 255 using ::android::base::ReadFileToString;
#define MAX_LCD_BRIGHTNESS 4095 using ::android::base::WriteStringToFile;
/* // Default max brightness
* 8 duty percent steps. constexpr auto kDefaultMaxLedBrightness = 255;
*/ constexpr auto kDefaultMaxScreenBrightness = 4095;
#define RAMP_STEPS 15
/*
* Each step will stay on for 50ms by default.
*/
#define RAMP_STEP_DURATION 150
/*
* Each value represents a duty percent (0 - 100) for the led pwm.
*/
static int32_t BRIGHTNESS_RAMP[RAMP_STEPS] = {0, 12, 25, 37, 50, 72, 85, 100, 85, 72, 50, 37, 25, 12, 0};
/* // Each step will stay on for 100ms by default.
* Write value to path and close file. constexpr auto kRampStepDuration = 100;
*/
static void set(std::string path, std::string value) { // Each value represents a duty percent (0 - 100) for the led pwm.
std::ofstream file(path); constexpr std::array kBrightnessRamp = {0, 12, 25, 37, 50, 72, 85, 100, 85, 72, 50, 37, 25, 12, 0};
/* Only write brightness value if stream is open, alive & well */
if (file.is_open()) { // Write value to path and close file.
file << value; bool WriteToFile(const std::string& path, uint32_t content) {
} else { return WriteStringToFile(std::to_string(content), path);
/* 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) { bool WriteToFile(const std::string& path, const std::string& content) {
set(path, std::to_string(value)); return WriteStringToFile(content, path);
} }
static uint32_t getBrightness(const LightState& state) { uint32_t RgbaToBrightness(uint32_t color) {
uint32_t alpha, red, green, blue; // Extract brightness from AARRGGBB.
uint32_t alpha = (color >> 24) & 0xFF;
/* // Retrieve each of the RGB colors
* Extract brightness from AARRGGBB. uint32_t red = (color >> 16) & 0xFF;
*/ uint32_t green = (color >> 8) & 0xFF;
alpha = (state.color >> 24) & 0xFF; uint32_t blue = color & 0xFF;
red = (state.color >> 16) & 0xFF;
green = (state.color >> 8) & 0xFF;
blue = state.color & 0xFF;
/* // Scale RGB colors if a brightness has been applied by the user
* Scale RGB brightness if Alpha brightness is not 0xFF.
*/
if (alpha != 0xFF) { if (alpha != 0xFF) {
red = red * alpha / 0xFF; red = red * alpha / 0xFF;
green = green * alpha / 0xFF; green = green * alpha / 0xFF;
@ -95,130 +79,133 @@ static uint32_t getBrightness(const LightState& state) {
return (77 * red + 150 * green + 29 * blue) >> 8; return (77 * red + 150 * green + 29 * blue) >> 8;
} }
inline uint32_t RgbaToBrightness(uint32_t color, uint32_t max_brightness) {
return RgbaToBrightness(color) * max_brightness / 0xFF;
}
/* /*
* Scale each value of the brightness ramp according to the * Scale each value of the brightness ramp according to the
* brightness of the color. * brightness of the color.
*/ */
static std::string getScaledRamp(uint32_t brightness) { std::string GetScaledDutyPcts(uint32_t brightness) {
std::string ramp, pad; std::stringstream ramp;
for (auto const& step : BRIGHTNESS_RAMP) { for (size_t i = 0; i < kBrightnessRamp.size(); i++) {
ramp += pad + std::to_string(step * brightness / 0xFF); if (i > 0) ramp << ",";
pad = ","; ramp << kBrightnessRamp[i] * brightness / 0xFF;
} }
return ramp; return ramp.str();
} }
static inline uint32_t scaleBrightness(uint32_t brightness, uint32_t maxBrightness) { inline bool IsLit(uint32_t color) {
return brightness * maxBrightness / 0xFF; return color & 0x00ffffff;
} }
static inline uint32_t getScaledBrightness(const LightState& state, uint32_t maxBrightness) { } // anonymous namespace
return scaleBrightness(getBrightness(state), maxBrightness);
}
static void handleXiaomiBacklight(Type /*type*/, const LightState& state) { namespace android {
uint32_t brightness = getScaledBrightness(state, MAX_LCD_BRIGHTNESS); namespace hardware {
set(LCD_LED BRIGHTNESS, brightness); namespace light {
} namespace V2_0 {
namespace implementation {
static void setNotification(const LightState& state) { Light::Light() {
uint32_t whiteBrightness = getScaledBrightness(state, MAX_LED_BRIGHTNESS); std::string buf;
/* Turn off the leds (initially) */ if (ReadFileToString(LCD_LED MAX_BRIGHTNESS, &buf)) {
set(WHITE BLINK, 0); max_screen_brightness_ = std::stoi(buf);
if (state.flashMode == Flash::TIMED) {
/*
* If the flashOnMs duration is not long enough to fit ramping up
* and down at the default step duration, step duration is modified
* to fit.
*/
int32_t stepDuration = RAMP_STEP_DURATION;
int32_t pauseHi = state.flashOnMs - (stepDuration * RAMP_STEPS * 2);
int32_t pauseLo = state.flashOffMs;
if (pauseHi < 0) {
pauseHi = 0;
}
/* White */
set(WHITE START_IDX, 0 * RAMP_STEPS);
set(WHITE DUTY_PCTS, getScaledRamp(whiteBrightness));
set(WHITE PAUSE_LO, pauseLo);
set(WHITE PAUSE_HI, pauseHi);
set(WHITE RAMP_STEP_MS, stepDuration);
set(WHITE BLINK, 1);
} else { } else {
set(WHITE BRIGHTNESS, whiteBrightness); max_screen_brightness_ = kDefaultMaxScreenBrightness;
LOG(ERROR) << "Failed to read max screen brightness, fallback to "
<< kDefaultMaxLedBrightness;
}
if (ReadFileToString(WHITE MAX_BRIGHTNESS, &buf)) {
max_led_brightness_ = std::stoi(buf);
} else {
max_led_brightness_ = kDefaultMaxLedBrightness;
LOG(ERROR) << "Failed to read max LED brightness, fallback to " << kDefaultMaxLedBrightness;
} }
} }
static inline bool isLit(const LightState& state) {
return state.color & 0x00ffffff;
}
/*
* Keep sorted in the order of importance.
*/
static const LightState offState = {};
static std::vector<std::pair<Type, LightState>> notificationStates = {
{ Type::ATTENTION, offState },
{ Type::NOTIFICATIONS, offState },
{ Type::BATTERY, offState },
};
static void handleXiaomiNotification(Type type, const LightState& state) {
for(auto it : notificationStates) {
if (it.first == type) {
it.second = state;
}
if (isLit(it.second)) {
setNotification(it.second);
return;
}
}
setNotification(offState);
}
static std::map<Type, std::function<void(Type type, const LightState&)>> lights = {
{Type::BACKLIGHT, handleXiaomiBacklight},
{Type::NOTIFICATIONS, handleXiaomiNotification},
{Type::BATTERY, handleXiaomiNotification},
{Type::ATTENTION, handleXiaomiNotification},
};
Light::Light() {}
Return<Status> Light::setLight(Type type, const LightState& state) { Return<Status> Light::setLight(Type type, const LightState& state) {
auto it = lights.find(type); auto it = lights_.find(type);
if (it == lights.end()) { if (it == lights_.end()) {
return Status::LIGHT_NOT_SUPPORTED; return Status::LIGHT_NOT_SUPPORTED;
} }
/*
* Lock global mutex until light state is updated.
*/
std::lock_guard<std::mutex> lock(globalLock);
it->second(type, state); it->second(type, state);
return Status::SUCCESS; return Status::SUCCESS;
} }
Return<void> Light::getSupportedTypes(getSupportedTypes_cb _hidl_cb) { Return<void> Light::getSupportedTypes(getSupportedTypes_cb _hidl_cb) {
std::vector<Type> types; std::vector<Type> types;
for (auto const& light : lights) types.push_back(light.first); for (auto&& light : lights_) types.emplace_back(light.first);
_hidl_cb(types); _hidl_cb(types);
return Void(); return Void();
} }
void Light::setLightBacklight(Type /*type*/, const LightState& state) {
uint32_t brightness = RgbaToBrightness(state.color, max_screen_brightness_);
WriteToFile(LCD_LED BRIGHTNESS, brightness);
}
void Light::setLightNotification(Type type, const LightState& state) {
bool found = false;
for (auto&& [cur_type, cur_state] : notif_states_) {
if (cur_type == type) {
cur_state = state;
}
// Fallback to battery light
if (!found && (cur_type == Type::BATTERY || IsLit(state.color))) {
found = true;
LOG(DEBUG) << __func__ << ": type=" << toString(cur_type);
applyNotificationState(state);
}
}
}
void Light::applyNotificationState(const LightState& state) {
uint32_t white_brightness = RgbaToBrightness(state.color, max_led_brightness_);
// Turn off the leds (initially)
WriteToFile(WHITE BLINK, 0);
if (state.flashMode == Flash::TIMED && state.flashOnMs > 0 && state.flashOffMs > 0) {
/*
* If the flashOnMs duration is not long enough to fit ramping up
* and down at the default step duration, step duration is modified
* to fit.
*/
int32_t step_duration = kRampStepDuration;
int32_t pause_hi = state.flashOnMs - (step_duration * kBrightnessRamp.size() * 2);
if (pause_hi < 0) {
step_duration = state.flashOnMs / (kBrightnessRamp.size() * 2);
pause_hi = 0;
}
LOG(DEBUG) << __func__ << ": color=" << std::hex << state.color << std::dec
<< " onMs=" << state.flashOnMs << " offMs=" << state.flashOffMs;
// White
WriteToFile(WHITE START_IDX, 0);
WriteToFile(WHITE DUTY_PCTS, GetScaledDutyPcts(white_brightness));
WriteToFile(WHITE PAUSE_LO, static_cast<uint32_t>(state.flashOffMs));
WriteToFile(WHITE PAUSE_HI, static_cast<uint32_t>(pause_hi));
WriteToFile(WHITE RAMP_STEP_MS, static_cast<uint32_t>(step_duration));
WriteToFile(WHITE BLINK, 1);
} else {
WriteToFile(WHITE BRIGHTNESS, white_brightness);
}
}
} // namespace implementation } // namespace implementation
} // namespace V2_0 } // namespace V2_0
} // namespace light } // namespace light

36
light/Light.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2017 The LineageOS Project * Copyright (C) 2017-2020 The LineageOS Project
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -13,14 +13,12 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
#ifndef ANDROID_HARDWARE_LIGHT_V2_0_LIGHT_H
#define ANDROID_HARDWARE_LIGHT_V2_0_LIGHT_H #pragma once
#include <android/hardware/light/2.0/ILight.h> #include <android/hardware/light/2.0/ILight.h>
#include <hardware/lights.h>
#include <hidl/Status.h> #include <unordered_map>
#include <map>
#include <mutex>
namespace android { namespace android {
namespace hardware { namespace hardware {
@ -29,8 +27,6 @@ namespace V2_0 {
namespace implementation { namespace implementation {
using ::android::hardware::Return; 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::ILight;
using ::android::hardware::light::V2_0::LightState; using ::android::hardware::light::V2_0::LightState;
using ::android::hardware::light::V2_0::Status; using ::android::hardware::light::V2_0::Status;
@ -44,7 +40,25 @@ class Light : public ILight {
Return<void> getSupportedTypes(getSupportedTypes_cb _hidl_cb) override; Return<void> getSupportedTypes(getSupportedTypes_cb _hidl_cb) override;
private: private:
std::mutex globalLock; void setLightBacklight(Type type, const LightState& state);
void setLightNotification(Type type, const LightState& state);
void applyNotificationState(const LightState& state);
uint32_t max_led_brightness_;
uint32_t max_screen_brightness_;
std::unordered_map<Type, std::function<void(Type type, const LightState&)>> lights_{
{Type::ATTENTION, [this](auto&&... args) { setLightNotification(args...); }},
{Type::BACKLIGHT, [this](auto&&... args) { setLightBacklight(args...); }},
{Type::BATTERY, [this](auto&&... args) { setLightNotification(args...); }},
{Type::NOTIFICATIONS, [this](auto&&... args) { setLightNotification(args...); }}};
// Keep sorted in the order of importance.
std::array<std::pair<Type, LightState>, 3> notif_states_ = {{
{Type::ATTENTION, {}},
{Type::NOTIFICATIONS, {}},
{Type::BATTERY, {}},
}};
}; };
} // namespace implementation } // namespace implementation
@ -52,5 +66,3 @@ class Light : public ILight {
} // namespace light } // namespace light
} // namespace hardware } // namespace hardware
} // namespace android } // namespace android
#endif // ANDROID_HARDWARE_LIGHT_V2_0_LIGHT_H

6
light/android.hardware.light@2.0-service.xiaomi_sdm660.rc
View file

@ -3,6 +3,7 @@ on boot
chown system system /sys/class/leds/white/blink chown system system /sys/class/leds/white/blink
chown system system /sys/class/leds/white/brightness chown system system /sys/class/leds/white/brightness
chown system system /sys/class/leds/white/duty_pcts chown system system /sys/class/leds/white/duty_pcts
chown system system /sys/class/leds/white/max_brightness
chown system system /sys/class/leds/white/pause_hi chown system system /sys/class/leds/white/pause_hi
chown system system /sys/class/leds/white/pause_lo chown system system /sys/class/leds/white/pause_lo
chown system system /sys/class/leds/white/ramp_step_ms chown system system /sys/class/leds/white/ramp_step_ms
@ -16,6 +17,10 @@ on boot
chmod 660 /sys/class/leds/white/ramp_step_ms chmod 660 /sys/class/leds/white/ramp_step_ms
chmod 660 /sys/class/leds/white/start_idx chmod 660 /sys/class/leds/white/start_idx
chown system system /sys/class/leds/lcd-backlight/max_brightness
start vendor.light-hal-2-0
service vendor.light-hal-2-0 /vendor/bin/hw/android.hardware.light@2.0-service.xiaomi_sdm660 service vendor.light-hal-2-0 /vendor/bin/hw/android.hardware.light@2.0-service.xiaomi_sdm660
interface android.hardware.light@2.0::ILight default interface android.hardware.light@2.0::ILight default
class hal class hal
@ -23,3 +28,4 @@ service vendor.light-hal-2-0 /vendor/bin/hw/android.hardware.light@2.0-service.x
group system group system
# shutting off lights while powering-off # shutting off lights while powering-off
shutdown critical shutdown critical
disabled

14
light/service.cpp
View file

@ -1,5 +1,6 @@
/* /*
* Copyright 2018 The Android Open Source Project * Copyright (C) 2018 The Android Open Source Project
* Copyright (C) 2020 The LineageOS Project
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -16,6 +17,7 @@
#define LOG_TAG "android.hardware.light@2.0-service.xiaomi_sdm660" #define LOG_TAG "android.hardware.light@2.0-service.xiaomi_sdm660"
#include <android-base/logging.h>
#include <hidl/HidlTransportSupport.h> #include <hidl/HidlTransportSupport.h>
#include "Light.h" #include "Light.h"
@ -23,28 +25,26 @@
using android::hardware::configureRpcThreadpool; using android::hardware::configureRpcThreadpool;
using android::hardware::joinRpcThreadpool; using android::hardware::joinRpcThreadpool;
using android::hardware::light::V2_0::ILight;
using android::hardware::light::V2_0::implementation::Light; using android::hardware::light::V2_0::implementation::Light;
using android::OK; using android::OK;
using android::sp;
using android::status_t; using android::status_t;
int main() { int main() {
android::sp<ILight> service = new Light(); android::sp<Light> service = new Light();
configureRpcThreadpool(1, true); configureRpcThreadpool(1, true);
status_t status = service->registerAsService(); status_t status = service->registerAsService();
if (status != OK) { if (status != OK) {
ALOGE("Cannot register Light HAL service."); LOG(ERROR) << "Cannot register Light HAL service.";
return 1; return 1;
} }
ALOGI("Light HAL service ready."); LOG(DEBUG) << "Light HAL service ready.";
joinRpcThreadpool(); joinRpcThreadpool();
ALOGI("Light HAL service failed to join thread pool."); LOG(ERROR) << "Light HAL service failed to join thread pool.";
return 1; return 1;
} }