diff --git a/patches/personal/platform_frameworks_base/0009-feat-Add-Face-Unlock-with-ParanoidSense-1-2.patch b/patches/personal/platform_frameworks_base/0009-feat-Add-Face-Unlock-with-ParanoidSense-1-2.patch
index 446270c3..6f83045b 100644
--- a/patches/personal/platform_frameworks_base/0009-feat-Add-Face-Unlock-with-ParanoidSense-1-2.patch
+++ b/patches/personal/platform_frameworks_base/0009-feat-Add-Face-Unlock-with-ParanoidSense-1-2.patch
@@ -1,4 +1,4 @@
-From aaeff66f60268291f87912f634113b58ebd4ec35 Mon Sep 17 00:00:00 2001
+From 677726b407cc46a8b7ea33ca0a95fc973b720693 Mon Sep 17 00:00:00 2001
 From: Chris Crump <chriscrawford893@gmail.com>
 Date: Tue, 1 Nov 2022 17:27:48 -0400
 Subject: [PATCH 9/9] feat: Add Face Unlock with ParanoidSense (1/2)
@@ -137,7 +137,7 @@ index 924aac4e70be..8cc77c16edac 100644
          pw.println("  bouncerShowing: $bouncerShowing")
          pw.println("  altBouncerShowing: $altBouncerShowing")
 diff --git a/services/core/Android.bp b/services/core/Android.bp
-index 18a9fe12ecb7..0b8fe87d2a86 100644
+index 6cba27c50972..8cb2d1084c23 100644
 --- a/services/core/Android.bp
 +++ b/services/core/Android.bp
 @@ -194,6 +194,7 @@ java_library_static {
@@ -145,9 +145,9 @@ index 18a9fe12ecb7..0b8fe87d2a86 100644
          "vendor.oppo.hardware.biometrics.fingerprint-V2.1-java",
          "vendor.xiaomi.hardware.fingerprintextension-V1.0-java",
 +        "vendor.aospa.biometrics.face",
-     ],
-     javac_shard_size: 50,
-     javacflags: [
+ 
+         //AIDL
+         "vendor.samsung.hardware.biometrics.fingerprint-V1-java",
 diff --git a/services/core/java/com/android/server/biometrics/log/BiometricLogger.java b/services/core/java/com/android/server/biometrics/log/BiometricLogger.java
 index 87037af11a84..e8b042cd032c 100644
 --- a/services/core/java/com/android/server/biometrics/log/BiometricLogger.java
diff --git a/patches/trebledroid/platform_frameworks_base/0001-Disable-vendor-mismatch-warning.patch b/patches/trebledroid/platform_frameworks_base/0001-Disable-vendor-mismatch-warning.patch
index b3f641ce..bc2de230 100644
--- a/patches/trebledroid/platform_frameworks_base/0001-Disable-vendor-mismatch-warning.patch
+++ b/patches/trebledroid/platform_frameworks_base/0001-Disable-vendor-mismatch-warning.patch
@@ -1,7 +1,7 @@
 From ed3a5e94a1bc6c13147e0fbbe21dde05001001c0 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Thu, 5 Apr 2018 10:01:19 +0800
-Subject: [PATCH 01/45] Disable vendor mismatch warning
+Subject: [PATCH 01/46] Disable vendor mismatch warning
 
 Change-Id: Ieb8fe91e2f02462f074312ed0f4885d183e9780b
 ---
diff --git a/patches/trebledroid/platform_frameworks_base/0002-Fallback-to-stupid-autobrightness-if-brightness-valu.patch b/patches/trebledroid/platform_frameworks_base/0002-Fallback-to-stupid-autobrightness-if-brightness-valu.patch
index f846da9e..2ff92dd2 100644
--- a/patches/trebledroid/platform_frameworks_base/0002-Fallback-to-stupid-autobrightness-if-brightness-valu.patch
+++ b/patches/trebledroid/platform_frameworks_base/0002-Fallback-to-stupid-autobrightness-if-brightness-valu.patch
@@ -1,7 +1,7 @@
 From ba7a834e3dfc496970973b3541f7b032e61adfb2 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 5 Oct 2021 17:59:16 -0400
-Subject: [PATCH 02/45] Fallback to stupid autobrightness if brightness values
+Subject: [PATCH 02/46] Fallback to stupid autobrightness if brightness values
  are broken
 
 This is needed because of:
diff --git a/patches/trebledroid/platform_frameworks_base/0003-Fix-env-empty-string-ANDROID_STORAGE.patch b/patches/trebledroid/platform_frameworks_base/0003-Fix-env-empty-string-ANDROID_STORAGE.patch
index d7716a36..133efeee 100644
--- a/patches/trebledroid/platform_frameworks_base/0003-Fix-env-empty-string-ANDROID_STORAGE.patch
+++ b/patches/trebledroid/platform_frameworks_base/0003-Fix-env-empty-string-ANDROID_STORAGE.patch
@@ -1,7 +1,7 @@
 From 83e00d63b8755ebd5aa364fd7003c0d51224b3ae Mon Sep 17 00:00:00 2001
 From: Raphael Mounier <mounierr07@gmail.com>
 Date: Sat, 6 Aug 2022 18:08:36 +0200
-Subject: [PATCH 03/45] Fix env empty string - ANDROID_STORAGE
+Subject: [PATCH 03/46] Fix env empty string - ANDROID_STORAGE
 
 Huawei hi6250 define in init.hi6250.rc ANDROID_STORAGE to "", so check empty string and replace with default path. Apply change for all env directory
 ---
diff --git a/patches/trebledroid/platform_frameworks_base/0004-Relax-requirement-for-visible-flag-to-sdcards.patch b/patches/trebledroid/platform_frameworks_base/0004-Relax-requirement-for-visible-flag-to-sdcards.patch
index 3d370ded..9746d062 100644
--- a/patches/trebledroid/platform_frameworks_base/0004-Relax-requirement-for-visible-flag-to-sdcards.patch
+++ b/patches/trebledroid/platform_frameworks_base/0004-Relax-requirement-for-visible-flag-to-sdcards.patch
@@ -1,7 +1,7 @@
 From 822e5c74e5c11757017ddc45fb782ff7d5b5b5d9 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 28 Nov 2017 18:28:04 +0100
-Subject: [PATCH 04/45] Relax requirement for visible flag to sdcards
+Subject: [PATCH 04/46] Relax requirement for visible flag to sdcards
 
 The vast majority of sdcard readers are stable enough to be declared by
 the API. (I see no counter-example)
diff --git a/patches/trebledroid/platform_frameworks_base/0005-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch b/patches/trebledroid/platform_frameworks_base/0005-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch
index 52a22741..659c9687 100644
--- a/patches/trebledroid/platform_frameworks_base/0005-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch
+++ b/patches/trebledroid/platform_frameworks_base/0005-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch
@@ -1,7 +1,7 @@
 From 0b025b95b427b9f5b793b1028df941b8db10a4a5 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 17 May 2018 20:28:35 +0200
-Subject: [PATCH 05/45] Don't crash if there is IR HAL is not declared
+Subject: [PATCH 05/46] Don't crash if there is IR HAL is not declared
 
 Change-Id: I3afded27441bbee8244d5fda544b3e6d1238dc1b
 ---
diff --git a/patches/trebledroid/platform_frameworks_base/0006-Implement-a-persistent-property-to-override-the-defa.patch b/patches/trebledroid/platform_frameworks_base/0006-Implement-a-persistent-property-to-override-the-defa.patch
index 9dd70b78..c8eae911 100644
--- a/patches/trebledroid/platform_frameworks_base/0006-Implement-a-persistent-property-to-override-the-defa.patch
+++ b/patches/trebledroid/platform_frameworks_base/0006-Implement-a-persistent-property-to-override-the-defa.patch
@@ -1,7 +1,7 @@
 From 461ee7bbc93f63c66ed54e4f020238d45b0f50db Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Wed, 1 Jun 2022 16:56:20 -0400
-Subject: [PATCH 06/45] Implement a persistent property to override the default
+Subject: [PATCH 06/46] Implement a persistent property to override the default
  primary camera (0)
 
 Change-Id: I49b45d00bf71d7932591b3516d49a680e1b6568b
diff --git a/patches/trebledroid/platform_frameworks_base/0007-Show-APN-Settings-for-CDMA-carriers.patch b/patches/trebledroid/platform_frameworks_base/0007-Show-APN-Settings-for-CDMA-carriers.patch
index 0fa30207..88f4f729 100644
--- a/patches/trebledroid/platform_frameworks_base/0007-Show-APN-Settings-for-CDMA-carriers.patch
+++ b/patches/trebledroid/platform_frameworks_base/0007-Show-APN-Settings-for-CDMA-carriers.patch
@@ -1,7 +1,7 @@
 From 7041bef1ca282d3ea4d6077f51caaa1e1feba54f Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 6 Aug 2018 12:49:00 +0200
-Subject: [PATCH 07/45] Show APN Settings for CDMA carriers
+Subject: [PATCH 07/46] Show APN Settings for CDMA carriers
 
 ---
  telephony/java/android/telephony/CarrierConfigManager.java | 2 +-
diff --git a/patches/trebledroid/platform_frameworks_base/0008-Re-order-services-so-that-it-works-even-without-qtag.patch b/patches/trebledroid/platform_frameworks_base/0008-Re-order-services-so-that-it-works-even-without-qtag.patch
index 53e5102d..a3da1372 100644
--- a/patches/trebledroid/platform_frameworks_base/0008-Re-order-services-so-that-it-works-even-without-qtag.patch
+++ b/patches/trebledroid/platform_frameworks_base/0008-Re-order-services-so-that-it-works-even-without-qtag.patch
@@ -1,7 +1,7 @@
 From 079c98abdc4626a283fc85466902cbbb4e60af15 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 8 Nov 2018 23:04:03 +0100
-Subject: [PATCH 08/45] Re-order services so that it works even without qtaguid
+Subject: [PATCH 08/46] Re-order services so that it works even without qtaguid
 
 Change-Id: I0c0f527b3ae151d45c68f7ac6c205da3f34e74df
 ---
diff --git a/patches/trebledroid/platform_frameworks_base/0009-Support-samsung-Pie-and-Q-light-hal.patch b/patches/trebledroid/platform_frameworks_base/0009-Support-samsung-Pie-and-Q-light-hal.patch
index c518a498..3dd8cd4a 100644
--- a/patches/trebledroid/platform_frameworks_base/0009-Support-samsung-Pie-and-Q-light-hal.patch
+++ b/patches/trebledroid/platform_frameworks_base/0009-Support-samsung-Pie-and-Q-light-hal.patch
@@ -1,7 +1,7 @@
 From c7ab96785599a347ed565a7a625af2d7f189e7f4 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 24 Mar 2019 23:05:14 +0100
-Subject: [PATCH 09/45] Support samsung Pie and Q light hal
+Subject: [PATCH 09/46] Support samsung Pie and Q light hal
 
 Change-Id: I01f94acd7d0672733e48854d80368f9ac6f861c6
 ---
diff --git a/patches/trebledroid/platform_frameworks_base/0010-Add-support-for-samsung-touch-physical-and-hover-pro.patch b/patches/trebledroid/platform_frameworks_base/0010-Add-support-for-samsung-touch-physical-and-hover-pro.patch
index 39284e30..e94ba47d 100644
--- a/patches/trebledroid/platform_frameworks_base/0010-Add-support-for-samsung-touch-physical-and-hover-pro.patch
+++ b/patches/trebledroid/platform_frameworks_base/0010-Add-support-for-samsung-touch-physical-and-hover-pro.patch
@@ -1,7 +1,7 @@
 From 14f1569d88cb964d66876551f8a949f524dc0704 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 12 Aug 2019 23:08:26 +0200
-Subject: [PATCH 10/45] Add support for samsung touch, physical and hover
+Subject: [PATCH 10/46] Add support for samsung touch, physical and hover
  proximity sensor as fallback to real proximity sensor
 
 Change-Id: I7a0f8b4665c802140d19197d850b77b2a7ac1865
diff --git a/patches/trebledroid/platform_frameworks_base/0011-Always-allow-overriding-the-number-of-work-profiles.patch b/patches/trebledroid/platform_frameworks_base/0011-Always-allow-overriding-the-number-of-work-profiles.patch
index e0e61374..85758830 100644
--- a/patches/trebledroid/platform_frameworks_base/0011-Always-allow-overriding-the-number-of-work-profiles.patch
+++ b/patches/trebledroid/platform_frameworks_base/0011-Always-allow-overriding-the-number-of-work-profiles.patch
@@ -1,7 +1,7 @@
 From 6caeae5b4ae8eb82d2885851d59b80ce1bf28aa5 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 5 Apr 2020 16:32:46 +0200
-Subject: [PATCH 11/45] Always allow overriding the number of work profiles
+Subject: [PATCH 11/46] Always allow overriding the number of work profiles
 
 Change-Id: I6eb09aa71663c6fbe7563e3038bffcabdba0ff6a
 ---
diff --git a/patches/trebledroid/platform_frameworks_base/0012-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch b/patches/trebledroid/platform_frameworks_base/0012-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch
index c9caa8da..23566d59 100644
--- a/patches/trebledroid/platform_frameworks_base/0012-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch
+++ b/patches/trebledroid/platform_frameworks_base/0012-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch
@@ -1,7 +1,7 @@
 From 41ac4ebea6fbd36cb07d9083c5d81e2f0a27bced Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 6 Jun 2020 18:21:56 +0200
-Subject: [PATCH 12/45] HOME deserves to wake-up devices just as well as back
+Subject: [PATCH 12/46] HOME deserves to wake-up devices just as well as back
  and menu
 
 Change-Id: Ia562bafd8c620d00c17e8eb338e4701c6c4a3c3a
diff --git a/patches/trebledroid/platform_frameworks_base/0013-Some-devices-have-proximity-sensor-reporting-NaN-as-.patch b/patches/trebledroid/platform_frameworks_base/0013-Some-devices-have-proximity-sensor-reporting-NaN-as-.patch
index 245f797f..82105ded 100644
--- a/patches/trebledroid/platform_frameworks_base/0013-Some-devices-have-proximity-sensor-reporting-NaN-as-.patch
+++ b/patches/trebledroid/platform_frameworks_base/0013-Some-devices-have-proximity-sensor-reporting-NaN-as-.patch
@@ -1,7 +1,7 @@
 From 2910c08065b4fc0b9ac6217bdeb0d1700c7e0739 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 29 Sep 2020 22:39:47 +0200
-Subject: [PATCH 13/45] Some devices have proximity sensor reporting NaN as max
+Subject: [PATCH 13/46] Some devices have proximity sensor reporting NaN as max
  range for some reason. Make them behave standard way by setting 5 cm
 
 Change-Id: I3c39e3e914a05903c140235702e0480d2d58a612
diff --git a/patches/trebledroid/platform_frameworks_base/0014-Fix-brightness-range-not-being-complete-on-Samsung-d.patch b/patches/trebledroid/platform_frameworks_base/0014-Fix-brightness-range-not-being-complete-on-Samsung-d.patch
index a6409d58..c4e9f455 100644
--- a/patches/trebledroid/platform_frameworks_base/0014-Fix-brightness-range-not-being-complete-on-Samsung-d.patch
+++ b/patches/trebledroid/platform_frameworks_base/0014-Fix-brightness-range-not-being-complete-on-Samsung-d.patch
@@ -1,7 +1,7 @@
 From 32ecb023f8e654e04e97280593c9ba4203f772c5 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 29 Sep 2020 22:40:10 +0200
-Subject: [PATCH 14/45] Fix brightness range not being complete on Samsung
+Subject: [PATCH 14/46] Fix brightness range not being complete on Samsung
  devices
 
 On some devices, minimum brightness is 0, which totally messes with
diff --git a/patches/trebledroid/platform_frameworks_base/0015-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch b/patches/trebledroid/platform_frameworks_base/0015-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch
index bb48c33e..4a93bc1f 100644
--- a/patches/trebledroid/platform_frameworks_base/0015-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch
+++ b/patches/trebledroid/platform_frameworks_base/0015-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch
@@ -1,7 +1,7 @@
 From c47fad89ce36c9e2f2d064f85572d25d31b5d35e Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 25 Oct 2020 23:57:26 +0100
-Subject: [PATCH 15/45] Re-implement fnmatch-like behaviour for RRO java-side
+Subject: [PATCH 15/46] Re-implement fnmatch-like behaviour for RRO java-side
 
 T: Also apply to FrameworkParsingPackageUtils (@PeterCxy)
 
diff --git a/patches/trebledroid/platform_frameworks_base/0016-Remove-useless-notification-about-console-service-be.patch b/patches/trebledroid/platform_frameworks_base/0016-Remove-useless-notification-about-console-service-be.patch
index f69552b9..4d00c48c 100644
--- a/patches/trebledroid/platform_frameworks_base/0016-Remove-useless-notification-about-console-service-be.patch
+++ b/patches/trebledroid/platform_frameworks_base/0016-Remove-useless-notification-about-console-service-be.patch
@@ -1,7 +1,7 @@
 From d8e4fddb4ddc852e2534cf2dfb1c431d1477d3eb Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 11 Dec 2020 14:41:09 +0100
-Subject: [PATCH 16/45] Remove useless notification about "console" service
+Subject: [PATCH 16/46] Remove useless notification about "console" service
  being running
 
 ---
diff --git a/patches/trebledroid/platform_frameworks_base/0017-Revert-Remove-unused-SystemProperties.set.patch b/patches/trebledroid/platform_frameworks_base/0017-Revert-Remove-unused-SystemProperties.set.patch
index f3cf67da..9f341669 100644
--- a/patches/trebledroid/platform_frameworks_base/0017-Revert-Remove-unused-SystemProperties.set.patch
+++ b/patches/trebledroid/platform_frameworks_base/0017-Revert-Remove-unused-SystemProperties.set.patch
@@ -1,7 +1,7 @@
 From d5e596c961dd0205754cc7eb3385ccc9933c5c6b Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Wed, 16 Dec 2020 21:24:12 +0800
-Subject: [PATCH 17/45] Revert "Remove unused SystemProperties.set"
+Subject: [PATCH 17/46] Revert "Remove unused SystemProperties.set"
 
 This reverts commit debb4616ef67f9ed5054eca51ec58592358ff55f.
 
diff --git a/patches/trebledroid/platform_frameworks_base/0018-TelephonyManager-bring-back-getNetworkClass.patch b/patches/trebledroid/platform_frameworks_base/0018-TelephonyManager-bring-back-getNetworkClass.patch
index da07a7cd..8a54fccb 100644
--- a/patches/trebledroid/platform_frameworks_base/0018-TelephonyManager-bring-back-getNetworkClass.patch
+++ b/patches/trebledroid/platform_frameworks_base/0018-TelephonyManager-bring-back-getNetworkClass.patch
@@ -1,7 +1,7 @@
 From f500eec93a1e40744ed6eb4806ab617bc4e6417c Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Wed, 16 Dec 2020 13:46:15 +0800
-Subject: [PATCH 18/45] TelephonyManager: bring back getNetworkClass()
+Subject: [PATCH 18/46] TelephonyManager: bring back getNetworkClass()
 
 This partially reverts commit c058cac051ab083dc7fb7ea6aa85699110b2e9bf.
 
diff --git a/patches/trebledroid/platform_frameworks_base/0019-TelephonyManager-add-API-annotations-for-setTelephon.patch b/patches/trebledroid/platform_frameworks_base/0019-TelephonyManager-add-API-annotations-for-setTelephon.patch
index 48562b74..2441b8fa 100644
--- a/patches/trebledroid/platform_frameworks_base/0019-TelephonyManager-add-API-annotations-for-setTelephon.patch
+++ b/patches/trebledroid/platform_frameworks_base/0019-TelephonyManager-add-API-annotations-for-setTelephon.patch
@@ -1,7 +1,7 @@
 From 5b09dfdf2027535fc074a22b4700ae91420ea325 Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Wed, 16 Dec 2020 21:26:45 +0800
-Subject: [PATCH 19/45] TelephonyManager: add API annotations for
+Subject: [PATCH 19/46] TelephonyManager: add API annotations for
  setTelephonyProperty
 
 * This method was added back by reverting commit
diff --git a/patches/trebledroid/platform_frameworks_base/0020-Fix-Wakelock-issue.patch b/patches/trebledroid/platform_frameworks_base/0020-Fix-Wakelock-issue.patch
index 2b04d09c..bb67af9c 100644
--- a/patches/trebledroid/platform_frameworks_base/0020-Fix-Wakelock-issue.patch
+++ b/patches/trebledroid/platform_frameworks_base/0020-Fix-Wakelock-issue.patch
@@ -1,7 +1,7 @@
 From a3e3e20b4be52cf3798763949731a031a70b219e Mon Sep 17 00:00:00 2001
 From: Alberto Ponces <ponces26@gmail.com>
 Date: Tue, 2 Feb 2021 10:20:51 +0000
-Subject: [PATCH 20/45] Fix Wakelock issue
+Subject: [PATCH 20/46] Fix Wakelock issue
 
 Prevent SystemUI crash due to "WakeLock under-locked Doze" (issue #12) by only releasing a wakelock that was not already released
 ---
diff --git a/patches/trebledroid/platform_frameworks_base/0021-Automatically-detect-pick-up-sensor-so-that-an-overl.patch b/patches/trebledroid/platform_frameworks_base/0021-Automatically-detect-pick-up-sensor-so-that-an-overl.patch
index 8d742ec9..df4ff48c 100644
--- a/patches/trebledroid/platform_frameworks_base/0021-Automatically-detect-pick-up-sensor-so-that-an-overl.patch
+++ b/patches/trebledroid/platform_frameworks_base/0021-Automatically-detect-pick-up-sensor-so-that-an-overl.patch
@@ -1,7 +1,7 @@
 From 7f8a1b8d93a24ee03edf506109a5f69bb03f33c7 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 20 Mar 2021 14:31:01 +0100
-Subject: [PATCH 21/45] Automatically detect pick up sensor, so that an overlay
+Subject: [PATCH 21/46] Automatically detect pick up sensor, so that an overlay
  is required for the sole purpose of enabling pulse doze on pick up sensor
 
 ---
diff --git a/patches/trebledroid/platform_frameworks_base/0022-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch b/patches/trebledroid/platform_frameworks_base/0022-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch
index 52973190..db91c0cc 100644
--- a/patches/trebledroid/platform_frameworks_base/0022-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch
+++ b/patches/trebledroid/platform_frameworks_base/0022-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch
@@ -1,7 +1,7 @@
 From 6abdb008ca62969aba90bc4f21590abb941de5b0 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 23 Mar 2021 19:43:26 +0100
-Subject: [PATCH 22/45] Catch broken mainBuiltInDisplayCutoutRectApproximation
+Subject: [PATCH 22/46] Catch broken mainBuiltInDisplayCutoutRectApproximation
 
 Some devices (Redmi Note 9T) have:
 mainBuiltInDisplayCutoutRectApproximation = @android:mainBuiltInDisplayCutout
diff --git a/patches/trebledroid/platform_frameworks_base/0023-backlight-Fix-backlight-control-on-Galaxy-S9.patch b/patches/trebledroid/platform_frameworks_base/0023-backlight-Fix-backlight-control-on-Galaxy-S9.patch
index 4420ed92..317621c7 100644
--- a/patches/trebledroid/platform_frameworks_base/0023-backlight-Fix-backlight-control-on-Galaxy-S9.patch
+++ b/patches/trebledroid/platform_frameworks_base/0023-backlight-Fix-backlight-control-on-Galaxy-S9.patch
@@ -1,7 +1,7 @@
 From 0f90d39ebad877acbe691d4acb6a627d01311ad8 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 24 Mar 2018 08:01:48 +0100
-Subject: [PATCH 23/45] backlight: Fix backlight control on Galaxy S9(+)
+Subject: [PATCH 23/46] backlight: Fix backlight control on Galaxy S9(+)
 
 Change-Id: I1fbbb47939c377597ef8ad6b88b2acea5f4acaa6
 
diff --git a/patches/trebledroid/platform_frameworks_base/0024-Revert-Switch-long-press-power-behavior-in-AOSP.patch b/patches/trebledroid/platform_frameworks_base/0024-Revert-Switch-long-press-power-behavior-in-AOSP.patch
index c2df976b..a5b8f8cb 100644
--- a/patches/trebledroid/platform_frameworks_base/0024-Revert-Switch-long-press-power-behavior-in-AOSP.patch
+++ b/patches/trebledroid/platform_frameworks_base/0024-Revert-Switch-long-press-power-behavior-in-AOSP.patch
@@ -1,7 +1,7 @@
 From 1efd969efcef058be0dfaadbbff06e0bbf56b63c Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 4 Sep 2021 08:26:30 +0000
-Subject: [PATCH 24/45] Revert "Switch long-press power behavior in AOSP."
+Subject: [PATCH 24/46] Revert "Switch long-press power behavior in AOSP."
 
 This reverts commit 803c77a0a24624111944832098c6f65158051dc4.
 ---
diff --git a/patches/trebledroid/platform_frameworks_base/0025-Allow-disabling-of-fingerprint-cleanups-needed-on-so.patch b/patches/trebledroid/platform_frameworks_base/0025-Allow-disabling-of-fingerprint-cleanups-needed-on-so.patch
index a35bfb7f..cda4aae9 100644
--- a/patches/trebledroid/platform_frameworks_base/0025-Allow-disabling-of-fingerprint-cleanups-needed-on-so.patch
+++ b/patches/trebledroid/platform_frameworks_base/0025-Allow-disabling-of-fingerprint-cleanups-needed-on-so.patch
@@ -1,7 +1,7 @@
 From c76c4c01b05216fe78db93d6d0d3269e1935fd4b Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 2 Apr 2022 18:04:01 -0400
-Subject: [PATCH 25/45] Allow disabling of fingerprint cleanups, needed on some
+Subject: [PATCH 25/46] Allow disabling of fingerprint cleanups, needed on some
  Realme devices that cant enumerate
 
 ---
diff --git a/patches/trebledroid/platform_frameworks_base/0026-Dynamically-resize-boot-animation-to-match-screen-si.patch b/patches/trebledroid/platform_frameworks_base/0026-Dynamically-resize-boot-animation-to-match-screen-si.patch
index daa37a66..bb4f013a 100644
--- a/patches/trebledroid/platform_frameworks_base/0026-Dynamically-resize-boot-animation-to-match-screen-si.patch
+++ b/patches/trebledroid/platform_frameworks_base/0026-Dynamically-resize-boot-animation-to-match-screen-si.patch
@@ -1,7 +1,7 @@
 From 71d8e5906f7099eb28a3567b643dcb92f80ab790 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 20 Dec 2021 15:01:41 -0500
-Subject: [PATCH 26/45] Dynamically resize boot animation to match screen size
+Subject: [PATCH 26/46] Dynamically resize boot animation to match screen size
 
 Change-Id: I54e49fc6b8c670103852e212d1416e27ff976205
 ---
diff --git a/patches/trebledroid/platform_frameworks_base/0027-Revert-Remove-more-FDE-methods-from-StorageManager.patch b/patches/trebledroid/platform_frameworks_base/0027-Revert-Remove-more-FDE-methods-from-StorageManager.patch
index 0c8d9156..84868a14 100644
--- a/patches/trebledroid/platform_frameworks_base/0027-Revert-Remove-more-FDE-methods-from-StorageManager.patch
+++ b/patches/trebledroid/platform_frameworks_base/0027-Revert-Remove-more-FDE-methods-from-StorageManager.patch
@@ -1,7 +1,7 @@
 From 802bdaaf5ee19687b3a27122b9fc11442969d87c Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 15 Oct 2022 09:33:56 +0000
-Subject: [PATCH 27/45] Revert "Remove more FDE methods from StorageManager"
+Subject: [PATCH 27/46] Revert "Remove more FDE methods from StorageManager"
 
 This reverts commit bd13f84152449a3ead6fa8604fd31f48c0224676.
 
diff --git a/patches/trebledroid/platform_frameworks_base/0028-SystemUI-Use-AVCProfileMain-for-screen-recorder.patch b/patches/trebledroid/platform_frameworks_base/0028-SystemUI-Use-AVCProfileMain-for-screen-recorder.patch
index e6ff07fb..ce293129 100644
--- a/patches/trebledroid/platform_frameworks_base/0028-SystemUI-Use-AVCProfileMain-for-screen-recorder.patch
+++ b/patches/trebledroid/platform_frameworks_base/0028-SystemUI-Use-AVCProfileMain-for-screen-recorder.patch
@@ -1,7 +1,7 @@
 From ef0e0c068a193ea6dae733c3b5811128b1f8a5cf Mon Sep 17 00:00:00 2001
 From: Arne Coucheron <arco68@gmail.com>
 Date: Thu, 5 Nov 2020 05:38:44 +0100
-Subject: [PATCH 28/45] SystemUI: Use AVCProfileMain for screen recorder
+Subject: [PATCH 28/46] SystemUI: Use AVCProfileMain for screen recorder
 
 Some devices don't support the High profile very well.
 Use Main profile, which is more compatible, so they
diff --git a/patches/trebledroid/platform_frameworks_base/0029-Set-old-fingerprint-sensors-to-security-strong.patch b/patches/trebledroid/platform_frameworks_base/0029-Set-old-fingerprint-sensors-to-security-strong.patch
index 88156a3e..c6ecc121 100644
--- a/patches/trebledroid/platform_frameworks_base/0029-Set-old-fingerprint-sensors-to-security-strong.patch
+++ b/patches/trebledroid/platform_frameworks_base/0029-Set-old-fingerprint-sensors-to-security-strong.patch
@@ -1,7 +1,7 @@
 From c080cb6b2a2eff27e81b0b7de48ba9694d1b0b1d Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 3 Dec 2022 17:13:24 -0500
-Subject: [PATCH 29/45] Set old fingerprint sensors to security "strong"
+Subject: [PATCH 29/46] Set old fingerprint sensors to security "strong"
 
 This allows removing config_biometric_sensors from overlays, which led
 to Pixels not booting, because they are using AIDL biometric sensor, and
diff --git a/patches/trebledroid/platform_frameworks_base/0030-Call-Samsung-s-ISehSysInputDev-to-report-screen-stat.patch b/patches/trebledroid/platform_frameworks_base/0030-Call-Samsung-s-ISehSysInputDev-to-report-screen-stat.patch
index 4c41b555..1afca691 100644
--- a/patches/trebledroid/platform_frameworks_base/0030-Call-Samsung-s-ISehSysInputDev-to-report-screen-stat.patch
+++ b/patches/trebledroid/platform_frameworks_base/0030-Call-Samsung-s-ISehSysInputDev-to-report-screen-stat.patch
@@ -1,7 +1,7 @@
 From 2cea79507bc6fc0d5a1def23b94aa789d2f26c67 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 14 Dec 2022 17:21:00 -0500
-Subject: [PATCH 30/45] Call Samsung's ISehSysInputDev to report screen state
+Subject: [PATCH 30/46] Call Samsung's ISehSysInputDev to report screen state
  to touchscreen driver
 
 This fixes touchscreen not waking up on Galaxy F23
diff --git a/patches/trebledroid/platform_frameworks_base/0031-Try-catch-around-constrainNitsAndBacklightArrays-and.patch b/patches/trebledroid/platform_frameworks_base/0031-Try-catch-around-constrainNitsAndBacklightArrays-and.patch
index 7626156b..f1e567e2 100644
--- a/patches/trebledroid/platform_frameworks_base/0031-Try-catch-around-constrainNitsAndBacklightArrays-and.patch
+++ b/patches/trebledroid/platform_frameworks_base/0031-Try-catch-around-constrainNitsAndBacklightArrays-and.patch
@@ -1,7 +1,7 @@
 From 456b5ce0a795047b48595967c2f436cbbf645bf0 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 2 Jun 2023 19:19:31 -0400
-Subject: [PATCH 31/45] Try catch around constrainNitsAndBacklightArrays, and
+Subject: [PATCH 31/46] Try catch around constrainNitsAndBacklightArrays, and
  falls back to dumb curve. It crashes on Xperia 1 IV.
 
 ---
diff --git a/patches/trebledroid/platform_frameworks_base/0032-Add-Mediatek-power-hints-on-touch.patch b/patches/trebledroid/platform_frameworks_base/0032-Add-Mediatek-power-hints-on-touch.patch
index 9748f7e5..91c7d3f5 100644
--- a/patches/trebledroid/platform_frameworks_base/0032-Add-Mediatek-power-hints-on-touch.patch
+++ b/patches/trebledroid/platform_frameworks_base/0032-Add-Mediatek-power-hints-on-touch.patch
@@ -1,7 +1,7 @@
 From a501d218943c17e76bb36d09083a133228eaf186 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 17 Jun 2023 08:31:55 -0400
-Subject: [PATCH 32/45] Add Mediatek power hints on touch
+Subject: [PATCH 32/46] Add Mediatek power hints on touch
 
 Mediatek has multiple HALs (which existed concurrently), so it is a bit
 of a mess.
diff --git a/patches/trebledroid/platform_frameworks_base/0033-Detect-Moto-dynamic-hardware-feature.patch b/patches/trebledroid/platform_frameworks_base/0033-Detect-Moto-dynamic-hardware-feature.patch
index a38b043f..255057da 100644
--- a/patches/trebledroid/platform_frameworks_base/0033-Detect-Moto-dynamic-hardware-feature.patch
+++ b/patches/trebledroid/platform_frameworks_base/0033-Detect-Moto-dynamic-hardware-feature.patch
@@ -1,7 +1,7 @@
 From efa112706d84d526ddf1834641239c610df2cdea Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 5 Jul 2023 10:50:36 -0400
-Subject: [PATCH 33/45] Detect Moto dynamic hardware feature
+Subject: [PATCH 33/46] Detect Moto dynamic hardware feature
 
 Moto added a custom node in sysconfig XMLs:
 <unavailable-feature-conditional />
diff --git a/patches/trebledroid/platform_frameworks_base/0034-Restore-getSimStateForSlotIndex-in-SubscriptionManag.patch b/patches/trebledroid/platform_frameworks_base/0034-Restore-getSimStateForSlotIndex-in-SubscriptionManag.patch
index 2ece669e..f6c7968c 100644
--- a/patches/trebledroid/platform_frameworks_base/0034-Restore-getSimStateForSlotIndex-in-SubscriptionManag.patch
+++ b/patches/trebledroid/platform_frameworks_base/0034-Restore-getSimStateForSlotIndex-in-SubscriptionManag.patch
@@ -1,7 +1,7 @@
 From b5f6ee6a02a2169b8473426768490ef30fcc4edd Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Wed, 2 Aug 2023 20:59:53 +0800
-Subject: [PATCH 34/45] Restore getSimStateForSlotIndex in SubscriptionManager
+Subject: [PATCH 34/46] Restore getSimStateForSlotIndex in SubscriptionManager
 
 MTK IMS still needs it here
 
diff --git a/patches/trebledroid/platform_frameworks_base/0035-Add-runWithCleanCallingIdentity-variant-with-both-ex.patch b/patches/trebledroid/platform_frameworks_base/0035-Add-runWithCleanCallingIdentity-variant-with-both-ex.patch
index 6659c5e3..0dc28000 100644
--- a/patches/trebledroid/platform_frameworks_base/0035-Add-runWithCleanCallingIdentity-variant-with-both-ex.patch
+++ b/patches/trebledroid/platform_frameworks_base/0035-Add-runWithCleanCallingIdentity-variant-with-both-ex.patch
@@ -1,7 +1,7 @@
 From f0cf0e731a1e910cf8597df2cd9fbf26cda07e48 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 12 Aug 2023 20:11:17 +0800
-Subject: [PATCH 35/45] Add runWithCleanCallingIdentity variant with both
+Subject: [PATCH 35/46] Add runWithCleanCallingIdentity variant with both
  executor and return value
 
 This complements the fixup to ImsPhoneCallTracker (in fw/o/t) for U
diff --git a/patches/trebledroid/platform_frameworks_base/0036-Catch-NPE-in-SystemUI.patch b/patches/trebledroid/platform_frameworks_base/0036-Catch-NPE-in-SystemUI.patch
index e2ccb88f..57001c5b 100644
--- a/patches/trebledroid/platform_frameworks_base/0036-Catch-NPE-in-SystemUI.patch
+++ b/patches/trebledroid/platform_frameworks_base/0036-Catch-NPE-in-SystemUI.patch
@@ -1,7 +1,7 @@
 From adea8cbb79dbde2ca017e57a3e80ed16fab5ad21 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 6 Oct 2023 10:57:13 -0400
-Subject: [PATCH 36/45] Catch NPE in SystemUI
+Subject: [PATCH 36/46] Catch NPE in SystemUI
 
 No idea why it triggers, but it crashes SystemUI on boot for my TV
 device
diff --git a/patches/trebledroid/platform_frameworks_base/0037-Add-support-for-app-signature-spoofing.patch b/patches/trebledroid/platform_frameworks_base/0037-Add-support-for-app-signature-spoofing.patch
index f3a02504..7f1bc15f 100644
--- a/patches/trebledroid/platform_frameworks_base/0037-Add-support-for-app-signature-spoofing.patch
+++ b/patches/trebledroid/platform_frameworks_base/0037-Add-support-for-app-signature-spoofing.patch
@@ -1,7 +1,7 @@
 From f0494e39fb6c96c0d0d0d0d08b8ae75b69601674 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Sat, 16 Oct 2021 05:27:57 -0700
-Subject: [PATCH 37/45] Add support for app signature spoofing
+Subject: [PATCH 37/46] Add support for app signature spoofing
 
 This is needed by microG GmsCore to pretend to be the official Google
 Play Services package, because client apps check the package signature
diff --git a/patches/trebledroid/platform_frameworks_base/0038-Once-we-integrate-Samsung-Power-hal-in-libpowermanag.patch b/patches/trebledroid/platform_frameworks_base/0038-Once-we-integrate-Samsung-Power-hal-in-libpowermanag.patch
index a05b53b3..13e1c44e 100644
--- a/patches/trebledroid/platform_frameworks_base/0038-Once-we-integrate-Samsung-Power-hal-in-libpowermanag.patch
+++ b/patches/trebledroid/platform_frameworks_base/0038-Once-we-integrate-Samsung-Power-hal-in-libpowermanag.patch
@@ -1,7 +1,7 @@
 From f8b6f79d0cd7d84706459b9b5108864aa7b827d3 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 27 Dec 2021 17:57:11 -0500
-Subject: [PATCH 38/45] Once we integrate Samsung Power hal in libpowermanager,
+Subject: [PATCH 38/46] Once we integrate Samsung Power hal in libpowermanager,
  libpowermanager and its deps require linking against
  vendor.samsung.hardware.miscpower@2.0
 
diff --git a/patches/trebledroid/platform_frameworks_base/0039-FOD-support-for-Asus-Samsung-recent-Xiaomi-and-RedMa.patch b/patches/trebledroid/platform_frameworks_base/0039-FOD-support-for-Asus-Samsung-recent-Xiaomi-and-RedMa.patch
index 5d6390ea..7436da55 100644
--- a/patches/trebledroid/platform_frameworks_base/0039-FOD-support-for-Asus-Samsung-recent-Xiaomi-and-RedMa.patch
+++ b/patches/trebledroid/platform_frameworks_base/0039-FOD-support-for-Asus-Samsung-recent-Xiaomi-and-RedMa.patch
@@ -1,7 +1,7 @@
 From 702a3038300d11638339e0659d93409c1480208d Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 18 Dec 2022 18:20:40 -0500
-Subject: [PATCH 39/45] FOD support for Asus, Samsung recent Xiaomi and
+Subject: [PATCH 39/46] FOD support for Asus, Samsung recent Xiaomi and
  RedMagic 8 devices
 
 Thanks Asus for providing a free device to make this support
diff --git a/patches/trebledroid/platform_frameworks_base/0040-Fix-brightness-slider-curve-for-some-devices.patch b/patches/trebledroid/platform_frameworks_base/0040-Fix-brightness-slider-curve-for-some-devices.patch
index 799513d9..0fd6f1a1 100644
--- a/patches/trebledroid/platform_frameworks_base/0040-Fix-brightness-slider-curve-for-some-devices.patch
+++ b/patches/trebledroid/platform_frameworks_base/0040-Fix-brightness-slider-curve-for-some-devices.patch
@@ -1,7 +1,7 @@
 From 9fbe4871e5380d0b1366f34f66e69ea723cb0eb5 Mon Sep 17 00:00:00 2001
 From: ChonDoit <thphantomblog@gmail.com>
 Date: Thu, 24 Aug 2023 15:58:15 -0300
-Subject: [PATCH 40/45] Fix brightness slider curve for some devices
+Subject: [PATCH 40/46] Fix brightness slider curve for some devices
 
 Some devices report max brightness as 2047 or 4095
 ---
diff --git a/patches/trebledroid/platform_frameworks_base/0041-Ignore-cgroup-creation-errors.patch b/patches/trebledroid/platform_frameworks_base/0041-Ignore-cgroup-creation-errors.patch
index fd78cc3e..6d347c4d 100644
--- a/patches/trebledroid/platform_frameworks_base/0041-Ignore-cgroup-creation-errors.patch
+++ b/patches/trebledroid/platform_frameworks_base/0041-Ignore-cgroup-creation-errors.patch
@@ -1,7 +1,7 @@
 From 2b6e41766dc946720a33a832bb4cfe59e9c1adfa Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 18 Oct 2023 16:53:40 -0400
-Subject: [PATCH 41/45] Ignore cgroup creation errors
+Subject: [PATCH 41/46] Ignore cgroup creation errors
 
 For old kernels who don't have those modern cgroups
 ---
diff --git a/patches/trebledroid/platform_frameworks_base/0042-Samsung-tablets-use-SW_MACHINE_COVER-rather-than-SW_.patch b/patches/trebledroid/platform_frameworks_base/0042-Samsung-tablets-use-SW_MACHINE_COVER-rather-than-SW_.patch
index 4a36676f..4b4ddd3a 100644
--- a/patches/trebledroid/platform_frameworks_base/0042-Samsung-tablets-use-SW_MACHINE_COVER-rather-than-SW_.patch
+++ b/patches/trebledroid/platform_frameworks_base/0042-Samsung-tablets-use-SW_MACHINE_COVER-rather-than-SW_.patch
@@ -1,7 +1,7 @@
 From eb2e703d2eda413383d0deaddb64f48ccde45ccc Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 18 Oct 2023 16:57:34 -0400
-Subject: [PATCH 42/45] Samsung tablets use SW_MACHINE_COVER rather than SW_LID
+Subject: [PATCH 42/46] Samsung tablets use SW_MACHINE_COVER rather than SW_LID
 
 So check whether SW_MACHINE_COVER is declared, then use it
 Otherwise stick to SW_LID
diff --git a/patches/trebledroid/platform_frameworks_base/0043-Revert-Removed-IWLAN-legacy-mode-support.patch b/patches/trebledroid/platform_frameworks_base/0043-Revert-Removed-IWLAN-legacy-mode-support.patch
index 0d2073e8..ff99f05f 100644
--- a/patches/trebledroid/platform_frameworks_base/0043-Revert-Removed-IWLAN-legacy-mode-support.patch
+++ b/patches/trebledroid/platform_frameworks_base/0043-Revert-Removed-IWLAN-legacy-mode-support.patch
@@ -1,7 +1,7 @@
 From d9bfdcb5622bbb94a1ac5e9f3e4a5caecc15bf2a Mon Sep 17 00:00:00 2001
 From: Alberto Ponces <ponces26@gmail.com>
 Date: Fri, 20 Oct 2023 09:26:19 +0000
-Subject: [PATCH 43/45] Revert "Removed IWLAN legacy mode support"
+Subject: [PATCH 43/46] Revert "Removed IWLAN legacy mode support"
 
 This reverts commit 2832dee607ab33eee688abea206f4adfcfc896f1.
 ---
diff --git a/patches/trebledroid/platform_frameworks_base/0044-Add-a-prop-to-use-linear-backlight-control.patch b/patches/trebledroid/platform_frameworks_base/0044-Add-a-prop-to-use-linear-backlight-control.patch
index a4a29d76..d227cf5d 100644
--- a/patches/trebledroid/platform_frameworks_base/0044-Add-a-prop-to-use-linear-backlight-control.patch
+++ b/patches/trebledroid/platform_frameworks_base/0044-Add-a-prop-to-use-linear-backlight-control.patch
@@ -1,7 +1,7 @@
 From 0d0f917e63141f3d31b87fdcb2f2231c545c85d1 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 30 Oct 2023 19:25:27 -0400
-Subject: [PATCH 44/45] Add a prop to use linear backlight control
+Subject: [PATCH 44/46] Add a prop to use linear backlight control
 
 ---
  .../settings/brightness/BrightnessController.java      | 10 ++++++++--
diff --git a/patches/trebledroid/platform_frameworks_base/0045-fix-fod-Extra-Dim-overlap-fod-overlay.patch b/patches/trebledroid/platform_frameworks_base/0045-fix-fod-Extra-Dim-overlap-fod-overlay.patch
index 1f70c17c..a54b8906 100644
--- a/patches/trebledroid/platform_frameworks_base/0045-fix-fod-Extra-Dim-overlap-fod-overlay.patch
+++ b/patches/trebledroid/platform_frameworks_base/0045-fix-fod-Extra-Dim-overlap-fod-overlay.patch
@@ -1,7 +1,7 @@
 From e2f079e9b30c1b103a86ee37e4e607cdf26c0ad9 Mon Sep 17 00:00:00 2001
 From: MrHereAndThere <38396158+boydaihungst@users.noreply.github.com>
 Date: Fri, 17 Nov 2023 09:22:29 +0700
-Subject: [PATCH 45/45] fix(fod): Extra Dim overlap fod overlay
+Subject: [PATCH 45/46] fix(fod): Extra Dim overlap fod overlay
 
 Extra Dim will set display panel brightness to lowest value possible, which will also effect FOD overlay.
 ---
diff --git a/patches/trebledroid/platform_frameworks_base/0046-Add-support-for-Samsung-full-brightness-on-their-AID.patch b/patches/trebledroid/platform_frameworks_base/0046-Add-support-for-Samsung-full-brightness-on-their-AID.patch
new file mode 100644
index 00000000..43860537
--- /dev/null
+++ b/patches/trebledroid/platform_frameworks_base/0046-Add-support-for-Samsung-full-brightness-on-their-AID.patch
@@ -0,0 +1,110 @@
+From f8c96fd06ad1f4c9a6e2f0910ef4a343e5df280e Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Sun, 10 Dec 2023 18:04:49 -0500
+Subject: [PATCH 46/46] Add support for Samsung full brightness on their AIDL
+ HAL
+
+---
+ services/core/Android.bp                      |  4 ++
+ .../android/server/lights/LightsService.java  | 40 +++++++++++++++++++
+ 2 files changed, 44 insertions(+)
+
+diff --git a/services/core/Android.bp b/services/core/Android.bp
+index 18a9fe12ecb7..6cba27c50972 100644
+--- a/services/core/Android.bp
++++ b/services/core/Android.bp
+@@ -194,6 +194,10 @@ java_library_static {
+         "vendor.oplus.hardware.biometrics.fingerprint-V2.1-java",
+         "vendor.oppo.hardware.biometrics.fingerprint-V2.1-java",
+         "vendor.xiaomi.hardware.fingerprintextension-V1.0-java",
++
++        //AIDL
++        "vendor.samsung.hardware.biometrics.fingerprint-V1-java",
++        "vendor.samsung.hardware.light-V1-java",
+     ],
+     javac_shard_size: 50,
+     javacflags: [
+diff --git a/services/core/java/com/android/server/lights/LightsService.java b/services/core/java/com/android/server/lights/LightsService.java
+index 8fa9c4f3a698..390c6ac6c50f 100644
+--- a/services/core/java/com/android/server/lights/LightsService.java
++++ b/services/core/java/com/android/server/lights/LightsService.java
+@@ -44,8 +44,10 @@ import com.android.internal.util.DumpUtils;
+ import com.android.internal.util.Preconditions;
+ import com.android.server.SystemService;
+ 
++import java.io.File;
+ import java.io.FileDescriptor;
+ import java.io.PrintWriter;
++import java.nio.file.Files;
+ import java.util.ArrayList;
+ import java.util.Collections;
+ import java.util.HashMap;
+@@ -53,6 +55,8 @@ import java.util.List;
+ import java.util.Map;
+ import java.util.function.Supplier;
+ 
++import vendor.samsung.hardware.light.ISehLights;
++
+ public class LightsService extends SystemService {
+     static final String TAG = "LightsService";
+     static final boolean DEBUG = false;
+@@ -63,6 +67,10 @@ public class LightsService extends SystemService {
+     @Nullable
+     private final Supplier<ILights> mVintfLights;
+ 
++    @Nullable
++    private ISehLights mSamsungLights;
++    private int mSamsungMaxBrightness;
++
+     @VisibleForTesting
+     final LightsManagerBinderService mManagerService;
+ 
+@@ -297,6 +305,17 @@ public class LightsService extends SystemService {
+                 int brightnessInt = BrightnessSynchronizer.brightnessFloatToInt(brightness);
+ 
+                 if(mHwLight.id == 0) {
++                    if (mSamsungLights != null && SystemProperties.getBoolean("persist.sys.samsung.full_brightness", false)) {
++                        HwLightState lightState = new HwLightState(); // don't care
++                        try {
++                            int v = (int)Math.round(brightness * mSamsungMaxBrightness);
++                            mSamsungLights.setLightState(mHwLight.id, lightState, v);
++                            Slog.e("PHH", "Set sammy brightness to " + v);
++                        } catch(Throwable t) {
++                            Slog.e("PHH", "Failed setting samsung brightness", t);
++                        }
++                        return;
++                    }
+                     String fp = SystemProperties.get("ro.vendor.build.fingerprint", "hello");
+                     if(fp.matches(".*astarqlte.*")) {
+                         int newBrightness = brightnessInt;
+@@ -499,6 +518,27 @@ public class LightsService extends SystemService {
+         mH = new Handler(looper);
+         mVintfLights = service.get() != null ? service : null;
+ 
++        if (service.get() != null) {
++            try {
++                mSamsungLights = ISehLights.Stub.asInterface(service.get().asBinder().getExtension());
++                mSamsungMaxBrightness = 510;
++
++                ArrayList<File> paths = new ArrayList<>();
++                paths.add(new File("/sys/class/backlight/panel/max_brightness"));
++                paths.add(new File("/sys/class/backlight/panel0-backlight/max_brightness"));
++                paths.add(new File("/sys/devices/platform/soc/soc:mtk_leds/leds/lcd-backlight/max_brightness"));
++                for(File f: paths) {
++                    try {
++                        List<String> lines = Files.readAllLines(f.toPath());
++                        mSamsungMaxBrightness = Integer.parseInt(lines.get(0));
++                        Slog.e("PHH", "" + f + " gave us " + mSamsungMaxBrightness);
++                    } catch(Throwable t) {}
++                }
++            } catch(Throwable t) {
++                Slog.e("PHH", "Failed getting Samsung lights AIDL", t);
++            }
++        }
++
+         populateAvailableLights(context);
+         mManagerService = new LightsManagerBinderService();
+     }
+-- 
+2.34.1
+