diff --git a/patches_treble_td/platform_frameworks_base/0040-SystemUI-Add-MTK-s-brightness-path-for-FOD.patch b/patches_treble_td/platform_frameworks_base/0040-SystemUI-Add-MTK-s-brightness-path-for-FOD.patch deleted file mode 100644 index d40165b..0000000 --- a/patches_treble_td/platform_frameworks_base/0040-SystemUI-Add-MTK-s-brightness-path-for-FOD.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 3bb8617db39e8249dde5d7fc01d07e375f9fba57 Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Sun, 15 Oct 2023 11:21:58 +0800 -Subject: [PATCH 40/40] SystemUI: Add MTK's brightness path for FOD - -Rewrote the part for easier extension - -Change-Id: Ifec88c625210301b5d1146bba0275cd9699243e8 ---- - .../android/systemui/biometrics/UdfpsView.kt | 30 ++++++++++++++----- - 1 file changed, 22 insertions(+), 8 deletions(-) - -diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt -index 8ab00fc34f0d..e43650d9d3f9 100644 ---- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt -+++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt -@@ -34,6 +34,7 @@ import android.widget.FrameLayout - import com.android.systemui.R - import com.android.systemui.doze.DozeReceiver - import java.io.File -+import java.io.FileNotFoundException - - import vendor.goodix.hardware.biometrics.fingerprint.V2_1.IGoodixFingerprintDaemon - -@@ -240,18 +241,31 @@ Log.d("PHH", "Surface destroyed!") - mySurfaceView.setVisibility(VISIBLE) - Log.d("PHH", "setting surface visible!") - -- val brightnessFile = File("/sys/class/backlight/panel/brightness") -- val maxBrightnessFile = File("/sys/class/backlight/panel/max_brightness") -+ val brightnessFiles = listOf( -+ File("/sys/class/backlight/panel/brightness"), -+ File("/sys/class/backlight/panel0-backlight/brightness"), -+ File("/sys/devices/platform/soc/soc:mtk_leds/leds/lcd-backlight/brightness") -+ ) -+ val maxBrightnessFiles = listOf( -+ File("/sys/class/backlight/panel/max_brightness"), -+ File("/sys/class/backlight/panel0-backlight/max_brightness"), -+ File("/sys/devices/platform/soc/soc:mtk_leds/leds/lcd-backlight/max_brightness") -+ ) - - var brightness: Double = 0.0 - var maxBrightness: Double = 0.0 -+ var bmFilesExist: Boolean = false - -- if (brightnessFile.exists() && maxBrightnessFile.exists()) { -- brightness = brightnessFile.readText().toDouble() -- maxBrightness = maxBrightnessFile.readText().toDouble() -- } else { -- brightness = File("/sys/class/backlight/panel0-backlight/brightness").readText().toDouble() -- maxBrightness = File("/sys/class/backlight/panel0-backlight/max_brightness").readText().toDouble() -+ brightnessFiles.zip(maxBrightnessFiles) {bFile, mFile -> -+ if (bFile.exists() && mFile.exists()) { -+ bmFilesExist = true -+ brightness = bFile.readText().toDouble() -+ maxBrightness = mFile.readText().toDouble() -+ } -+ } -+ -+ if (!bmFilesExist) { -+ throw FileNotFoundException("No brightness files under expected paths") - } - - // Assume HBM is max brightness --- -2.34.1 -