summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-12-04 01:11:11 +0100
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-12-04 01:11:11 +0100
commit1683a95f8a02ab3c13b1ad05fbe78a5350a3081b (patch)
tree875a453bd7f8c4800737354c47dd4f4f9335faf3
parent[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: ade32af710 -s ours am: 5a454d1810 -s ours (diff)
parentAdd support for controlling recovery brightness at exynos-compatible sysfs path (diff)
downloadandroid_bootable_recovery-1683a95f8a02ab3c13b1ad05fbe78a5350a3081b.tar
android_bootable_recovery-1683a95f8a02ab3c13b1ad05fbe78a5350a3081b.tar.gz
android_bootable_recovery-1683a95f8a02ab3c13b1ad05fbe78a5350a3081b.tar.bz2
android_bootable_recovery-1683a95f8a02ab3c13b1ad05fbe78a5350a3081b.tar.lz
android_bootable_recovery-1683a95f8a02ab3c13b1ad05fbe78a5350a3081b.tar.xz
android_bootable_recovery-1683a95f8a02ab3c13b1ad05fbe78a5350a3081b.tar.zst
android_bootable_recovery-1683a95f8a02ab3c13b1ad05fbe78a5350a3081b.zip
-rw-r--r--recovery_ui/ui.cpp17
1 files changed, 15 insertions, 2 deletions
diff --git a/recovery_ui/ui.cpp b/recovery_ui/ui.cpp
index 330721773..6e67b1d4e 100644
--- a/recovery_ui/ui.cpp
+++ b/recovery_ui/ui.cpp
@@ -48,6 +48,10 @@ constexpr const char* MAX_BRIGHTNESS_FILE = "/sys/class/leds/lcd-backlight/max_b
constexpr const char* BRIGHTNESS_FILE_SDM = "/sys/class/backlight/panel0-backlight/brightness";
constexpr const char* MAX_BRIGHTNESS_FILE_SDM =
"/sys/class/backlight/panel0-backlight/max_brightness";
+constexpr const char* BRIGHTNESS_FILE_PWM =
+ "/sys/class/backlight/pwm-backlight.0/brightness";
+constexpr const char* MAX_BRIGHTNESS_FILE_PWM =
+ "/sys/class/backlight/pwm-backlight.0/max_brightness";
constexpr int kDefaultTouchLowThreshold = 50;
constexpr int kDefaultTouchHighThreshold = 90;
@@ -106,10 +110,19 @@ bool RecoveryUI::InitScreensaver() {
return false;
}
if (access(brightness_file_.c_str(), R_OK | W_OK)) {
- brightness_file_ = BRIGHTNESS_FILE_SDM;
+ if (!access(BRIGHTNESS_FILE_SDM, R_OK | W_OK)) {
+ brightness_file_ = BRIGHTNESS_FILE_SDM;
+ } else {
+ brightness_file_ = BRIGHTNESS_FILE_PWM;
+ }
}
+
if (access(max_brightness_file_.c_str(), R_OK)) {
- max_brightness_file_ = MAX_BRIGHTNESS_FILE_SDM;
+ if (!access(MAX_BRIGHTNESS_FILE_SDM, R_OK)) {
+ max_brightness_file_ = MAX_BRIGHTNESS_FILE_SDM;
+ } else {
+ max_brightness_file_ = MAX_BRIGHTNESS_FILE_PWM;
+ }
}
// Set the initial brightness level based on the max brightness. Note that reading the initial
// value from BRIGHTNESS_FILE doesn't give the actual brightness value (bullhead, sailfish), so