diff --git a/patches/trebledroid/platform_build/0001-build-remove-emulator-crap-from-GSI.patch b/patches/trebledroid/platform_build/0001-build-remove-emulator-crap-from-GSI.patch
index e0e018e4..8352c16a 100644
--- a/patches/trebledroid/platform_build/0001-build-remove-emulator-crap-from-GSI.patch
+++ b/patches/trebledroid/platform_build/0001-build-remove-emulator-crap-from-GSI.patch
@@ -9,7 +9,7 @@ Change-Id: Id45f3ff1d31e3d4492f956e68a1eb4b2fb82ce63
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/target/product/emulator_vendor.mk b/target/product/emulator_vendor.mk
-index f71b275b0e..62984253f3 100644
+index f71b275b0e2..62984253f31 100644
 --- a/target/product/emulator_vendor.mk
 +++ b/target/product/emulator_vendor.mk
 @@ -28,7 +28,7 @@ PRODUCT_PACKAGES += \
diff --git a/patches/trebledroid/platform_build/0002-build-Bypass-vendor-calls.patch b/patches/trebledroid/platform_build/0002-build-Bypass-vendor-calls.patch
index 820a2aae..abe31950 100644
--- a/patches/trebledroid/platform_build/0002-build-Bypass-vendor-calls.patch
+++ b/patches/trebledroid/platform_build/0002-build-Bypass-vendor-calls.patch
@@ -9,7 +9,7 @@ Change-Id: I69830d6264356dadd7b037553a899a4eb3d211f1
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/target/product/aosp_arm64.mk b/target/product/aosp_arm64.mk
-index 6c907db0ed..0adced1672 100644
+index 6c907db0edd..0adced1672e 100644
 --- a/target/product/aosp_arm64.mk
 +++ b/target/product/aosp_arm64.mk
 @@ -54,9 +54,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
diff --git a/patches/trebledroid/platform_build/0003-Remove-init.vndk-nodef.rc.patch b/patches/trebledroid/platform_build/0003-Remove-init.vndk-nodef.rc.patch
index 42512db8..10c5b3f4 100644
--- a/patches/trebledroid/platform_build/0003-Remove-init.vndk-nodef.rc.patch
+++ b/patches/trebledroid/platform_build/0003-Remove-init.vndk-nodef.rc.patch
@@ -19,7 +19,7 @@ Change-Id: I7c14fe5229e953f620bb225fa5c981752d0ac5f9
  delete mode 100644 target/product/gsi/init.vndk-nodef.rc
 
 diff --git a/target/product/gsi/Android.mk b/target/product/gsi/Android.mk
-index 107c94f685..0ad39c3610 100644
+index 107c94f6859..0ad39c36101 100644
 --- a/target/product/gsi/Android.mk
 +++ b/target/product/gsi/Android.mk
 @@ -256,16 +256,3 @@ LOCAL_SYSTEM_EXT_MODULE := true
@@ -40,7 +40,7 @@ index 107c94f685..0ad39c3610 100644
 -
 -include $(BUILD_PREBUILT)
 diff --git a/target/product/gsi/init.gsi.rc b/target/product/gsi/init.gsi.rc
-index 69c8e467be..c6faba78d9 100644
+index 69c8e467be0..c6faba78d99 100644
 --- a/target/product/gsi/init.gsi.rc
 +++ b/target/product/gsi/init.gsi.rc
 @@ -1,5 +1,3 @@
@@ -51,7 +51,7 @@ index 69c8e467be..c6faba78d9 100644
 -import /system/system_ext/etc/gsi/init.vndk-${ro.vndk.version:-nodef}.rc
 diff --git a/target/product/gsi/init.vndk-nodef.rc b/target/product/gsi/init.vndk-nodef.rc
 deleted file mode 100644
-index 1b141a05e7..0000000000
+index 1b141a05e70..00000000000
 --- a/target/product/gsi/init.vndk-nodef.rc
 +++ /dev/null
 @@ -1,3 +0,0 @@
@@ -59,7 +59,7 @@ index 1b141a05e7..0000000000
 -    # Reboot if BOARD_VNDK_VERSION is not defined
 -    exec - root -- /system/bin/reboot bootloader
 diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk
-index 3b977927d1..7bade98ca1 100644
+index 3b977927d19..7bade98ca14 100644
 --- a/target/product/gsi_release.mk
 +++ b/target/product/gsi_release.mk
 @@ -62,7 +62,6 @@ PRODUCT_PACKAGES += com.android.apex.cts.shim.v1_with_prebuilts.flattened
diff --git a/patches/trebledroid/platform_build/0004-build-Remove-llkd.patch b/patches/trebledroid/platform_build/0004-build-Remove-llkd.patch
index cb0db52f..83daee69 100644
--- a/patches/trebledroid/platform_build/0004-build-Remove-llkd.patch
+++ b/patches/trebledroid/platform_build/0004-build-Remove-llkd.patch
@@ -11,7 +11,7 @@ Change-Id: I29384a820a0c07b29d3f11d7039bed40eeaee926
  1 file changed, 1 deletion(-)
 
 diff --git a/target/product/base_system.mk b/target/product/base_system.mk
-index a3f5ab3470..0096f23b3d 100644
+index a3f5ab34703..0096f23b3d2 100644
 --- a/target/product/base_system.mk
 +++ b/target/product/base_system.mk
 @@ -208,7 +208,6 @@ PRODUCT_PACKAGES += \
diff --git a/patches/trebledroid/platform_build/0005-Include-vndk-v28-sepolicy-support.patch b/patches/trebledroid/platform_build/0005-Include-vndk-v28-sepolicy-support.patch
index 31df7c27..b053351e 100644
--- a/patches/trebledroid/platform_build/0005-Include-vndk-v28-sepolicy-support.patch
+++ b/patches/trebledroid/platform_build/0005-Include-vndk-v28-sepolicy-support.patch
@@ -8,7 +8,7 @@ Subject: [PATCH 5/5] Include vndk v28 sepolicy support
  1 file changed, 1 insertion(+)
 
 diff --git a/core/config.mk b/core/config.mk
-index 0c086ee090..6006a5e8f5 100644
+index 0c086ee0907..6006a5e8f5f 100644
 --- a/core/config.mk
 +++ b/core/config.mk
 @@ -911,6 +911,7 @@ endif
diff --git a/patches/trebledroid/platform_frameworks_base/0039-FOD-support-for-Asus-Samsung-and-recent-Xiaomi-devic.patch b/patches/trebledroid/platform_frameworks_base/0039-FOD-support-for-Asus-Samsung-and-recent-Xiaomi-devic.patch
index 99bb9cfc..86bef204 100644
--- a/patches/trebledroid/platform_frameworks_base/0039-FOD-support-for-Asus-Samsung-and-recent-Xiaomi-devic.patch
+++ b/patches/trebledroid/platform_frameworks_base/0039-FOD-support-for-Asus-Samsung-and-recent-Xiaomi-devic.patch
@@ -1,4 +1,4 @@
-From 38999b41d5c2a54387748cc1bdc058761df07a0d Mon Sep 17 00:00:00 2001
+From f8f0e27db4fd44fb2e376e31a2892acd559c8551 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/47] FOD support for Asus, Samsung and recent Xiaomi devices
@@ -58,7 +58,7 @@ index cabe9008ab47..826804492bc7 100644
                          if (accessibilityManager.isTouchExplorationEnabled) {
                              setOnHoverListener { v, event -> onTouch(v, event, true) }
 diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
-index 06dee7a2b9f6..505b57f3a1f9 100644
+index 06dee7a2b9f6..bfc875290216 100644
 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
 +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
 @@ -19,16 +19,30 @@ import android.content.Context
@@ -122,7 +122,7 @@ index 06dee7a2b9f6..505b57f3a1f9 100644
 +                try {
 +                    canvas = p0.lockCanvas();
 +                    Log.d("PHH", "Surface dimensions ${canvas.getWidth()*1.0f} ${canvas.getHeight()*1.0f}")
-+                    canvas.drawOval(RectF(0.0f, 0.0f, canvas.getWidth()*1.0f, canvas.getHeight()*1.0f), paint);
++                    canvas.drawOval(RectF(overlayParams.sensorBounds), paint);
 +                } finally {
 +                    // Make sure the surface is never left in a bad state.
 +                    if (canvas != null) {
diff --git a/patches/trebledroid/platform_frameworks_base/0040-SystemUI-Add-MTK-s-brightness-path-for-FOD.patch b/patches/trebledroid/platform_frameworks_base/0040-SystemUI-Add-MTK-s-brightness-path-for-FOD.patch
index 8ddc4400..c99ce12a 100644
--- a/patches/trebledroid/platform_frameworks_base/0040-SystemUI-Add-MTK-s-brightness-path-for-FOD.patch
+++ b/patches/trebledroid/platform_frameworks_base/0040-SystemUI-Add-MTK-s-brightness-path-for-FOD.patch
@@ -1,4 +1,4 @@
-From d09e5b4ad397b8483911103b3d4765c2bb849682 Mon Sep 17 00:00:00 2001
+From f8f001272af3f0d09b1ebe85223e09cbbd82cf65 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 15 Oct 2023 11:21:58 +0800
 Subject: [PATCH 40/47] SystemUI: Add MTK's brightness path for FOD
@@ -11,7 +11,7 @@ Change-Id: Ifec88c625210301b5d1146bba0275cd9699243e8
  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 505b57f3a1f9..c005c66f96bc 100644
+index bfc875290216..f03642f47d02 100644
 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
 +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
 @@ -35,6 +35,7 @@ import com.android.settingslib.udfps.UdfpsOverlayParams
diff --git a/patches/trebledroid/platform_frameworks_base/0041-Fix-brightness-slider-curve-for-some-devices.patch b/patches/trebledroid/platform_frameworks_base/0041-Fix-brightness-slider-curve-for-some-devices.patch
index 18bef006..a2534215 100644
--- a/patches/trebledroid/platform_frameworks_base/0041-Fix-brightness-slider-curve-for-some-devices.patch
+++ b/patches/trebledroid/platform_frameworks_base/0041-Fix-brightness-slider-curve-for-some-devices.patch
@@ -1,4 +1,4 @@
-From 115b3a67a05bee8d8f984de4fdc33db2fc9b5323 Mon Sep 17 00:00:00 2001
+From e0f3f6f430cbbe6e05adc01798415695771dd32b Mon Sep 17 00:00:00 2001
 From: ChonDoit <thphantomblog@gmail.com>
 Date: Thu, 24 Aug 2023 15:58:15 -0300
 Subject: [PATCH 41/47] Fix brightness slider curve for some devices
diff --git a/patches/trebledroid/platform_frameworks_base/0042-Ignore-cgroup-creation-errors.patch b/patches/trebledroid/platform_frameworks_base/0042-Ignore-cgroup-creation-errors.patch
index 38623f5f..510ba1a0 100644
--- a/patches/trebledroid/platform_frameworks_base/0042-Ignore-cgroup-creation-errors.patch
+++ b/patches/trebledroid/platform_frameworks_base/0042-Ignore-cgroup-creation-errors.patch
@@ -1,4 +1,4 @@
-From b65bdc652b7358cc42ef28d8874a4a4ee25cd3a7 Mon Sep 17 00:00:00 2001
+From 33672a9813f5b878a42ce0c6945656736570739b 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 42/47] Ignore cgroup creation errors
diff --git a/patches/trebledroid/platform_frameworks_base/0043-Samsung-tablets-use-SW_MACHINE_COVER-rather-than-SW_.patch b/patches/trebledroid/platform_frameworks_base/0043-Samsung-tablets-use-SW_MACHINE_COVER-rather-than-SW_.patch
index 191484c0..28641b39 100644
--- a/patches/trebledroid/platform_frameworks_base/0043-Samsung-tablets-use-SW_MACHINE_COVER-rather-than-SW_.patch
+++ b/patches/trebledroid/platform_frameworks_base/0043-Samsung-tablets-use-SW_MACHINE_COVER-rather-than-SW_.patch
@@ -1,4 +1,4 @@
-From aff6d95f97bea391c6fe0b08fa3928567fcb055c Mon Sep 17 00:00:00 2001
+From 1bfba29a4d321658b59faa1203fb365c51690e9c 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 43/47] Samsung tablets use SW_MACHINE_COVER rather than SW_LID
diff --git a/patches/trebledroid/platform_frameworks_base/0044-Revert-Removed-IWLAN-legacy-mode-support.patch b/patches/trebledroid/platform_frameworks_base/0044-Revert-Removed-IWLAN-legacy-mode-support.patch
index 914f86fc..bc18975f 100644
--- a/patches/trebledroid/platform_frameworks_base/0044-Revert-Removed-IWLAN-legacy-mode-support.patch
+++ b/patches/trebledroid/platform_frameworks_base/0044-Revert-Removed-IWLAN-legacy-mode-support.patch
@@ -1,4 +1,4 @@
-From 15bde0a7262a0ab82011bd21d155c5ab52bccf25 Mon Sep 17 00:00:00 2001
+From bb37b93411693ec1b49e2aea8f83f1b4a40842c6 Mon Sep 17 00:00:00 2001
 From: Alberto Ponces <ponces26@gmail.com>
 Date: Fri, 20 Oct 2023 09:26:19 +0000
 Subject: [PATCH 44/47] Revert "Removed IWLAN legacy mode support"
diff --git a/patches/trebledroid/platform_frameworks_base/0045-add-nubia-red-magic-6-series-udfps-fod.patch b/patches/trebledroid/platform_frameworks_base/0045-add-nubia-red-magic-6-series-udfps-fod.patch
index cfaa61b0..93a1bb13 100644
--- a/patches/trebledroid/platform_frameworks_base/0045-add-nubia-red-magic-6-series-udfps-fod.patch
+++ b/patches/trebledroid/platform_frameworks_base/0045-add-nubia-red-magic-6-series-udfps-fod.patch
@@ -1,4 +1,4 @@
-From b8ece716485d12a69b1570eadd7200edb7d5862d Mon Sep 17 00:00:00 2001
+From 4c70bc31d36cd686e01c855e853eddf8213baa54 Mon Sep 17 00:00:00 2001
 From: Huy Hoang <38396158+boydaihungst@users.noreply.github.com>
 Date: Sat, 14 Oct 2023 12:44:36 +0700
 Subject: [PATCH 45/47] add: nubia red magic 6 series udfps/fod
@@ -24,7 +24,7 @@ index 7f77e39041d1..5d7b5494d7fd 100644
      manifest: "AndroidManifest.xml",
  
 diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java
-index 10e45dadee60..27ab0db69756 100644
+index 10e45dadee60..efb88b9fe1ec 100644
 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java
 +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java
 @@ -47,6 +47,7 @@ import android.os.Handler;
@@ -119,14 +119,14 @@ index 10e45dadee60..27ab0db69756 100644
                  }
              }
 +        if(SystemProperties.get("ro.vendor.build.fingerprint").contains("nubia/NX669")) {
-+          processCmd(14, 0, 0, new byte[0], 0);
++          processCmd(15, 0, 0, new byte[0], 0);
 +        }
 +
              for (Callback cb : mCallbacks) {
                  cb.onFingerUp();
              }
 diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
-index c005c66f96bc..084fcb8d260f 100644
+index f03642f47d02..f86e8436b608 100644
 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
 +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
 @@ -45,6 +45,8 @@ import vendor.xiaomi.hardware.fingerprintextension.V1_0.IXiaomiFingerprint
diff --git a/patches/trebledroid/platform_frameworks_base/0046-UDFPS-Don-t-crash-if-we-can-t-compute-a-dim.-Just-do.patch b/patches/trebledroid/platform_frameworks_base/0046-UDFPS-Don-t-crash-if-we-can-t-compute-a-dim.-Just-do.patch
new file mode 100644
index 00000000..eb04893f
--- /dev/null
+++ b/patches/trebledroid/platform_frameworks_base/0046-UDFPS-Don-t-crash-if-we-can-t-compute-a-dim.-Just-do.patch
@@ -0,0 +1,34 @@
+From 67460d4704d5d0cc353e34470e77c6922ebb05d2 Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Wed, 25 Oct 2023 07:30:10 -0400
+Subject: [PATCH 46/47] UDFPS: Don't crash if we can't compute a dim. Just
+ don't dim.
+
+---
+ .../src/com/android/systemui/biometrics/UdfpsView.kt       | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
+index f86e8436b608..4377dd7e70a7 100644
+--- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
++++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
+@@ -270,12 +270,13 @@ class UdfpsView(
+             }
+         }
+ 
+-        if (!bmFilesExist) {
+-            throw FileNotFoundException("No brightness files under expected paths")
++        val dim = if (bmFilesExist) {
++            1.0 - Math.pow( (brightness / maxBrightness), 1/2.3);
++        } else {
++            0.0
+         }
+ 
+         // Assume HBM is max brightness
+-        val dim = 1.0 - Math.pow( (brightness / maxBrightness), 1/2.3);
+         Log.d("PHH-Enroll", "Brightness is $brightness / $maxBrightness, setting dim to $dim")
+         if (hasAsusGhbm) {
+             dimUpdate(dim.toFloat())
+-- 
+2.34.1
+
diff --git a/patches/trebledroid/platform_frameworks_base/0046-fix-finger-up-cmd-code.patch b/patches/trebledroid/platform_frameworks_base/0046-fix-finger-up-cmd-code.patch
deleted file mode 100644
index 1eba8d47..00000000
--- a/patches/trebledroid/platform_frameworks_base/0046-fix-finger-up-cmd-code.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6d9abbe2dd84a572d9b629e50eb896ac78a42b5c Mon Sep 17 00:00:00 2001
-From: Huy Hoang <38396158+boydaihungst@users.noreply.github.com>
-Date: Thu, 19 Oct 2023 04:27:30 +0700
-Subject: [PATCH 46/47] fix: finger up cmd code
-
----
- .../src/com/android/systemui/biometrics/UdfpsController.java    | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java
-index 27ab0db69756..efb88b9fe1ec 100644
---- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java
-+++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java
-@@ -1295,7 +1295,7 @@ public class UdfpsController implements DozeReceiver, Dumpable {
-                 }
-             }
-         if(SystemProperties.get("ro.vendor.build.fingerprint").contains("nubia/NX669")) {
--          processCmd(14, 0, 0, new byte[0], 0);
-+          processCmd(15, 0, 0, new byte[0], 0);
-         }
- 
-             for (Callback cb : mCallbacks) {
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0047-UDFPS-Don-t-crash-if-we-can-t-find-UDFPS-props.patch b/patches/trebledroid/platform_frameworks_base/0047-UDFPS-Don-t-crash-if-we-can-t-find-UDFPS-props.patch
new file mode 100644
index 00000000..64c0e995
--- /dev/null
+++ b/patches/trebledroid/platform_frameworks_base/0047-UDFPS-Don-t-crash-if-we-can-t-find-UDFPS-props.patch
@@ -0,0 +1,31 @@
+From ff8a0ebfcca14acbb4a69efc7bdf724938fce8c5 Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Wed, 25 Oct 2023 07:30:45 -0400
+Subject: [PATCH 47/47] UDFPS Don't crash if we can't find UDFPS props
+
+---
+ .../java/com/android/server/biometrics/AuthService.java   | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/services/core/java/com/android/server/biometrics/AuthService.java b/services/core/java/com/android/server/biometrics/AuthService.java
+index add882656713..26ca8c9940f5 100644
+--- a/services/core/java/com/android/server/biometrics/AuthService.java
++++ b/services/core/java/com/android/server/biometrics/AuthService.java
+@@ -1016,7 +1016,13 @@ public class AuthService extends SystemService {
+                 com.android.internal.R.array.config_udfps_sensor_props);
+ 
+         boolean isUdfps = !ArrayUtils.isEmpty(udfpsProps);
+-        if(!isUdfps) udfpsProps = dynamicUdfpsProps();
++        if(!isUdfps) {
++            try {
++                udfpsProps = dynamicUdfpsProps();
++            } catch(Throwable t) {
++                Slog.e("PHH-Enroll", "Failed generating UDFPS props");
++            }
++        }
+         isUdfps = !ArrayUtils.isEmpty(udfpsProps);
+ 
+         if(udfpsProps.length > 0) {
+-- 
+2.34.1
+
diff --git a/patches/trebledroid/platform_frameworks_base/0047-fixup-FOD-support-for-Asus-Samsung-and-recent-Xiaomi.patch b/patches/trebledroid/platform_frameworks_base/0047-fixup-FOD-support-for-Asus-Samsung-and-recent-Xiaomi.patch
deleted file mode 100644
index 3676d55b..00000000
--- a/patches/trebledroid/platform_frameworks_base/0047-fixup-FOD-support-for-Asus-Samsung-and-recent-Xiaomi.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6dcde22d24a00566e6828bc6b89f79e598f30435 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Fri, 20 Oct 2023 13:40:56 -0400
-Subject: [PATCH 47/47] fixup! FOD support for Asus, Samsung and recent Xiaomi
- devices
-
----
- .../SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt   | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
-index 084fcb8d260f..f86e8436b608 100644
---- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
-+++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
-@@ -82,7 +82,7 @@ class UdfpsView(
-                 try {
-                     canvas = p0.lockCanvas();
-                     Log.d("PHH", "Surface dimensions ${canvas.getWidth()*1.0f} ${canvas.getHeight()*1.0f}")
--                    canvas.drawOval(RectF(0.0f, 0.0f, canvas.getWidth()*1.0f, canvas.getHeight()*1.0f), paint);
-+                    canvas.drawOval(RectF(overlayParams.sensorBounds), paint);
-                 } finally {
-                     // Make sure the surface is never left in a bad state.
-                     if (canvas != null) {
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_hardware_interfaces/0001-Add-a-vendor800-command-to-be-able-to-call-vendor-sp.patch b/patches/trebledroid/platform_hardware_interfaces/0001-Add-a-vendor800-command-to-be-able-to-call-vendor-sp.patch
index 0f019866..f7f45c71 100644
--- a/patches/trebledroid/platform_hardware_interfaces/0001-Add-a-vendor800-command-to-be-able-to-call-vendor-sp.patch
+++ b/patches/trebledroid/platform_hardware_interfaces/0001-Add-a-vendor800-command-to-be-able-to-call-vendor-sp.patch
@@ -1,7 +1,7 @@
 From b4326dbe1c0ad9c80c5a5da3b6222f08f25628ab Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 19 Dec 2021 17:03:15 -0500
-Subject: [PATCH 1/2] Add a vendor800 command, to be able to call
+Subject: [PATCH 1/3] Add a vendor800 command, to be able to call
  vendor-specific hwc functions
 
 Change-Id: Icbef1e9e3a331ae3bd5a05687d545851d94d88a8
diff --git a/patches/trebledroid/platform_hardware_interfaces/0002-Fix-light-sensor-crash-on-Xiaomi-13.patch b/patches/trebledroid/platform_hardware_interfaces/0002-Fix-light-sensor-crash-on-Xiaomi-13.patch
index b9c7f3e6..d96f9f7a 100644
--- a/patches/trebledroid/platform_hardware_interfaces/0002-Fix-light-sensor-crash-on-Xiaomi-13.patch
+++ b/patches/trebledroid/platform_hardware_interfaces/0002-Fix-light-sensor-crash-on-Xiaomi-13.patch
@@ -1,7 +1,7 @@
 From 7adc66904796a05023a6ed6ec81e5ada75fe3991 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Tue, 18 Apr 2023 23:48:15 +0000
-Subject: [PATCH 2/2] Fix light sensor crash on Xiaomi 13
+Subject: [PATCH 2/3] Fix light sensor crash on Xiaomi 13
 
 SensorService expects a scalar, but Xiaomi HAL returns a pose6DOF vector encapsulation
 Thanks @phhusson for the analysis
diff --git a/patches/trebledroid/platform_hardware_interfaces/0003-Fix-crash-on-Samsung-S23-using-stock-properties-beca.patch b/patches/trebledroid/platform_hardware_interfaces/0003-Fix-crash-on-Samsung-S23-using-stock-properties-beca.patch
new file mode 100644
index 00000000..6462e43f
--- /dev/null
+++ b/patches/trebledroid/platform_hardware_interfaces/0003-Fix-crash-on-Samsung-S23-using-stock-properties-beca.patch
@@ -0,0 +1,28 @@
+From cd80c23bc3bd357946d679da60704a70757eaffd Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Tue, 24 Oct 2023 04:59:57 -0400
+Subject: [PATCH 3/3] Fix crash on Samsung S23 using stock properties, because
+ of sensor reporting vec3 instead of scalar. Likely the device orientation
+ sensor
+
+---
+ sensors/aidl/convert/convert.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/sensors/aidl/convert/convert.cpp b/sensors/aidl/convert/convert.cpp
+index be3833dfa7..c56b30475c 100644
+--- a/sensors/aidl/convert/convert.cpp
++++ b/sensors/aidl/convert/convert.cpp
+@@ -167,6 +167,9 @@ void convertToSensorEvent(const Event& src, sensors_event_t* dst) {
+                 auto dstr = ::android::internal::ToString(d);
+                 // ALOGE("Received 6DOF for expected scalar %s", dstr.c_str());
+                 dst->data[0] = d.values[0];
++            } else if (src.payload.getTag() == Event::EventPayload::vec3) {
++                auto d = src.payload.get<Event::EventPayload::vec3>();
++                dst->data[0] = d.x;
+             } else {
+                 dst->data[0] = src.payload.get<Event::EventPayload::scalar>();
+             }
+-- 
+2.34.1
+
diff --git a/patches/trebledroid/platform_packages_apps_Nfc/0001-Don-t-crash-when-there-is-no-VR-service.patch b/patches/trebledroid/platform_packages_apps_Nfc/0001-Don-t-crash-when-there-is-no-VR-service.patch
new file mode 100644
index 00000000..61a7a03b
--- /dev/null
+++ b/patches/trebledroid/platform_packages_apps_Nfc/0001-Don-t-crash-when-there-is-no-VR-service.patch
@@ -0,0 +1,30 @@
+From 0e5671e933147c3a6d4c334dcd9bebf4c76a00ba Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Fri, 20 Oct 2023 13:02:43 -0400
+Subject: [PATCH] Don't crash when there is no VR service
+
+Change-Id: I02d672f9a2688df7b1abf16377634fdcf4132511
+---
+ src/com/android/nfc/NfcService.java | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
+index f22dc9da..1b786842 100644
+--- a/src/com/android/nfc/NfcService.java
++++ b/src/com/android/nfc/NfcService.java
+@@ -572,7 +572,11 @@ public class NfcService implements DeviceHostListener, ForegroundUtils.Callback
+         mActivityManager = mContext.getSystemService(ActivityManager.class);
+         mVibrator = mContext.getSystemService(Vibrator.class);
+         mVibrationEffect = VibrationEffect.createOneShot(200, VibrationEffect.DEFAULT_AMPLITUDE);
+-        mVrManager = mContext.getSystemService(VrManager.class);
++        try {
++            mVrManager = mContext.getSystemService(VrManager.class);
++        } catch(Throwable t) {
++            mVrManager = null;
++        }
+ 
+         mScreenState = mScreenStateHelper.checkScreenState();
+ 
+-- 
+2.34.1
+
diff --git a/patches/trebledroid/platform_system_core/0001-Let-system-override-ro.apex.updatable.patch b/patches/trebledroid/platform_system_core/0001-Let-system-override-ro.apex.updatable.patch
index 1bfb08ad..a245a055 100644
--- a/patches/trebledroid/platform_system_core/0001-Let-system-override-ro.apex.updatable.patch
+++ b/patches/trebledroid/platform_system_core/0001-Let-system-override-ro.apex.updatable.patch
@@ -1,7 +1,7 @@
 From 6fce17125705b5efd0987d6ff86759b12ef114c5 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 23 Feb 2022 17:37:47 -0500
-Subject: [PATCH 01/21] Let system override ro.apex.updatable
+Subject: [PATCH 01/22] Let system override ro.apex.updatable
 
 APEX are broken because of a kernel bug in Android 10 devices
 So we have system set ro.apex.updatable = false
diff --git a/patches/trebledroid/platform_system_core/0002-If-Vboot2-fails-fall-back-to-Vboot1.patch b/patches/trebledroid/platform_system_core/0002-If-Vboot2-fails-fall-back-to-Vboot1.patch
index f9c51fd4..0fa6b713 100644
--- a/patches/trebledroid/platform_system_core/0002-If-Vboot2-fails-fall-back-to-Vboot1.patch
+++ b/patches/trebledroid/platform_system_core/0002-If-Vboot2-fails-fall-back-to-Vboot1.patch
@@ -1,7 +1,7 @@
 From 092f6994e24f4d13f2635c4576e243214376a688 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 12 Sep 2019 13:05:37 +0200
-Subject: [PATCH 02/21] If Vboot2 fails, fall-back to Vboot1
+Subject: [PATCH 02/22] If Vboot2 fails, fall-back to Vboot1
 
 Some devices, for instance Honor View 10, running Pie vendor declares
 vbmeta in their device-tree, but doesn't have a vbmeta partition.
diff --git a/patches/trebledroid/platform_system_core/0003-Revert-Remove-support-for-AVB-1.0.patch b/patches/trebledroid/platform_system_core/0003-Revert-Remove-support-for-AVB-1.0.patch
index a796860b..55bcd731 100644
--- a/patches/trebledroid/platform_system_core/0003-Revert-Remove-support-for-AVB-1.0.patch
+++ b/patches/trebledroid/platform_system_core/0003-Revert-Remove-support-for-AVB-1.0.patch
@@ -1,7 +1,7 @@
 From 4f1bde38a1c252f515b32e7333c822edfbf5c399 Mon Sep 17 00:00:00 2001
 From: Alberto Ponces <ponces26@gmail.com>
 Date: Wed, 28 Sep 2022 17:04:03 +0100
-Subject: [PATCH 03/21] Revert "Remove support for AVB 1.0."
+Subject: [PATCH 03/22] Revert "Remove support for AVB 1.0."
 
 This reverts commit 21ef2310eb1ef4e61117b8a63741f3a9577a20c9.
 
diff --git a/patches/trebledroid/platform_system_core/0004-Don-t-abandon-creating-property-tree-if-there-is-a-c.patch b/patches/trebledroid/platform_system_core/0004-Don-t-abandon-creating-property-tree-if-there-is-a-c.patch
index dc82a497..7e2e0759 100644
--- a/patches/trebledroid/platform_system_core/0004-Don-t-abandon-creating-property-tree-if-there-is-a-c.patch
+++ b/patches/trebledroid/platform_system_core/0004-Don-t-abandon-creating-property-tree-if-there-is-a-c.patch
@@ -1,7 +1,7 @@
 From e9225af656b9d454abb7733fdfa22097fe3f563c Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 18 Oct 2020 18:14:47 +0200
-Subject: [PATCH 04/21] Don't abandon creating property tree if there is a
+Subject: [PATCH 04/22] Don't abandon creating property tree if there is a
  conflict, and hope for the best
 
 Change-Id: I194c815fdd58bfb84aaf7db02b8f0d00b4db21e8
diff --git a/patches/trebledroid/platform_system_core/0005-init-Do-not-start-console-service-when-debuggable.patch b/patches/trebledroid/platform_system_core/0005-init-Do-not-start-console-service-when-debuggable.patch
index adddcfa4..e49e8c26 100644
--- a/patches/trebledroid/platform_system_core/0005-init-Do-not-start-console-service-when-debuggable.patch
+++ b/patches/trebledroid/platform_system_core/0005-init-Do-not-start-console-service-when-debuggable.patch
@@ -1,7 +1,7 @@
 From 8c3f657915f1bbc48601d6a5330f6a1b3c2566cc Mon Sep 17 00:00:00 2001
 From: Isaac Chen <tingyi364@gmail.com>
 Date: Wed, 23 Jun 2021 13:07:30 +0800
-Subject: [PATCH 05/21] init: Do not start console service when debuggable
+Subject: [PATCH 05/22] init: Do not start console service when debuggable
 
 Google added a check for this in R, when it's running it will show a
 notification about that performance is impacted.
diff --git a/patches/trebledroid/platform_system_core/0006-Panic-into-recovery-rather-than-bootloader.patch b/patches/trebledroid/platform_system_core/0006-Panic-into-recovery-rather-than-bootloader.patch
index 04221c7c..3f0c1260 100644
--- a/patches/trebledroid/platform_system_core/0006-Panic-into-recovery-rather-than-bootloader.patch
+++ b/patches/trebledroid/platform_system_core/0006-Panic-into-recovery-rather-than-bootloader.patch
@@ -1,7 +1,7 @@
 From 3fd507f7b6e681a6d8d58372515839733aba39e9 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 4 Sep 2019 21:11:48 +0200
-Subject: [PATCH 06/21] Panic into recovery rather than bootloader
+Subject: [PATCH 06/22] Panic into recovery rather than bootloader
 
 Getting last_kmsg/pstore from bootloader isn't possible for other people
 than the OEM, but we have TWRP to access last_kmsg/pstore
diff --git a/patches/trebledroid/platform_system_core/0007-Detect-allowed-sdcard-options-based-on-vndk.patch b/patches/trebledroid/platform_system_core/0007-Detect-allowed-sdcard-options-based-on-vndk.patch
index 169af2a6..c715e825 100644
--- a/patches/trebledroid/platform_system_core/0007-Detect-allowed-sdcard-options-based-on-vndk.patch
+++ b/patches/trebledroid/platform_system_core/0007-Detect-allowed-sdcard-options-based-on-vndk.patch
@@ -1,7 +1,7 @@
 From 808be05e3569daf8b12c5f6bf8aea1f271f3293c Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 14 Aug 2018 19:33:03 +0200
-Subject: [PATCH 07/21] Detect allowed sdcard options based on vndk
+Subject: [PATCH 07/22] Detect allowed sdcard options based on vndk
 
 Some kernel crashes when using too recent sdcardfs options
 
diff --git a/patches/trebledroid/platform_system_core/0008-Ugly-but-secure-Set-dev-uinput-as-0666-to-fix-finger.patch b/patches/trebledroid/platform_system_core/0008-Ugly-but-secure-Set-dev-uinput-as-0666-to-fix-finger.patch
index 904ffd2f..570daf55 100644
--- a/patches/trebledroid/platform_system_core/0008-Ugly-but-secure-Set-dev-uinput-as-0666-to-fix-finger.patch
+++ b/patches/trebledroid/platform_system_core/0008-Ugly-but-secure-Set-dev-uinput-as-0666-to-fix-finger.patch
@@ -1,7 +1,7 @@
 From 531cbe44640ea2aef11f8e38f80e7356b2181cbc Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 1 Nov 2019 18:22:13 +0100
-Subject: [PATCH 08/21] Ugly but secure: Set /dev/uinput as 0666 to fix
+Subject: [PATCH 08/22] Ugly but secure: Set /dev/uinput as 0666 to fix
  fingerprint sensor on some devices
 
 cf https://github.com/phhusson/device_phh_treble/pull/122/commits/e000d69c286b6686777ea6f1867f379e30273e48
diff --git a/patches/trebledroid/platform_system_core/0009-Revert-Set-system-xbin-permissions-to-750.patch b/patches/trebledroid/platform_system_core/0009-Revert-Set-system-xbin-permissions-to-750.patch
index a9f04f0b..872cbc1c 100644
--- a/patches/trebledroid/platform_system_core/0009-Revert-Set-system-xbin-permissions-to-750.patch
+++ b/patches/trebledroid/platform_system_core/0009-Revert-Set-system-xbin-permissions-to-750.patch
@@ -1,7 +1,7 @@
 From 3293f4325501ccbbc18c129713c42dda7a0a9f39 Mon Sep 17 00:00:00 2001
 From: Alberto Ponces <ponces26@gmail.com>
 Date: Tue, 1 Feb 2022 13:48:35 +0000
-Subject: [PATCH 09/21] Revert "Set /system/xbin permissions to 750."
+Subject: [PATCH 09/22] Revert "Set /system/xbin permissions to 750."
 
 This reverts commit 42a1a126e554a8bca31d0afc832848b7b0fa1f4e.
 
diff --git a/patches/trebledroid/platform_system_core/0010-Add-my-own-OTA-mechanism-going-over-data.patch b/patches/trebledroid/platform_system_core/0010-Add-my-own-OTA-mechanism-going-over-data.patch
index 33854ec7..3b577904 100644
--- a/patches/trebledroid/platform_system_core/0010-Add-my-own-OTA-mechanism-going-over-data.patch
+++ b/patches/trebledroid/platform_system_core/0010-Add-my-own-OTA-mechanism-going-over-data.patch
@@ -1,7 +1,7 @@
 From d3c3768156f5d20213a83aa2b811c13b4e267827 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 22 Jan 2022 14:34:45 -0500
-Subject: [PATCH 10/21] Add my own OTA mechanism going over /data
+Subject: [PATCH 10/22] Add my own OTA mechanism going over /data
 
 Change-Id: I9cacff2d761affa0376b4bb8ca63353a9d95b5de
 ---
diff --git a/patches/trebledroid/platform_system_core/0011-fs_mgr-Keep-allowing-encryptable-fstab-flag.patch b/patches/trebledroid/platform_system_core/0011-fs_mgr-Keep-allowing-encryptable-fstab-flag.patch
index 5e3d8c94..a08d6c46 100644
--- a/patches/trebledroid/platform_system_core/0011-fs_mgr-Keep-allowing-encryptable-fstab-flag.patch
+++ b/patches/trebledroid/platform_system_core/0011-fs_mgr-Keep-allowing-encryptable-fstab-flag.patch
@@ -1,7 +1,7 @@
 From f0c813afd3d1906c8abe67261a4db054bcd42346 Mon Sep 17 00:00:00 2001
 From: Alberto Ponces <ponces26@gmail.com>
 Date: Mon, 3 Oct 2022 13:50:36 +0100
-Subject: [PATCH 11/21] fs_mgr: Keep allowing encryptable fstab flag
+Subject: [PATCH 11/22] fs_mgr: Keep allowing encryptable fstab flag
 
 Some users still use "encryptable" flag while being unencrypted. Let them still boot their devices.
 
diff --git a/patches/trebledroid/platform_system_core/0012-FDE-is-dead.-Fallback-FDE-to-no-encryption-and-FDE-F.patch b/patches/trebledroid/platform_system_core/0012-FDE-is-dead.-Fallback-FDE-to-no-encryption-and-FDE-F.patch
index 27c99399..a6c99cf1 100644
--- a/patches/trebledroid/platform_system_core/0012-FDE-is-dead.-Fallback-FDE-to-no-encryption-and-FDE-F.patch
+++ b/patches/trebledroid/platform_system_core/0012-FDE-is-dead.-Fallback-FDE-to-no-encryption-and-FDE-F.patch
@@ -1,7 +1,7 @@
 From 9462592a9eec270bf4aee51758e4bcf93db22545 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 10 Nov 2022 13:30:50 -0500
-Subject: [PATCH 12/21] FDE is dead. Fallback FDE to no encryption, and FDE+FBE
+Subject: [PATCH 12/22] FDE is dead. Fallback FDE to no encryption, and FDE+FBE
  to FBE
 
 ---
diff --git a/patches/trebledroid/platform_system_core/0013-Let-system-override-adb-secure-props-so-we-dont-get-.patch b/patches/trebledroid/platform_system_core/0013-Let-system-override-adb-secure-props-so-we-dont-get-.patch
index 4fcd782b..bd75e952 100644
--- a/patches/trebledroid/platform_system_core/0013-Let-system-override-adb-secure-props-so-we-dont-get-.patch
+++ b/patches/trebledroid/platform_system_core/0013-Let-system-override-adb-secure-props-so-we-dont-get-.patch
@@ -1,7 +1,7 @@
 From 77352096746a2c3b75864cf5c3d0b736ae94321c Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 9 Dec 2022 13:57:10 -0500
-Subject: [PATCH 13/21] Let system override adb/secure props, so we dont get
+Subject: [PATCH 13/22] Let system override adb/secure props, so we dont get
  stuck in ro.adb.secure=1 vendors
 
 ---
diff --git a/patches/trebledroid/platform_system_core/0014-Allow-apex-on-5.0-kernels.-This-is-needed-because-on.patch b/patches/trebledroid/platform_system_core/0014-Allow-apex-on-5.0-kernels.-This-is-needed-because-on.patch
index eb0ce776..7058c9f2 100644
--- a/patches/trebledroid/platform_system_core/0014-Allow-apex-on-5.0-kernels.-This-is-needed-because-on.patch
+++ b/patches/trebledroid/platform_system_core/0014-Allow-apex-on-5.0-kernels.-This-is-needed-because-on.patch
@@ -1,7 +1,7 @@
 From ee4b52fd5deca426b21be5380ab0f3cf36fcf5a3 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 28 Apr 2023 12:29:05 -0400
-Subject: [PATCH 14/21] Allow apex on > 5.0 kernels. This is needed because on
+Subject: [PATCH 14/22] Allow apex on > 5.0 kernels. This is needed because on
  Pixels, camera HAL are exclusively in vendor apex
 
 Change-Id: I334cde4c5557b0ff70d550205c5bb727d4b5dbf5
diff --git a/patches/trebledroid/platform_system_core/0015-watchdogd-Support-pinging-two-watchdogs.patch b/patches/trebledroid/platform_system_core/0015-watchdogd-Support-pinging-two-watchdogs.patch
index 6d7972d9..c8cdc348 100644
--- a/patches/trebledroid/platform_system_core/0015-watchdogd-Support-pinging-two-watchdogs.patch
+++ b/patches/trebledroid/platform_system_core/0015-watchdogd-Support-pinging-two-watchdogs.patch
@@ -1,7 +1,7 @@
 From c2dc1a137d727236440151841575334196f17dcb Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 27 May 2023 05:36:21 -0400
-Subject: [PATCH 15/21] watchdogd: Support pinging two watchdogs
+Subject: [PATCH 15/22] watchdogd: Support pinging two watchdogs
 
 ---
  watchdogd/watchdogd.cpp | 33 +++++++++++++++++++++++++++++++++
diff --git a/patches/trebledroid/platform_system_core/0016-healthd-offline-charger-fix-screen-off-3-3.patch b/patches/trebledroid/platform_system_core/0016-healthd-offline-charger-fix-screen-off-3-3.patch
index 58392679..220dc74c 100644
--- a/patches/trebledroid/platform_system_core/0016-healthd-offline-charger-fix-screen-off-3-3.patch
+++ b/patches/trebledroid/platform_system_core/0016-healthd-offline-charger-fix-screen-off-3-3.patch
@@ -1,7 +1,7 @@
 From 6528e4748095821637601d7212f39438eb6474b3 Mon Sep 17 00:00:00 2001
 From: Raphael Mounier <mounierr07@gmail.com>
 Date: Sun, 21 May 2023 16:15:42 +0200
-Subject: [PATCH 16/21] healthd : offline charger fix screen off 3/3
+Subject: [PATCH 16/22] healthd : offline charger fix screen off 3/3
 
 When the phone is charging, the animation never turns off on huawei phones (kernel 4.9). This patch allows you to turn it off by setting the brightness to 0. This problem may also exist on other phone models.
 
diff --git a/patches/trebledroid/platform_system_core/0017-Disable-quotas-on-legacy-devices-with-encryption-dis.patch b/patches/trebledroid/platform_system_core/0017-Disable-quotas-on-legacy-devices-with-encryption-dis.patch
index a8ac2a22..18645075 100644
--- a/patches/trebledroid/platform_system_core/0017-Disable-quotas-on-legacy-devices-with-encryption-dis.patch
+++ b/patches/trebledroid/platform_system_core/0017-Disable-quotas-on-legacy-devices-with-encryption-dis.patch
@@ -1,7 +1,7 @@
 From 4be839207fc072d674ceedd9612639f6a340fa26 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 6 Jun 2023 16:17:11 +0100
-Subject: [PATCH 17/21] Disable quotas on legacy devices with encryption
+Subject: [PATCH 17/22] Disable quotas on legacy devices with encryption
  disabled
 
 Source: https://t.me/phhtreblebuilders/20521 and https://t.me/phhtreblebuilders/20546
diff --git a/patches/trebledroid/platform_system_core/0018-Add-vendor-firmware_mnt.-Moto-Razr-2019-look-for-fir.patch b/patches/trebledroid/platform_system_core/0018-Add-vendor-firmware_mnt.-Moto-Razr-2019-look-for-fir.patch
index a003b6fd..11e0c429 100644
--- a/patches/trebledroid/platform_system_core/0018-Add-vendor-firmware_mnt.-Moto-Razr-2019-look-for-fir.patch
+++ b/patches/trebledroid/platform_system_core/0018-Add-vendor-firmware_mnt.-Moto-Razr-2019-look-for-fir.patch
@@ -1,7 +1,7 @@
 From 30d2252403637bf16b6f9edc93c2aad08c0892d6 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 11 Jul 2023 14:52:40 -0400
-Subject: [PATCH 18/21] Add /vendor/firmware_mnt. Moto Razr 2019 look for
+Subject: [PATCH 18/22] Add /vendor/firmware_mnt. Moto Razr 2019 look for
  firmwares (modem, sensors, ...) there
 
 ---
diff --git a/patches/trebledroid/platform_system_core/0019-Ignore-dm-verity-setup-issues.patch b/patches/trebledroid/platform_system_core/0019-Ignore-dm-verity-setup-issues.patch
index 0e62f333..0ef88400 100644
--- a/patches/trebledroid/platform_system_core/0019-Ignore-dm-verity-setup-issues.patch
+++ b/patches/trebledroid/platform_system_core/0019-Ignore-dm-verity-setup-issues.patch
@@ -1,7 +1,7 @@
 From 47c88a0360289ef52061af7f2e7f1a23573c1a1d Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 6 Oct 2023 08:20:48 -0400
-Subject: [PATCH 19/21] Ignore dm-verity setup issues
+Subject: [PATCH 19/22] Ignore dm-verity setup issues
 
 On Amlogic STB Android 9 vendor, no boot device is setup
 (fstab doesn't use /dev/block/by-name but more direct mappings)
diff --git a/patches/trebledroid/platform_system_core/0020-Fix-support-for-devices-without-cgroupv2-support.patch b/patches/trebledroid/platform_system_core/0020-Fix-support-for-devices-without-cgroupv2-support.patch
index d5872e73..15946600 100644
--- a/patches/trebledroid/platform_system_core/0020-Fix-support-for-devices-without-cgroupv2-support.patch
+++ b/patches/trebledroid/platform_system_core/0020-Fix-support-for-devices-without-cgroupv2-support.patch
@@ -1,7 +1,7 @@
 From e8b4093e6e54f1851fa8935ad0b1a1baea6db14d Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 26 Oct 2022 17:59:11 -0400
-Subject: [PATCH 20/21] Fix support for devices without cgroupv2 support
+Subject: [PATCH 20/22] Fix support for devices without cgroupv2 support
 
 This is technically a revert of 1bd1746447.
 The warning inside the commit doesn't really apply to us, because the
diff --git a/patches/trebledroid/platform_system_core/0021-Disable-project_quota-on-old-devices-but-new-enough-.patch b/patches/trebledroid/platform_system_core/0021-Disable-project_quota-on-old-devices-but-new-enough-.patch
index e6b08d7f..dfb7fcb6 100644
--- a/patches/trebledroid/platform_system_core/0021-Disable-project_quota-on-old-devices-but-new-enough-.patch
+++ b/patches/trebledroid/platform_system_core/0021-Disable-project_quota-on-old-devices-but-new-enough-.patch
@@ -1,7 +1,7 @@
 From 7ecd5ebdedb7ee3e9e5b82ddf48653beddef5915 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 6 Oct 2023 19:01:27 -0400
-Subject: [PATCH 21/21] Disable project_quota on old devices but new enough to
+Subject: [PATCH 21/22] Disable project_quota on old devices but new enough to
  have encryption (they do keep quota support)
 
 ---
diff --git a/patches/trebledroid/platform_system_core/0022-fix-Nubia-6-series-custom-rc-action-prop-validation.patch b/patches/trebledroid/platform_system_core/0022-fix-Nubia-6-series-custom-rc-action-prop-validation.patch
new file mode 100644
index 00000000..dc1bf928
--- /dev/null
+++ b/patches/trebledroid/platform_system_core/0022-fix-Nubia-6-series-custom-rc-action-prop-validation.patch
@@ -0,0 +1,24 @@
+From 5a6e774867278feaffe9e0c13dc23ccfb5872b0a Mon Sep 17 00:00:00 2001
+From: Huy Hoang <38396158+boydaihungst@users.noreply.github.com>
+Date: Thu, 19 Oct 2023 07:06:55 +0700
+Subject: [PATCH 22/22] fix: Nubia 6 series custom rc action prop validation
+
+---
+ init/action_parser.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/init/action_parser.cpp b/init/action_parser.cpp
+index 49fe24a436..f683790e99 100644
+--- a/init/action_parser.cpp
++++ b/init/action_parser.cpp
+@@ -47,6 +47,7 @@ bool IsActionableProperty(Subcontext* subcontext, const std::string& prop_name)
+             "init.svc.vendor.", "ro.vendor.",    "persist.vendor.",
+             "vendor.",          "init.svc.odm.", "ro.odm.",
+             "persist.odm.",     "odm.",          "ro.boot.",
++            "nubia.perf."
+     };
+ 
+     for (const auto& prefix : kPartnerPrefixes) {
+-- 
+2.34.1
+
diff --git a/patches/trebledroid/platform_system_linkerconfig/0001-Disable-vndklite-handling.patch b/patches/trebledroid/platform_system_linkerconfig/0001-Disable-vndklite-handling.patch
index 5dde78a5..349f76d6 100644
--- a/patches/trebledroid/platform_system_linkerconfig/0001-Disable-vndklite-handling.patch
+++ b/patches/trebledroid/platform_system_linkerconfig/0001-Disable-vndklite-handling.patch
@@ -9,7 +9,7 @@ Change-Id: I4a132512471a68891f2efb59539267c35a3c3e56
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/modules/environment.cc b/modules/environment.cc
-index 82801f3..e05341b 100644
+index 82801f32..e05341b7 100644
 --- a/modules/environment.cc
 +++ b/modules/environment.cc
 @@ -29,7 +29,7 @@ bool IsLegacyDevice() {
diff --git a/patches/trebledroid/platform_system_netd/0001-Huawei-Kirin-960-accept-broken-rpfilter-match.patch b/patches/trebledroid/platform_system_netd/0001-Huawei-Kirin-960-accept-broken-rpfilter-match.patch
index fa26e155..888f627b 100644
--- a/patches/trebledroid/platform_system_netd/0001-Huawei-Kirin-960-accept-broken-rpfilter-match.patch
+++ b/patches/trebledroid/platform_system_netd/0001-Huawei-Kirin-960-accept-broken-rpfilter-match.patch
@@ -12,7 +12,7 @@ Change-Id: I9aa63d18e54a8254133adf97bf757c03d6b66757
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/server/TetherController.cpp b/server/TetherController.cpp
-index 79193574..d867cea4 100644
+index 791935746..d867cea4a 100644
 --- a/server/TetherController.cpp
 +++ b/server/TetherController.cpp
 @@ -718,7 +718,7 @@ int TetherController::setForwardRules(bool add, const char *intIface, const char
diff --git a/patches/trebledroid/platform_system_netd/0002-Don-t-fail-on-FTP-conntracking-failing.patch b/patches/trebledroid/platform_system_netd/0002-Don-t-fail-on-FTP-conntracking-failing.patch
index 0f4101b2..22e2e29e 100644
--- a/patches/trebledroid/platform_system_netd/0002-Don-t-fail-on-FTP-conntracking-failing.patch
+++ b/patches/trebledroid/platform_system_netd/0002-Don-t-fail-on-FTP-conntracking-failing.patch
@@ -14,7 +14,7 @@ Change-Id: I3d9c865eb5a4b421f9983210c2ceae62b4906234
  1 file changed, 9 insertions(+), 3 deletions(-)
 
 diff --git a/server/TetherController.cpp b/server/TetherController.cpp
-index d867cea4..00c979d8 100644
+index d867cea4a..00c979d82 100644
 --- a/server/TetherController.cpp
 +++ b/server/TetherController.cpp
 @@ -722,13 +722,19 @@ int TetherController::setForwardRules(bool add, const char *intIface, const char
diff --git a/patches/trebledroid/platform_system_netd/0003-Support-no-bpf-usecase.patch b/patches/trebledroid/platform_system_netd/0003-Support-no-bpf-usecase.patch
index d94eca2e..a87bfeb0 100644
--- a/patches/trebledroid/platform_system_netd/0003-Support-no-bpf-usecase.patch
+++ b/patches/trebledroid/platform_system_netd/0003-Support-no-bpf-usecase.patch
@@ -9,7 +9,7 @@ Change-Id: Ic759e2cfaf11705169a4a6b677b0e5aca26907b3
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/server/Controllers.cpp b/server/Controllers.cpp
-index 43a2d1ee..35e2b890 100644
+index 43a2d1ee3..35e2b890d 100644
 --- a/server/Controllers.cpp
 +++ b/server/Controllers.cpp
 @@ -284,7 +284,7 @@ void Controllers::init() {
diff --git a/patches/trebledroid/platform_system_netd/0004-Don-t-abort-in-case-of-cgroup-bpf-setup-fail-since-s.patch b/patches/trebledroid/platform_system_netd/0004-Don-t-abort-in-case-of-cgroup-bpf-setup-fail-since-s.patch
index 6f48ee59..b43e48cc 100644
--- a/patches/trebledroid/platform_system_netd/0004-Don-t-abort-in-case-of-cgroup-bpf-setup-fail-since-s.patch
+++ b/patches/trebledroid/platform_system_netd/0004-Don-t-abort-in-case-of-cgroup-bpf-setup-fail-since-s.patch
@@ -9,7 +9,7 @@ Subject: [PATCH 4/4] Don't abort in case of cgroup/bpf setup fail, since some
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/server/main.cpp b/server/main.cpp
-index 3c6b0d52..89bf4e9e 100644
+index 3c6b0d52e..89bf4e9e4 100644
 --- a/server/main.cpp
 +++ b/server/main.cpp
 @@ -147,7 +147,7 @@ int main() {