Changes for October 2023, syncing up to 20230905

patches_platform/frameworks_base/0001-Disable-FP-lockouts-optionally.patch

@@ -1,4 +1,4 @@
-From 932755113e20c93742e347b7d3908325e69e566e Mon Sep 17 00:00:00 2001
+From fdfbffda2815c0ac2270eae0efd0c31eb19e2dda Mon Sep 17 00:00:00 2001
 From: AndyCGYan <GeForce8800Ultra@gmail.com>
 Date: Fri, 22 Mar 2019 00:41:20 +0800
 Subject: [PATCH 01/22] Disable FP lockouts optionally

patches_platform/frameworks_base/0002-Disable-vendor-mismatch-warning.patch

@@ -1,4 +1,4 @@
-From af408d8a6a83d7a64de95ba596bda09f552fc152 Mon Sep 17 00:00:00 2001
+From f48a8e1bb482cde1c1e0a628aea218796586130a 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 02/22] Disable vendor mismatch warning
@@ -9,10 +9,10 @@ Change-Id: Ieb8fe91e2f02462f074312ed0f4885d183e9780b
  1 file changed, 2 insertions(+), 14 deletions(-)
 
 diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
-index 577b27b73b43..a0151468b967 100644
+index ca45e087b60c..1d1da07f2942 100644
 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
 +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
-@@ -5869,20 +5869,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
+@@ -5875,20 +5875,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
                  }
  
                  if (!Build.isBuildConsistent()) {

patches_platform/frameworks_base/0003-Keyguard-Fix-colors-of-slices-not-updating-on-doze.patch

@@ -1,4 +1,4 @@
-From ee786ac20d6586bd64839809ea16785758a5e2bf Mon Sep 17 00:00:00 2001
+From d8dea7b3e03976fa4ab292f3d6fdcae84e039196 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Tue, 17 Jan 2023 17:19:19 +0000
 Subject: [PATCH 03/22] Keyguard: Fix colors of slices not updating on doze

patches_platform/frameworks_base/0004-UI-Adjust-default-navbar-layouts.patch

@@ -1,4 +1,4 @@
-From 9ac6b32beddae19e4fd85b888f7fe8fa7ebf76c2 Mon Sep 17 00:00:00 2001
+From b92f1ca708133033601f8f0e70a872c5a30052df Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 16 Oct 2021 02:23:48 +0000
 Subject: [PATCH 04/22] UI: Adjust default navbar layouts
@@ -45,7 +45,7 @@ index 07b797a32428..000000000000
 -    <string name="config_navBarLayout" translatable="false">left[.25W],back[.5WC];home;recent[.5WC],right[.25W]</string>
 -</resources>
 diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
-index 374cff002d29..418bbc7c7932 100644
+index 99f21ed21d15..4c386f78a27a 100644
 --- a/packages/SystemUI/res/values/config.xml
 +++ b/packages/SystemUI/res/values/config.xml
 @@ -301,7 +301,7 @@
@@ -54,7 +54,7 @@ index 374cff002d29..418bbc7c7932 100644
      <!-- Nav bar button default ordering/layout -->
 -    <string name="config_navBarLayout" translatable="false">left[.5W],back[1WC];home;recent[1WC],right[.5W]</string>
 +    <string name="config_navBarLayout" translatable="false">left[.6W],back[1WC];home;recent[1WC],right[.6W]</string>
-     <string name="config_navBarLayoutQuickstep" translatable="false">back[1.7WC];home;contextual[1.7WC]</string>
+     <string name="config_navBarLayoutQuickstep" translatable="false">back[1.7WC];home;menu_ime[1.7WC]</string>
      <string name="config_navBarLayoutHandle" translatable="false">back[70AC];home_handle;ime_switcher[70AC]</string>
  
 -- 

patches_platform/frameworks_base/0005-UI-Disable-wallpaper-zoom.patch

@@ -1,4 +1,4 @@
-From b67d11a609e9aab9ed8d36525815c5edf127a3e2 Mon Sep 17 00:00:00 2001
+From 09662a87b7db9b520aa5f996c5b837717fadfdec Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 10 Jan 2021 11:44:29 +0000
 Subject: [PATCH 05/22] UI: Disable wallpaper zoom
@@ -11,7 +11,7 @@ Change-Id: I78cc5484930b27f172cd8d8a5bd9042dce3478d0
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
-index f5ed2e508411..1bfb2da64706 100644
+index f015b485dfa6..77045ea11775 100644
 --- a/core/res/res/values/config.xml
 +++ b/core/res/res/values/config.xml
 @@ -5206,7 +5206,7 @@

patches_platform/frameworks_base/0006-UI-Follow-Monet-and-light-dark-theme-in-user-1-icon.patch

@@ -1,4 +1,4 @@
-From 747de8e3300b9fc52d9b3e0d3bf94dca7e4a0367 Mon Sep 17 00:00:00 2001
+From 6662339ff0a5507899d0f8bca883dbef8f748f1b Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 25 Sep 2022 02:20:52 +0000
 Subject: [PATCH 06/22] UI: Follow Monet and light/dark theme in user 1 icon

patches_platform/frameworks_base/0007-UI-Increase-default-status-bar-height.patch

@@ -1,4 +1,4 @@
-From 334cc0e109bbe9bce5682c8b398131543099c044 Mon Sep 17 00:00:00 2001
+From 2249465d16cea6251df69dd13d331ed2fae270f0 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Wed, 3 Jun 2020 01:31:34 +0000
 Subject: [PATCH 07/22] UI: Increase default status bar height

patches_platform/frameworks_base/0008-UI-Remove-QS-footer-background.patch

@@ -1,4 +1,4 @@
-From c4cad43dbcbbfc0f1d86e8c7803282db738e48ed Mon Sep 17 00:00:00 2001
+From 380d8dff252dcde3b490cc3080bd56d2e3d21ec4 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 25 Sep 2022 02:20:20 +0000
 Subject: [PATCH 08/22] UI: Remove QS footer background

patches_platform/frameworks_base/0009-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch

@@ -1,4 +1,4 @@
-From d2185c0d7ed8a388f3ec6a0d9b02dbbd02578b0b Mon Sep 17 00:00:00 2001
+From 9f047b03021034b2cb21e7b8c2845eb8dfd577d1 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 19 Mar 2022 09:22:24 +0000
 Subject: [PATCH 09/22] UI: Restore split-screen divider to pre-Sv2 looks

patches_platform/frameworks_base/0010-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch

@@ -1,4 +1,4 @@
-From 37b6af802239f74fff078dc30576b01f43b64398 Mon Sep 17 00:00:00 2001
+From 31f4647fa3e8662e372a3dacb08a64765f29915f Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Tue, 6 Oct 2020 01:41:16 +0000
 Subject: [PATCH 10/22] UI: Revive navbar layout tuning via sysui_nav_bar

patches_platform/frameworks_base/0011-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch

@@ -1,4 +1,4 @@
-From b5361204a9dd891c17bbca6934aaa78142a3db28 Mon Sep 17 00:00:00 2001
+From d81745ad081c1e8bbabd346deb3fa5cb3b3a1017 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 26 Apr 2020 08:56:13 +0000
 Subject: [PATCH 11/22] UI: Use SNAP_FIXED_RATIO for multi-window globally
@@ -78,7 +78,7 @@ index 34b6a54be493..3921c9edfeac 100644
           Only applies if the device display is not square. -->
      <bool name="config_navBarCanMove">false</bool>
 diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
-index 1bfb2da64706..d1bbfb748379 100644
+index 77045ea11775..5c9cad656654 100644
 --- a/core/res/res/values/config.xml
 +++ b/core/res/res/values/config.xml
 @@ -3885,7 +3885,7 @@

patches_platform/frameworks_base/0012-core-Remove-old-app-target-SDK-dialog.patch

@@ -1,4 +1,4 @@
-From 0dc8c35dd5476c2dd0b688a47c3aa330bc0386c5 Mon Sep 17 00:00:00 2001
+From a1b87f1cc52bd1d906554b94657634976b9fb776 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Tue, 3 Nov 2020 22:43:12 -0800
 Subject: [PATCH 12/22] core: Remove old app target SDK dialog

patches_platform/frameworks_base/0013-Paint-Enable-subpixel-text-positioning-by-default.patch

@@ -1,4 +1,4 @@
-From 64d61661bba53aec63b25038b66dc930f0059f8a Mon Sep 17 00:00:00 2001
+From 8b17b1dc3b1f373a0ae8a44d16a8adec599915b3 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Tue, 5 Oct 2021 21:01:50 -0700
 Subject: [PATCH 13/22] Paint: Enable subpixel text positioning by default

patches_platform/frameworks_base/0014-Add-support-for-app-signature-spoofing.patch

@@ -1,4 +1,4 @@
-From 68072a29530a1e6a2274f3ec1422aaceb180b334 Mon Sep 17 00:00:00 2001
+From 482d15491c36aeb11a0e8b5c9a5205d389507034 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Sat, 16 Oct 2021 05:27:57 -0700
 Subject: [PATCH 14/22] Add support for app signature spoofing

patches_platform/frameworks_base/0015-Spoof-product-name-for-Google-Play-Services.patch

@@ -1,4 +1,4 @@
-From a2924f660008f6400621d012d037ef2107341a76 Mon Sep 17 00:00:00 2001
+From db27d27f48658841c6a74e55f543f417ddb16e76 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Mon, 11 Oct 2021 19:59:51 -0700
 Subject: [PATCH 15/22] Spoof product name for Google Play Services

patches_platform/frameworks_base/0016-keystore-Block-key-attestation-for-SafetyNet.patch

@@ -1,4 +1,4 @@
-From c5b11c6240de3e08613a80791866549c624cf2f7 Mon Sep 17 00:00:00 2001
+From dc4bd0f140c6946e01e0a3c31bfc71c884138981 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Mon, 11 Oct 2021 20:00:44 -0700
 Subject: [PATCH 16/22] keystore: Block key attestation for SafetyNet

patches_platform/frameworks_base/0017-Limit-SafetyNet-workarounds-to-unstable-GMS-process.patch

@@ -1,4 +1,4 @@
-From f3163fabeb398df4f1a3e44c79c5d66d7d567754 Mon Sep 17 00:00:00 2001
+From 05bc5fa10b4e2ebc539c32db04abbc995906ff05 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Mon, 1 Nov 2021 20:06:48 -0700
 Subject: [PATCH 17/22] Limit SafetyNet workarounds to unstable GMS process

patches_platform/frameworks_base/0018-gmscompat-Apply-the-SafetyNet-workaround-to-Play-Sto.patch

@@ -1,4 +1,4 @@
-From 0f190aa490eac609ae6331092863c8c209cb150b Mon Sep 17 00:00:00 2001
+From ace6036332743c6f1a5614b2fd573464ddbffef7 Mon Sep 17 00:00:00 2001
 From: Dyneteve <dyneteve@hentaios.com>
 Date: Tue, 23 Aug 2022 18:57:05 +0200
 Subject: [PATCH 18/22] gmscompat: Apply the SafetyNet workaround to Play Store

patches_platform/frameworks_base/0019-gmscompat-Use-Nexus-6P-fingerprint-for-CTS-Integrity.patch

@@ -1,4 +1,4 @@
-From 786a25e8bceba2a165945905b102b2d883e2c63b Mon Sep 17 00:00:00 2001
+From d67897a23c6e182294d6a6d137d7ccc430a1abe0 Mon Sep 17 00:00:00 2001
 From: Dyneteve <dyneteve@hentaios.com>
 Date: Thu, 8 Sep 2022 14:39:52 +0200
 Subject: [PATCH 19/22] gmscompat: Use Nexus 6P fingerprint for CTS/Integrity

patches_platform/frameworks_base/0020-gmscompat-Use-actual-device-model-name.patch

@@ -1,4 +1,4 @@
-From 651f1b866834ee07ee6560469fcbd5e59a105c8a Mon Sep 17 00:00:00 2001
+From 7893f246007a1989420583ab8728a5ced89e944d Mon Sep 17 00:00:00 2001
 From: Dyneteve <dyneteve@hentaios.com>
 Date: Tue, 6 Dec 2022 15:59:08 +0100
 Subject: [PATCH 20/22] gmscompat: Use actual device model name

patches_platform/frameworks_base/0021-gmscompat-Set-shipping-level-to-32-for-devices-33.patch

@@ -1,4 +1,4 @@
-From 2010137112b9a768bf766e3eb7bc4f084a4b7b28 Mon Sep 17 00:00:00 2001
+From dd5e4484df6868958941773ac310396b281e5ceb Mon Sep 17 00:00:00 2001
 From: Anirudh Gupta <anirudhgupta109@aosip.dev>
 Date: Wed, 4 Jan 2023 18:20:56 +0000
 Subject: [PATCH 21/22] gmscompat: Set shipping level to 32 for devices >=33

patches_platform/frameworks_base/0022-gmscompat-Make-CTS-Play-Integrity-pass-again.patch

@@ -1,4 +1,4 @@
-From eefc48647852fc2ced0ff413c9a40fa14b00e92c Mon Sep 17 00:00:00 2001
+From 4ffed064b21d9662631ee70d20dfd8441fcec574 Mon Sep 17 00:00:00 2001
 From: Dyneteve <dyneteve@hentaios.com>
 Date: Wed, 8 Feb 2023 15:21:01 +0000
 Subject: [PATCH 22/22] gmscompat: Make CTS/Play Integrity pass again

patches_treble/device_phh_treble/0001-treble-Lineage-ify.patch

@@ -1,7 +1,7 @@
-From 598c7139b69f6af6337c3c8829c4b3292ae7cc7c Mon Sep 17 00:00:00 2001
+From 68c0449432e3e18095ccd6d0a76675cee7c37306 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 8 Aug 2021 01:43:40 +0000
-Subject: [PATCH 01/10] treble: Lineage-ify
+Subject: [PATCH 1/9] treble: Lineage-ify
 
 Squash of:
 - Proper target names
@@ -40,7 +40,7 @@ index 6a317e4..e69de29 100644
 -PRODUCT_COPY_FILES += \
 -	device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
 diff --git a/base.mk b/base.mk
-index c26a533..98a8c59 100644
+index bf8f117..aea10fa 100644
 --- a/base.mk
 +++ b/base.mk
 @@ -17,12 +17,14 @@ PRODUCT_COPY_FILES += \

patches_treble/device_phh_treble/0002-treble-Set-BOARD_EXT4_SHARE_DUP_BLOCKS-explicitly.patch

@@ -1,7 +1,7 @@
-From 54306139fa3c14dd61d4b25ede267a4caa931116 Mon Sep 17 00:00:00 2001
+From 5f607c73f8601349d166c461d2d96237ce2779cf Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 8 Aug 2021 09:29:32 +0000
-Subject: [PATCH 02/10] treble: Set BOARD_EXT4_SHARE_DUP_BLOCKS explicitly
+Subject: [PATCH 2/9] treble: Set BOARD_EXT4_SHARE_DUP_BLOCKS explicitly
 
 Change-Id: I725443154fabde548d2e6c1b072d34c27596c421
 ---

patches_treble/device_phh_treble/0003-treble-Set-TARGET_NO_KERNEL_OVERRIDE.patch

@@ -1,7 +1,7 @@
-From e2169e811a3462fdbf0cb0678102fd1864c578af Mon Sep 17 00:00:00 2001
+From 637b46fa0db205ba2b592e8a081680d3c281c792 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Wed, 20 Oct 2021 11:30:25 +0000
-Subject: [PATCH 03/10] treble: Set TARGET_NO_KERNEL_OVERRIDE
+Subject: [PATCH 3/9] treble: Set TARGET_NO_KERNEL_OVERRIDE
 
 Taken from Lineage generic targets - skips building kernel cleanly
 

patches_treble/device_phh_treble/0004-treble-Enable-call-recording.patch

@@ -1,7 +1,7 @@
-From e2cdfc45356d89ecc9dd91d96d0fd02c4edcf8a7 Mon Sep 17 00:00:00 2001
+From 8db167728d498636399cf2ca04cbdd4a3e23b9f9 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Tue, 11 Oct 2022 11:29:02 +0000
-Subject: [PATCH 04/10] treble: Enable call recording
+Subject: [PATCH 4/9] treble: Enable call recording
 
 Change-Id: I57ca3604363547419a566b37b5151b6b30c46d28
 ---

patches_treble/device_phh_treble/0005-treble-Switch-to-MindTheGapps.patch

@@ -1,7 +1,7 @@
-From 899d500aa8720c1fff5460658fd133b4c2e515f1 Mon Sep 17 00:00:00 2001
+From eec24080edaf13ebf8d4b58815a5ef7c22f88658 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 5 Nov 2022 23:49:11 +0000
-Subject: [PATCH 05/10] treble: Switch to MindTheGapps
+Subject: [PATCH 5/9] treble: Switch to MindTheGapps
 
 Change-Id: I1b80d4c5176cbf4af21d147c71b0abce6027c7c7
 ---

patches_treble/device_phh_treble/0006-treble-Stop-securing-ADB.patch

@@ -1,7 +1,7 @@
-From f49f0bd3576140681192449ddb0ce822ae2a0bf6 Mon Sep 17 00:00:00 2001
+From fd621da49491bdb2272a076778c7c0374b3f6d1f Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Tue, 22 Nov 2022 00:36:15 +0000
-Subject: [PATCH 06/10] treble: Stop securing ADB
+Subject: [PATCH 6/9] treble: Stop securing ADB
 
 Seems to kill USB Debugging altogether on certain devices,
 and unrelated to SN anyway
@@ -13,10 +13,10 @@ Change-Id: I0215b3ed970dd53a124f48e30ca2cf4b0c6d2899
  1 file changed, 3 deletions(-)
 
 diff --git a/rw-system.sh b/rw-system.sh
-index e986b03..07e1d96 100644
+index d78d6f2..dfd9305 100644
 --- a/rw-system.sh
 +++ b/rw-system.sh
-@@ -778,13 +778,10 @@ if [ -f /system/phh/secure ] || [ -f /metadata/phh/secure ];then
+@@ -786,13 +786,10 @@ if [ -f /system/phh/secure ] || [ -f /metadata/phh/secure ];then
      resetprop_phh ro.boot.veritymode enforcing
      resetprop_phh ro.boot.warranty_bit 0
      resetprop_phh ro.warranty_bit 0

patches_treble/device_phh_treble/0007-treble-Securize-on-demand.patch

@@ -1,7 +1,7 @@
-From 67159b9dacdd2271e18926ebc6955261f3a5ac3f Mon Sep 17 00:00:00 2001
+From 81f34a4c35c904fdb34fae8f35229dc2f0580df9 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Thu, 29 Dec 2022 15:12:03 +0000
-Subject: [PATCH 07/10] treble: Securize on-demand
+Subject: [PATCH 7/9] treble: Securize on-demand
 
 Status is stored in /metadata and controlled by persist prop
 
@@ -12,10 +12,10 @@ Change-Id: I8069b6f471ad87ab34c18b743689ab3584cee35b
  2 files changed, 17 insertions(+)
 
 diff --git a/phh-prop-handler.sh b/phh-prop-handler.sh
-index b01c0cc..390b76f 100644
+index 2d30ab7..92db128 100644
 --- a/phh-prop-handler.sh
 +++ b/phh-prop-handler.sh
-@@ -233,3 +233,17 @@ if [ "$1" == "persist.bluetooth.system_audio_hal.enabled" ]; then
+@@ -257,3 +257,17 @@ if [ "$1" == "persist.bluetooth.system_audio_hal.enabled" ]; then
      restartAudio
      exit
  fi
@@ -34,10 +34,10 @@ index b01c0cc..390b76f 100644
 +    exit
 +fi
 diff --git a/vndk.rc b/vndk.rc
-index d319c9e..08bc1aa 100644
+index 823456a..1ec8ccb 100644
 --- a/vndk.rc
 +++ b/vndk.rc
-@@ -87,3 +87,6 @@ service watchdogd-gsi /system/bin/watchdogd 10 20
+@@ -90,3 +90,6 @@ service watchdogd-gsi /system/bin/watchdogd 10 20
      class core
      oneshot
      seclabel u:r:watchdogd:s0

patches_treble/device_phh_treble/0008-treble-Also-use-data-adb-for-securize-status.patch

@@ -1,7 +1,7 @@
-From d4a0510c935ba76e83c93bb3bb500ded1df2ca0e Mon Sep 17 00:00:00 2001
+From d67665b77e18082ef9362e4047f99de0a1b0f81f Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Wed, 22 Mar 2023 23:37:05 +0000
-Subject: [PATCH 08/10] treble: Also use /data/adb for securize status
+Subject: [PATCH 8/9] treble: Also use /data/adb for securize status
 
 Change-Id: I778f2be5407ae0a548a098c72031cce9be83cf96
 ---
@@ -10,10 +10,10 @@ Change-Id: I778f2be5407ae0a548a098c72031cce9be83cf96
  2 files changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/phh-prop-handler.sh b/phh-prop-handler.sh
-index 390b76f..c976b49 100644
+index 92db128..0b862d1 100644
 --- a/phh-prop-handler.sh
 +++ b/phh-prop-handler.sh
-@@ -240,10 +240,13 @@ if [ "$1" == "persist.sys.phh.securize" ];then
+@@ -264,10 +264,13 @@ if [ "$1" == "persist.sys.phh.securize" ];then
      fi
  
      if [[ "$prop_value" == "true" ]]; then
@@ -29,10 +29,10 @@ index 390b76f..c976b49 100644
      exit
  fi
 diff --git a/rw-system.sh b/rw-system.sh
-index 07e1d96..709fa1b 100644
+index dfd9305..a716c9b 100644
 --- a/rw-system.sh
 +++ b/rw-system.sh
-@@ -741,7 +741,7 @@ copyprop() {
+@@ -749,7 +749,7 @@ copyprop() {
          resetprop_phh "$1" "$(getprop "$2")"
      fi
  }

patches_treble/device_phh_treble/0009-treble-Import-prebuilt-PHH-Superuser.patch

@@ -1,7 +1,7 @@
-From d6185304554ddfb720241b2f42d76b928b4056cb Mon Sep 17 00:00:00 2001
+From d3f254e564bbc7f4d9659cb5f69819420f4a3431 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 15 Jul 2023 17:01:27 +0800
-Subject: [PATCH 10/10] treble: Import prebuilt PHH Superuser
+Subject: [PATCH 9/9] treble: Import prebuilt PHH Superuser
 
 Change-Id: I9655d706ef3e1f32d0584a68384823db895e0283
 ---

patches_treble/device_phh_treble/0009-treble-Include-androidx.window.extensions.patch

@@ -1,27 +0,0 @@
-From dd2922cc2edf2130e13117383208bfd96f59ea68 Mon Sep 17 00:00:00 2001
-From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
-Date: Fri, 24 Mar 2023 00:13:01 +0000
-Subject: [PATCH 09/10] treble: Include androidx.window.extensions
-
-This enables two-pane layout in Settings for tablets
-
-Change-Id: I2503c1c510151ea8463c86521a9164727467c551
----
- base.mk | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/base.mk b/base.mk
-index 98a8c59..aea10fa 100644
---- a/base.mk
-+++ b/base.mk
-@@ -257,3 +257,7 @@ PRODUCT_PACKAGES += \
- 
- PRODUCT_PACKAGES += \
- 	slsi-booted
-+
-+# Two-pane layout in Settings
-+PRODUCT_PACKAGES += \
-+    androidx.window.extensions
--- 
-2.34.1
-

patches_treble_td/platform_external_selinux/0001-Increase-default-log_level-to-get-actual-selinux-err.patch

@@ -1,8 +1,8 @@
-From d9083d41e17a8429dc53a6be9acfb437fd3b982b Mon Sep 17 00:00:00 2001
+From afc71434499293e37cfd831f1d7a434c6ab3251f Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 9 Apr 2018 00:19:49 +0200
-Subject: [PATCH 1/9] Increase default log_level to get actual selinux error in
+Subject: [PATCH 01/10] Increase default log_level to get actual selinux error
- kmsg
+ in kmsg
 
 ---
  secilc/secilc.c | 2 +-
@@ -22,5 +22,5 @@ index 80d3583d..a51630b2 100644
  		{"help", no_argument, 0, 'h'},
  		{"verbose", no_argument, 0, 'v'},
 -- 
-2.25.1
+2.34.1
 

patches_treble_td/platform_external_selinux/0002-Revert-libsepol-Make-an-unknown-permission-an-error-.patch

@@ -1,8 +1,8 @@
-From 0deb03a6694729e084e8e81d7e840a851d130476 Mon Sep 17 00:00:00 2001
+From 440307f9bb3e44d9c4eb8f6fcae4e495e1336d0b Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 9 Sep 2020 22:36:42 +0200
-Subject: [PATCH 2/9] Revert "libsepol: Make an unknown permission an error in
+Subject: [PATCH 02/10] Revert "libsepol: Make an unknown permission an error
- CIL"
+ in CIL"
 
 This reverts commit dc4e54126bf25dea4d51820922ccd1959be68fbc.
 
@@ -41,5 +41,5 @@ index 69a8a2ed..b63c1359 100644
  			cil_list_append(*perm_datums, curr->flavor, curr->data);
  		}
 -- 
-2.25.1
+2.34.1
 

patches_treble_td/platform_external_selinux/0003-Workaround-device-phh-treble-conflict-with-SELinux-p.patch

@@ -1,7 +1,8 @@
-From fad09461b0c7ab877b32c5ab402c053335f19f18 Mon Sep 17 00:00:00 2001
+From c9a0c6be08c1c5ada6a4b83beefd66946fe4a06c Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 31 Mar 2021 23:32:37 +0200
-Subject: [PATCH 3/9] Workaround device/phh/treble conflict with SELinux policy
+Subject: [PATCH 03/10] Workaround device/phh/treble conflict with SELinux
+ policy
 
 device/phh/treble defines the following three types (hostapd,
 sysfs_usb_supply, rpmb_device)
@@ -111,5 +112,5 @@ index b63c1359..87db4f81 100644
  	}
  
 -- 
-2.25.1
+2.34.1
 

patches_treble_td/platform_external_selinux/0004-Allow-devices-virtual-block-genfscon-conflict-seen-o.patch

@@ -1,8 +1,8 @@
-From 8168537d375afd17235b88f6ee9bc9b2c3db06a3 Mon Sep 17 00:00:00 2001
+From e1a6a3213cbb41b7ad04f7b7a685e06a36bf0441 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 6 Sep 2019 15:07:25 +0200
-Subject: [PATCH 4/9] Allow /devices/virtual/block/ genfscon conflict (seen on
+Subject: [PATCH 04/10] Allow /devices/virtual/block/ genfscon conflict (seen
- Xiaomi Mi 9)
+ on Xiaomi Mi 9)
 
 Change-Id: I06e4e9d5b82d61a8aeab595b47e2589249675895
 ---
@@ -39,5 +39,5 @@ index 09c02af9..5c0e99c3 100644
  
  int cil_post_netifcon_context_compare(const void *a, const void *b)
 -- 
-2.25.1
+2.34.1
 

patches_treble_td/platform_external_selinux/0005-if-service-is-rcs-accept-conflict.-Seen-on-Moto-E5.patch

@@ -1,7 +1,7 @@
-From 5d08badc20058b79803197379ca0371b5ae18230 Mon Sep 17 00:00:00 2001
+From 0a6fdcf14c157b55a8bd0e7dd82f2236e07dc37e Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 12 Sep 2019 20:37:04 +0200
-Subject: [PATCH 5/9] if service is "rcs", accept conflict. Seen on Moto E5
+Subject: [PATCH 05/10] if service is "rcs", accept conflict. Seen on Moto E5
 
 Change-Id: I0cc2d0fad83f403f2b5d7458039b1564ce5ed9dd
 ---
@@ -40,5 +40,5 @@ index e52b44d4..3b8a2bd8 100644
  					selinux_log
  						(SELINUX_WARNING,
 -- 
-2.25.1
+2.34.1
 

patches_treble_td/platform_external_selinux/0006-Allow-mismatches-of-exfat-genfscon.patch

@@ -1,7 +1,7 @@
-From 1bb417ece7c1709906499a9cdd73c5b37ddd8c71 Mon Sep 17 00:00:00 2001
+From c46994a1a9fad0a76e41f0a5efe5238ca3f6b582 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 24 May 2020 17:22:22 +0200
-Subject: [PATCH 6/9] Allow mismatches of exfat genfscon
+Subject: [PATCH 06/10] Allow mismatches of exfat genfscon
 
 ---
  libsepol/cil/src/cil_post.c | 4 ++++
@@ -23,5 +23,5 @@ index 5c0e99c3..97bf54f8 100644
  			fprintf(stderr, "Received conflicting %s vs %s but ignore\n", a_genfscon->path_str, b_genfscon->path_str);
  			return 0;
 -- 
-2.25.1
+2.34.1
 

patches_treble_td/platform_external_selinux/0007-Enable-multipl_decls-by-default.-This-is-needed-beca.patch

@@ -1,7 +1,7 @@
-From 6a0bc65c6bda1576d59bd89225ae4babfc3de6be Mon Sep 17 00:00:00 2001
+From 3ec6f5715a4c38ff7506fdb397eaf7077e004014 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 2 Mar 2018 22:49:55 +0100
-Subject: [PATCH 7/9] Enable multipl_decls by default. This is needed because
+Subject: [PATCH 07/10] Enable multipl_decls by default. This is needed because
  8.0 init doesn't add -m
 
 Change-Id: I43dc661d519f7b8576d72a828d8cbd444592bf5e
@@ -23,5 +23,5 @@ index a51630b2..d9841ab0 100644
  	int preserve_tunables = 0;
  	int qualified_names = 0;
 -- 
-2.25.1
+2.34.1
 

patches_treble_td/platform_external_selinux/0008-Fix-boot-on-Moto-devices-using-unknown-class.patch

@@ -1,7 +1,7 @@
-From 1e5154623b208daf37d20d297f3c8ecaacfb1b28 Mon Sep 17 00:00:00 2001
+From 96d937647898b239a0f2cfa10ad7dff3adee7093 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 25 Oct 2019 13:29:20 +0200
-Subject: [PATCH 8/9] Fix boot on Moto devices using unknown class
+Subject: [PATCH 08/10] Fix boot on Moto devices using unknown class
 
 vendor sepolicy never contains new class or classorder, and are not
 allowed to.
@@ -80,5 +80,5 @@ index 90f0fee6..023fd6c7 100644
  	if (rc != SEPOL_OK) {
  		goto exit;
 -- 
-2.25.1
+2.34.1
 

patches_treble_td/platform_external_selinux/0009-Improve-SELinux-policy-workaround-on-device-phh-treb.patch

@@ -1,7 +1,7 @@
-From e0e22c909d3f107f54136921d723f2656d5677ff Mon Sep 17 00:00:00 2001
+From 1400000270e7bc96b460ce232425970580c94783 Mon Sep 17 00:00:00 2001
 From: ponces <ponces26@gmail.com>
 Date: Mon, 7 Nov 2022 16:14:20 +0000
-Subject: [PATCH 9/9] Improve SELinux policy workaround on device/phh/treble
+Subject: [PATCH 09/10] Improve SELinux policy workaround on device/phh/treble
  conflict to exit with SEPOL_OK instead of SEPOL_EEXIST
 
 This fixes boot on many Samsung devices as exiting with SEPOL_EEXIST will prevent them to boot
@@ -22,5 +22,5 @@ index 023fd6c7..61c8864b 100644
  
  	return SEPOL_OK;
 -- 
-2.25.1
+2.34.1
 

patches_treble_td/platform_external_selinux/0010-Allow-sys-vm-watermark_scale_factor-conflict-seen-on.patch

@@ -0,0 +1,33 @@
+From 6e89fce2e98c9d076e28f18031d4ac543b49994f Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Thu, 20 Jul 2023 14:21:21 -0400
+Subject: [PATCH 10/10] Allow /sys/vm/watermark_scale_factor conflict -- seen
+ on Freebox Player Pop
+
+---
+ libsepol/cil/src/cil_post.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/libsepol/cil/src/cil_post.c b/libsepol/cil/src/cil_post.c
+index 97bf54f8..4cf1f2d3 100644
+--- a/libsepol/cil/src/cil_post.c
++++ b/libsepol/cil/src/cil_post.c
+@@ -502,6 +502,15 @@ int cil_post_genfscon_context_compare(const void *a, const void *b)
+ 		 */
+ 		if(strcmp(a_genfscon->path_str, "/devices/virtual/block/") == 0)
+ 			bypass = 1;
++        /*
++         * This conflict has been seen on Freebox Player Pop
++         * - AOSP T says (genfscon proc "/sys/vm/watermark_scale_factor" (u object_r proc_watermark_scale_factor ((s0) (s0))))
++         * - stock rom says proc_vm_writable
++         *
++         * Stock ROM uses it only in recovery so it's safe to ignore
++         */
++		if(strcmp(a_genfscon->path_str, "/sys/vm/watermark_scale_factor") == 0)
++			bypass = 1;
+ 		if(strcmp(a_genfscon->fs_str, "exfat") == 0 || strcmp(a_genfscon->fs_str, "esdfs") == 0) {
+             if(strcmp(a_genfscon->path_str, "/") == 0)
+                 bypass = 1;
+-- 
+2.34.1
+

patches_treble_td/platform_frameworks_base/0001-Fallback-to-stupid-autobrightness-if-brightness-valu.patch

@@ -1,7 +1,7 @@
-From aba065a693525e5399cc8e60495b83d3df43ac35 Mon Sep 17 00:00:00 2001
+From 4c2eb4a450bc2aca53abab517946a5ad034351ac 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 01/38] Fallback to stupid autobrightness if brightness values
+Subject: [PATCH 01/40] Fallback to stupid autobrightness if brightness values
  are broken
 
 This is needed because of:

patches_treble_td/platform_frameworks_base/0002-Fix-env-empty-string-ANDROID_STORAGE.patch

@@ -1,7 +1,7 @@
-From 17da9f9bedc15236713907ac9169364d2932e42b Mon Sep 17 00:00:00 2001
+From 34c2e7037d6438caaa37d02152542f18c54663ed Mon Sep 17 00:00:00 2001
 From: Raphael Mounier <mounierr07@gmail.com>
 Date: Sat, 6 Aug 2022 18:08:36 +0200
-Subject: [PATCH 02/38] Fix env empty string - ANDROID_STORAGE
+Subject: [PATCH 02/40] 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
 ---

patches_treble_td/platform_frameworks_base/0003-Relax-requirement-for-visible-flag-to-sdcards.patch

@@ -1,7 +1,7 @@
-From f615b0bd7ad658ec06d6610c81b2e64a065ebb14 Mon Sep 17 00:00:00 2001
+From 6951065206bae86d67aca1e8169f905b3597121e 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 03/38] Relax requirement for visible flag to sdcards
+Subject: [PATCH 03/40] 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)

patches_treble_td/platform_frameworks_base/0004-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch

@@ -1,7 +1,7 @@
-From aff76a6cdd480c03f7fb4ec8297fbc9ad085ca1a Mon Sep 17 00:00:00 2001
+From b0a3c23456c9e1f093b3e40dc98756ca5c9941c1 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 04/38] Don't crash if there is IR HAL is not declared
+Subject: [PATCH 04/40] Don't crash if there is IR HAL is not declared
 
 Change-Id: I3afded27441bbee8244d5fda544b3e6d1238dc1b
 ---

patches_treble_td/platform_frameworks_base/0005-Implement-a-persistent-property-to-override-the-defa.patch

@@ -1,7 +1,7 @@
-From 90a66f13324bff0125237385a645df902acabc73 Mon Sep 17 00:00:00 2001
+From ca6118701f4abf752e658458e2e411b9fc30a70d Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Wed, 1 Jun 2022 16:56:20 -0400
-Subject: [PATCH 05/38] Implement a persistent property to override the default
+Subject: [PATCH 05/40] Implement a persistent property to override the default
  primary camera (0)
 
 Change-Id: I49b45d00bf71d7932591b3516d49a680e1b6568b

patches_treble_td/platform_frameworks_base/0006-Show-APN-Settings-for-CDMA-carriers.patch

@@ -1,7 +1,7 @@
-From 8d0bd2d34fda0ebe3978bab80262fe16b1433102 Mon Sep 17 00:00:00 2001
+From 1d2d5b9d635f06d8b686a326c33d893d441cd106 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 06/38] Show APN Settings for CDMA carriers
+Subject: [PATCH 06/40] Show APN Settings for CDMA carriers
 
 ---
  telephony/java/android/telephony/CarrierConfigManager.java | 2 +-

patches_treble_td/platform_frameworks_base/0007-Re-order-services-so-that-it-works-even-without-qtag.patch

@@ -1,7 +1,7 @@
-From 7896ffbf9b94a6eb30567b615c9e1f8928ece263 Mon Sep 17 00:00:00 2001
+From 11cc7ea34461e8e10314c23740b3e66f815a390a 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 07/38] Re-order services so that it works even without qtaguid
+Subject: [PATCH 07/40] Re-order services so that it works even without qtaguid
 
 Change-Id: I0c0f527b3ae151d45c68f7ac6c205da3f34e74df
 ---
@@ -9,10 +9,10 @@ Change-Id: I0c0f527b3ae151d45c68f7ac6c205da3f34e74df
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
-index 89dac2160d6b..3e2374f0648c 100644
+index ad81208b66bc..fedbfe655a89 100644
 --- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
 +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
-@@ -960,6 +960,10 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
+@@ -969,6 +969,10 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
          Trace.traceBegin(Trace.TRACE_TAG_NETWORK, "systemReady");
          final int oldPriority = Process.getThreadPriority(Process.myTid());
          try {
@@ -23,7 +23,7 @@ index 89dac2160d6b..3e2374f0648c 100644
              // Boost thread's priority during system server init
              Process.setThreadPriority(Process.THREAD_PRIORITY_FOREGROUND);
              if (!isBandwidthControlEnabled()) {
-@@ -967,10 +971,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
+@@ -976,10 +980,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
                  return;
              }
  

patches_treble_td/platform_frameworks_base/0008-Support-samsung-Pie-and-Q-light-hal.patch

@@ -1,7 +1,7 @@
-From c895a000a184c877d34bc4121cce20811b331a24 Mon Sep 17 00:00:00 2001
+From afe65799c5be40b760f0bf4208f3062f52f6d999 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 08/38] Support samsung Pie and Q light hal
+Subject: [PATCH 08/40] Support samsung Pie and Q light hal
 
 Change-Id: I01f94acd7d0672733e48854d80368f9ac6f861c6
 ---

patches_treble_td/platform_frameworks_base/0009-Add-support-for-samsung-touch-physical-and-hover-pro.patch

@@ -1,7 +1,7 @@
-From 8d32a83ebd16e55651b00dfdaf9943739a2550ef Mon Sep 17 00:00:00 2001
+From 74f65c6b4812fcbe4c0e7e9805d7d9c5af597cea 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 09/38] Add support for samsung touch, physical and hover
+Subject: [PATCH 09/40] Add support for samsung touch, physical and hover
  proximity sensor as fallback to real proximity sensor
 
 Change-Id: I7a0f8b4665c802140d19197d850b77b2a7ac1865
@@ -10,7 +10,7 @@ Change-Id: I7a0f8b4665c802140d19197d850b77b2a7ac1865
  1 file changed, 35 insertions(+)
 
 diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
-index 2d9f1399ba8c..cd2cca8860b0 100644
+index 864ea43c8b01..d1be15c62fc8 100644
 --- a/services/core/java/com/android/server/display/DisplayPowerController.java
 +++ b/services/core/java/com/android/server/display/DisplayPowerController.java
 @@ -2186,6 +2186,27 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call

patches_treble_td/platform_frameworks_base/0010-Always-allow-overriding-the-number-of-work-profiles.patch

@@ -1,7 +1,7 @@
-From 046ee1b81708470cb74aacb02b26bdd810929b90 Mon Sep 17 00:00:00 2001
+From 51f70bf4badda537636fe54e98718118eab87581 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 10/38] Always allow overriding the number of work profiles
+Subject: [PATCH 10/40] Always allow overriding the number of work profiles
 
 Change-Id: I6eb09aa71663c6fbe7563e3038bffcabdba0ff6a
 ---

patches_treble_td/platform_frameworks_base/0011-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch

@@ -1,7 +1,7 @@
-From cf7d6c1af4fb6db11fb224c92b9f089f46060218 Mon Sep 17 00:00:00 2001
+From d51e6880c6266b033395494739c7543ff2ca655a 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 11/38] HOME deserves to wake-up devices just as well as back
+Subject: [PATCH 11/40] HOME deserves to wake-up devices just as well as back
  and menu
 
 Change-Id: Ia562bafd8c620d00c17e8eb338e4701c6c4a3c3a

patches_treble_td/platform_frameworks_base/0012-Some-devices-have-proximity-sensor-reporting-NaN-as-.patch

@@ -1,7 +1,7 @@
-From 68d88bf9fdf99325b99071b994b7d097d96ec934 Mon Sep 17 00:00:00 2001
+From 6dd93aa95e317043f6ddb91f406554e962fe7ad5 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 12/38] Some devices have proximity sensor reporting NaN as max
+Subject: [PATCH 12/40] 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
@@ -10,7 +10,7 @@ Change-Id: I3c39e3e914a05903c140235702e0480d2d58a612
  1 file changed, 3 insertions(+)
 
 diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
-index cd2cca8860b0..c50d0dd77265 100644
+index d1be15c62fc8..e13413633aea 100644
 --- a/services/core/java/com/android/server/display/DisplayPowerController.java
 +++ b/services/core/java/com/android/server/display/DisplayPowerController.java
 @@ -2210,6 +2210,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call

patches_treble_td/platform_frameworks_base/0013-Fix-brightness-range-not-being-complete-on-Samsung-d.patch

@@ -1,7 +1,7 @@
-From 801a99dd02f7b2b269f21744ade5a738fa98a08e Mon Sep 17 00:00:00 2001
+From c0d3ef968844092ff1a8215ffb400c27e092efda 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 13/38] Fix brightness range not being complete on Samsung
+Subject: [PATCH 13/40] Fix brightness range not being complete on Samsung
  devices
 
 On some devices, minimum brightness is 0, which totally messes with

patches_treble_td/platform_frameworks_base/0014-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch

@@ -1,7 +1,7 @@
-From e7ad6162412fa8400868a585fee042ad6fe00cc4 Mon Sep 17 00:00:00 2001
+From 95ad80b9f81a9f4941e0fac8794d7120f5b997e6 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 14/38] Re-implement fnmatch-like behaviour for RRO java-side
+Subject: [PATCH 14/40] Re-implement fnmatch-like behaviour for RRO java-side
 
 T: Also apply to FrameworkParsingPackageUtils (@PeterCxy)
 
@@ -36,14 +36,14 @@ index c01e30ded50e..db6a36ee1b66 100644
          }
          return true;
 diff --git a/core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java b/core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java
-index 3e1c5bb3d7ec..8182e9e0c771 100644
+index b75ba82ad091..b344f7232190 100644
 --- a/core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java
 +++ b/core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java
-@@ -215,8 +215,17 @@ public class FrameworkParsingPackageUtils {
+@@ -223,8 +223,17 @@ public class FrameworkParsingPackageUtils {
-         for (int i = 0; i < propNames.length; i++) {
+                 continue;
-             // Check property value: make sure it is both set and equal to expected value
+             }
-             final String currValue = SystemProperties.get(propNames[i]);
+             // 3. Check if prop is equal to expected value.
--            if (!TextUtils.equals(currValue, propValues[i])) {
+-            if (!currValue.equals(propValues[i])) {
 -                return false;
 +            final String value = propValues[i];
 +            if(value.startsWith("+")) {

patches_treble_td/platform_frameworks_base/0015-Remove-useless-notification-about-console-service-be.patch

@@ -1,7 +1,7 @@
-From 6248679163fd630ff0a9e9b747fc479a29a27e20 Mon Sep 17 00:00:00 2001
+From 3f9c80933fb570eecb7e0815b55d0248c3bba239 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 15/38] Remove useless notification about "console" service
+Subject: [PATCH 15/40] Remove useless notification about "console" service
  being running
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH 15/38] Remove useless notification about "console" service
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
-index f0dac2607a4e..37797e35b769 100644
+index ba0aaa1b7d8c..e48736fcfb6e 100644
 --- a/services/core/java/com/android/server/am/ActivityManagerService.java
 +++ b/services/core/java/com/android/server/am/ActivityManagerService.java
 @@ -5203,7 +5203,7 @@ public class ActivityManagerService extends IActivityManager.Stub

patches_treble_td/platform_frameworks_base/0016-Revert-Remove-unused-SystemProperties.set.patch

@@ -1,7 +1,7 @@
-From f1e9a8f79fac790fe194de5dd3552a77063a1068 Mon Sep 17 00:00:00 2001
+From b4532a5cfc7660f120afcf1b5ce569f2babb35f6 Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Wed, 16 Dec 2020 21:24:12 +0800
-Subject: [PATCH 16/38] Revert "Remove unused SystemProperties.set"
+Subject: [PATCH 16/40] Revert "Remove unused SystemProperties.set"
 
 This reverts commit debb4616ef67f9ed5054eca51ec58592358ff55f.
 

patches_treble_td/platform_frameworks_base/0017-TelephonyManager-bring-back-getNetworkClass.patch

@@ -1,7 +1,7 @@
-From 94c55797c141cafb83fd7cf2ef056062e7e9f1e5 Mon Sep 17 00:00:00 2001
+From 25cc3011589a6a7ea2bb73aa237d012d210d7385 Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Wed, 16 Dec 2020 13:46:15 +0800
-Subject: [PATCH 17/38] TelephonyManager: bring back getNetworkClass()
+Subject: [PATCH 17/40] TelephonyManager: bring back getNetworkClass()
 
 This partially reverts commit c058cac051ab083dc7fb7ea6aa85699110b2e9bf.
 

patches_treble_td/platform_frameworks_base/0018-TelephonyManager-add-API-annotations-for-setTelephon.patch

@@ -1,7 +1,7 @@
-From a167e58aabf890a040a9f0cc2bf42685f114367e Mon Sep 17 00:00:00 2001
+From 9665c28afafa67f7e3ad545fa4686354ec394832 Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Wed, 16 Dec 2020 21:26:45 +0800
-Subject: [PATCH 18/38] TelephonyManager: add API annotations for
+Subject: [PATCH 18/40] TelephonyManager: add API annotations for
  setTelephonyProperty
 
 * This method was added back by reverting commit

patches_treble_td/platform_frameworks_base/0019-Fix-Wakelock-issue.patch

@@ -1,7 +1,7 @@
-From 5fc326c88ced46b0282fbe8d922d56f6a10ae552 Mon Sep 17 00:00:00 2001
+From d62d49e8cc9922bfee4d0cfa7a46b4cad73f2209 Mon Sep 17 00:00:00 2001
 From: Alberto Ponces <ponces26@gmail.com>
 Date: Tue, 2 Feb 2021 10:20:51 +0000
-Subject: [PATCH 19/38] Fix Wakelock issue
+Subject: [PATCH 19/40] Fix Wakelock issue
 
 Prevent SystemUI crash due to "WakeLock under-locked Doze" (issue #12) by only releasing a wakelock that was not already released
 ---

patches_treble_td/platform_frameworks_base/0020-Automatically-detect-pick-up-sensor-so-that-an-overl.patch

@@ -1,7 +1,7 @@
-From 5097053dfc152b2b540759c8f3655437cd93eed6 Mon Sep 17 00:00:00 2001
+From a24e84761f9cf93cd5848011152427f67dde9f58 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 20/38] Automatically detect pick up sensor, so that an overlay
+Subject: [PATCH 20/40] Automatically detect pick up sensor, so that an overlay
  is required for the sole purpose of enabling pulse doze on pick up sensor
 
 ---

patches_treble_td/platform_frameworks_base/0021-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch

@@ -1,7 +1,7 @@
-From ef0f6464f2e2ebc2b7feb77a7c1cec70796f00a8 Mon Sep 17 00:00:00 2001
+From 997d9df35863d12f5f360f81fb563bded8e4637c 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 21/38] Catch broken mainBuiltInDisplayCutoutRectApproximation
+Subject: [PATCH 21/40] Catch broken mainBuiltInDisplayCutoutRectApproximation
 
 Some devices (Redmi Note 9T) have:
 mainBuiltInDisplayCutoutRectApproximation = @android:mainBuiltInDisplayCutout

patches_treble_td/platform_frameworks_base/0022-backlight-Fix-backlight-control-on-Galaxy-S9.patch

@@ -1,7 +1,7 @@
-From f833898f65bd07f61bee9319873b6e8806cc48d7 Mon Sep 17 00:00:00 2001
+From e46a9f944f561ec28a22fca69531c429cd6e2e5b 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 22/38] backlight: Fix backlight control on Galaxy S9(+)
+Subject: [PATCH 22/40] backlight: Fix backlight control on Galaxy S9(+)
 
 Change-Id: I1fbbb47939c377597ef8ad6b88b2acea5f4acaa6
 

patches_treble_td/platform_frameworks_base/0023-Revert-Switch-long-press-power-behavior-in-AOSP.patch

@@ -1,7 +1,7 @@
-From 6f8ed5c4319fe9b62db660b15fe794ea5716f24a Mon Sep 17 00:00:00 2001
+From 0a61df5a689bde7df65ce9e7bb6ef006f93309c7 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 23/38] Revert "Switch long-press power behavior in AOSP."
+Subject: [PATCH 23/40] Revert "Switch long-press power behavior in AOSP."
 
 This reverts commit 803c77a0a24624111944832098c6f65158051dc4.
 ---

patches_treble_td/platform_frameworks_base/0024-Once-we-integrate-Samsung-Power-hal-in-libpowermanag.patch

@@ -1,7 +1,7 @@
-From ba614ea5242cdec3349765d8e73360522f73c4df Mon Sep 17 00:00:00 2001
+From 2e3edc114941d9f984065a8dc62c1ae6ebe53dc6 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 24/38] Once we integrate Samsung Power hal in libpowermanager,
+Subject: [PATCH 24/40] Once we integrate Samsung Power hal in libpowermanager,
  libpowermanager and its deps require linking against
  vendor.samsung.hardware.miscpower@2.0
 

patches_treble_td/platform_frameworks_base/0025-Allow-disabling-of-fingerprint-cleanups-needed-on-so.patch

@@ -1,7 +1,7 @@
-From 489a3d36e5cc0f6cfff9b64f9837287611817df4 Mon Sep 17 00:00:00 2001
+From c1eb10baa6b31dc928b6f41bc09ba81ea27ec4ce 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/38] Allow disabling of fingerprint cleanups, needed on some
+Subject: [PATCH 25/40] Allow disabling of fingerprint cleanups, needed on some
  Realme devices that cant enumerate
 
 ---

patches_treble_td/platform_frameworks_base/0026-Reduce-the-size-of-udfps-enroll-progress-bar.-Some-d.patch

@@ -1,7 +1,7 @@
-From 8d1a0811322546ddc8a879b0b893dda756b27eaa Mon Sep 17 00:00:00 2001
+From edd26efb43890099c3da8aacfd45ef873cecee88 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 17 Dec 2021 17:16:14 -0500
-Subject: [PATCH 26/38] Reduce the size of udfps enroll progress bar. Some
+Subject: [PATCH 26/40] Reduce the size of udfps enroll progress bar. Some
  devices have their udfps pretty low, and the progress bar would make the icon
  at the wrong place
 
@@ -11,7 +11,7 @@ Change-Id: I1609ad9ca316293dcaaf07f7e681d11aadfcd29c
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
-index 374cff002d29..6bfbe512c72c 100644
+index 6eba723fb225..0743bcdde621 100644
 --- a/packages/SystemUI/res/values/config.xml
 +++ b/packages/SystemUI/res/values/config.xml
 @@ -585,7 +585,7 @@

patches_treble_td/platform_frameworks_base/0027-Dynamically-resize-boot-animation-to-match-screen-si.patch

@@ -1,7 +1,7 @@
-From b656ec3bfb10ce6af8b9453148aee7b27ec8ee16 Mon Sep 17 00:00:00 2001
+From dde9ee98994f40ab42b52141a6b827526c984a63 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 27/38] Dynamically resize boot animation to match screen size
+Subject: [PATCH 27/40] Dynamically resize boot animation to match screen size
 
 Change-Id: I54e49fc6b8c670103852e212d1416e27ff976205
 ---

patches_treble_td/platform_frameworks_base/0028-Revert-Remove-more-FDE-methods-from-StorageManager.patch

@@ -1,7 +1,7 @@
-From 2d2755154abfedd0521959aaf6217917ae4c1bb5 Mon Sep 17 00:00:00 2001
+From 038e57d4e09f2a214a589a4d1edc0cdfe57e819e 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 28/38] Revert "Remove more FDE methods from StorageManager"
+Subject: [PATCH 28/40] Revert "Remove more FDE methods from StorageManager"
 
 This reverts commit bd13f84152449a3ead6fa8604fd31f48c0224676.
 ---

patches_treble_td/platform_frameworks_base/0029-Set-old-fingerprint-sensors-to-security-strong.patch

@@ -1,7 +1,7 @@
-From 4d5546a8320037da1259944cfd1a3c5c1c92893e Mon Sep 17 00:00:00 2001
+From 31708c20e7a07b7dff260f3f9d0c4ce3c5e25624 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/38] Set old fingerprint sensors to security "strong"
+Subject: [PATCH 29/40] 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

patches_treble_td/platform_frameworks_base/0030-Call-Samsung-s-ISehSysInputDev-to-report-screen-stat.patch

@@ -1,7 +1,7 @@
-From c37ec2c90d0483fa02be820fdee555312ea5eb45 Mon Sep 17 00:00:00 2001
+From 045b26b61ba6c6a0f74b0ed4b06ad67c8cb160e3 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/38] Call Samsung's ISehSysInputDev to report screen state
+Subject: [PATCH 30/40] Call Samsung's ISehSysInputDev to report screen state
  to touchscreen driver
 
 This fixes touchscreen not waking up on Galaxy F23

patches_treble_td/platform_frameworks_base/0031-Fixup-of-c50777-original-commit-only-cares-about-R-v.patch

@@ -1,7 +1,7 @@
-From 6f98ebb5e650c8dd36668c05dddf8a7af95789f6 Mon Sep 17 00:00:00 2001
+From 8a5a72ffd10bad83e070515549b81ff7be81c207 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 15 Dec 2022 15:54:50 -0500
-Subject: [PATCH 31/38] Fixup of c50777 -- original commit only cares about R
+Subject: [PATCH 31/40] Fixup of c50777 -- original commit only cares about R
  vendors, but not about older ones. Apply that on older ones as well
 
 ---

patches_treble_td/platform_frameworks_base/0032-FOD-support-for-Asus-ZF8-and-Samsung-devices.patch

@@ -1,7 +1,7 @@
-From d0ebcd15cbdec953bc7bd74f05eac0a42a67586e Mon Sep 17 00:00:00 2001
+From 9608e159585b0fad82cede7fd9dca5e50a71672b 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 32/38] FOD support for Asus ZF8 and Samsung devices
+Subject: [PATCH 32/40] FOD support for Asus ZF8 and Samsung devices
 
 Thanks Asus for providing a free device to make this support
 And thanks @davigamer987 for donating enough to get a Samsung FOD device
@@ -30,7 +30,7 @@ index b4027197344d..0637dd4b4471 100644
      manifest: "AndroidManifest.xml",
      additional_manifests: ["LineageManifest.xml"],
 diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
-index 6bfbe512c72c..4c0db53799d4 100644
+index 0743bcdde621..99f21ed21d15 100644
 --- a/packages/SystemUI/res/values/config.xml
 +++ b/packages/SystemUI/res/values/config.xml
 @@ -585,7 +585,7 @@

patches_treble_td/platform_frameworks_base/0033-Always-add-HIDL-fingerprint-config-Galaxy-A53-is-mis.patch

@@ -1,7 +1,7 @@
-From 7364dd40dcd4346d77ddb06e5bd7635c3d474bf5 Mon Sep 17 00:00:00 2001
+From 8d89f78be84863a55d912f33fa89c1f7d87e3a0d Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 3 Jan 2023 17:59:00 -0500
-Subject: [PATCH 33/38] Always add HIDL fingerprint config (Galaxy A53 is
+Subject: [PATCH 33/40] Always add HIDL fingerprint config (Galaxy A53 is
  missing it on A12 vendor) -- but first enumerate AIDL
 
 ---

patches_treble_td/platform_frameworks_base/0034-SystemUI-Implement-alternate-brightness-path-for-FOD.patch

@@ -1,7 +1,7 @@
-From c98e60ff94928572e628c925b4b237efb756c78a Mon Sep 17 00:00:00 2001
+From 1a3206a559815eaa16f9429ad7005bf9b9166e00 Mon Sep 17 00:00:00 2001
 From: ItsLynix <71310187+ItsLynix@users.noreply.github.com>
 Date: Sat, 28 Jan 2023 10:25:16 +0100
-Subject: [PATCH 34/38] SystemUI: Implement alternate brightness path for FOD
+Subject: [PATCH 34/40] SystemUI: Implement alternate brightness path for FOD
 
 Change-Id: I0d9d7352c507529a3aa66e7a7d78220887a5a532
 ---

patches_treble_td/platform_frameworks_base/0035-bootanimation-Fix-bootanimation-when-using-mask-shin.patch

@@ -1,7 +1,7 @@
-From fe68855c138e99a23d08aebd01d93bd74aeac24d Mon Sep 17 00:00:00 2001
+From 8288ac5438093913d4d10a06016686658493509d Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 10 May 2023 11:28:27 -0400
-Subject: [PATCH 35/38] bootanimation: Fix bootanimation when using mask+shine
+Subject: [PATCH 35/40] bootanimation: Fix bootanimation when using mask+shine
  rather than animation
 
 This was broken by the commit that automatically resizes animations

patches_treble_td/platform_frameworks_base/0036-Try-catch-around-constrainNitsAndBacklightArrays-and.patch

@@ -1,7 +1,7 @@
-From efec390e1f59e2c8c74b8f099795e2e786c6ac32 Mon Sep 17 00:00:00 2001
+From ca84c53b0c287ea716c29e079e9699c2523d4947 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 36/38] Try catch around constrainNitsAndBacklightArrays, and
+Subject: [PATCH 36/40] Try catch around constrainNitsAndBacklightArrays, and
  falls back to dumb curve. It crashes on Xperia 1 IV.
 
 ---

patches_treble_td/platform_frameworks_base/0037-Add-Mediatek-power-hints-on-touch.patch

@@ -1,7 +1,7 @@
-From 0a0a7d47277f2dad18718fb3f8b3829798a49cf0 Mon Sep 17 00:00:00 2001
+From 97ffa12b05a61bf23af04c575dca064141ead52f 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 37/38] Add Mediatek power hints on touch
+Subject: [PATCH 37/40] Add Mediatek power hints on touch
 
 Mediatek has multiple HALs (which existed concurrently), so it is a bit
 of a mess.
@@ -39,7 +39,7 @@ index c4c8ee1f565a..8514ad55da09 100644
          "vendor.goodix.hardware.biometrics.fingerprint-V2.1-java",
          "vendor.samsung.hardware.biometrics.fingerprint-V3.0-java",
 diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java
-index 6921c5eaf2b0..8b892f1f4f87 100644
+index 41f84c05a749..024f27a42d76 100644
 --- a/services/core/java/com/android/server/wm/DisplayPolicy.java
 +++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
 @@ -221,6 +221,9 @@ public class DisplayPolicy {

patches_treble_td/platform_frameworks_base/0038-Detect-Moto-dynamic-hardware-feature.patch

@@ -1,7 +1,7 @@
-From 9d2acab3eb291d7df535ab3e164909fd2a476b98 Mon Sep 17 00:00:00 2001
+From a0186f96b11f3ce778e6edb42dde69f1ee373dd9 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 38/38] Detect Moto dynamic hardware feature
+Subject: [PATCH 38/40] Detect Moto dynamic hardware feature
 
 Moto added a custom node in sysconfig XMLs:
 <unavailable-feature-conditional />

patches_treble_td/platform_frameworks_base/0039-Add-initial-Xiaomi-FOD-implementation-for-recent-Xia.patch

@@ -0,0 +1,211 @@
+From 8fe0669d57555ce564caa476bd0278bb208c2d94 Mon Sep 17 00:00:00 2001
+From: jgudec <jakov.gudec@gmail.com>
+Date: Fri, 18 Aug 2023 08:41:49 +0100
+Subject: [PATCH 39/40] Add initial Xiaomi FOD implementation for recent Xiaomi
+ devices
+
+Huge thanks to phhusson for the help and guidance.
+
+Change-Id: I123556a7d6c48e9ace36281336991ed231cf62a5
+---
+ packages/SystemUI/Android.bp                  |  2 +
+ .../android/systemui/biometrics/UdfpsView.kt  | 43 +++++++++++++++++
+ services/core/Android.bp                      |  1 +
+ .../server/biometrics/AuthService.java        | 46 +++++++++++++++++++
+ 4 files changed, 92 insertions(+)
+
+diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp
+index 0637dd4b4471..f41b178f55b1 100644
+--- a/packages/SystemUI/Android.bp
++++ b/packages/SystemUI/Android.bp
+@@ -179,6 +179,8 @@ android_library {
+         "motion_tool_lib",
+         "vendor.lineage.powershare-V1.0-java",
+         "vendor.goodix.hardware.biometrics.fingerprint-V2.1-java",
++        "vendor.xiaomi.hw.touchfeature-V1.0-java",
++        "vendor.xiaomi.hardware.fingerprintextension-V1.0-java"
+     ],
+     manifest: "AndroidManifest.xml",
+     additional_manifests: ["LineageManifest.xml"],
+diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
+index 6cc9ab3da570..8ab00fc34f0d 100644
+--- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
++++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
+@@ -37,6 +37,12 @@ import java.io.File
+ 
+ import vendor.goodix.hardware.biometrics.fingerprint.V2_1.IGoodixFingerprintDaemon
+ 
++import vendor.xiaomi.hw.touchfeature.V1_0.ITouchFeature
++import vendor.xiaomi.hardware.fingerprintextension.V1_0.IXiaomiFingerprint
++
++import android.os.Handler
++import android.os.HandlerThread
++
+ private const val TAG = "UdfpsView"
+ 
+ 
+@@ -220,6 +226,12 @@ Log.d("PHH", "Surface destroyed!")
+     val hasSamsungMask = File(samsungActualMaskBrightness).exists()
+     var fodFileObserver: FileObserver? = null
+ 
++    val xiaomiDispParam = "/sys/class/mi_display/disp-DSI-0/disp_param"
++    var hasXiaomiLhbm = File(xiaomiDispParam).exists()
++
++    private val handlerThread = HandlerThread("UDFPS").also { it.start() }
++    val myHandler = Handler(handlerThread.looper)
++
+     fun configureDisplay(onDisplayConfigured: Runnable) {
+         isDisplayConfigured = true
+         animationViewController?.onDisplayConfiguring()
+@@ -255,6 +267,34 @@ Log.d("PHH", "Surface destroyed!")
+         if(android.os.SystemProperties.get("ro.vendor.build.fingerprint").contains("ASUS")) {
+             goodixCmd(200001)
+         }
++
++        if(hasXiaomiLhbm){
++            Log.d("PHH-Enroll", "Xiaomi scenario in UdfpsView reached!")
++            mySurfaceView.setVisibility(INVISIBLE)
++
++            IXiaomiFingerprint.getService().extCmd(android.os.SystemProperties.getInt("persist.phh.xiaomi.fod.enrollment.id", 4), 1);
++            var res = ITouchFeature.getService().setTouchMode(0, 10, 1);
++            if(res != 0){
++                Log.d("PHH-Enroll", "SetTouchMode 10,1 was NOT executed successfully. Res is " + res)
++            }
++
++            myHandler.postDelayed({
++                var ret200 = ITouchFeature.getService().setTouchMode(0, 10, 1);
++
++                if(ret200 != 0){
++                    Log.d("PHH-Enroll", "myHandler.postDelayed 200ms -SetTouchMode was NOT executed successfully. Ret is " + ret200)
++                }
++
++                myHandler.postDelayed({
++                    Log.d("PHH-Enroll", "myHandler.postDelayed 600ms - line prior to setTouchMode 10,0")
++                    var ret600 = ITouchFeature.getService().setTouchMode(0, 10, 0);
++
++                    if(ret600 != 0){
++                        Log.d("PHH-Enroll", "myHandler.postDelayed 600ms -SetTouchMode 10,0 was NOT executed successfully. Ret is " + ret600)
++                    }
++                }, 600)
++            }, 200)
++        }
+     }
+ 
+     fun unconfigureDisplay() {
+@@ -296,6 +336,9 @@ Log.d("PHH", "Surface destroyed!")
+                 }
+             };
+             fodFileObserver?.startWatching();
++        } else if(hasXiaomiLhbm) {
++            IXiaomiFingerprint.getService().extCmd(android.os.SystemProperties.getInt("persist.phh.xiaomi.fod.enrollment.id", 4), 0);
++            ITouchFeature.getService().setTouchMode(0, 10, 0);
+         } else {
+             dimUpdate(0.0f)
+         }
+diff --git a/services/core/Android.bp b/services/core/Android.bp
+index 8514ad55da09..58458734053b 100644
+--- a/services/core/Android.bp
++++ b/services/core/Android.bp
+@@ -181,6 +181,7 @@ java_library_static {
+         "vendor.samsung.hardware.biometrics.fingerprint-V3.0-java",
+         "vendor.oplus.hardware.biometrics.fingerprint-V2.1-java",
+         "vendor.oppo.hardware.biometrics.fingerprint-V2.1-java",
++        "vendor.xiaomi.hardware.fingerprintextension-V1.0-java",
+     ],
+     javac_shard_size: 50,
+ }
+diff --git a/services/core/java/com/android/server/biometrics/AuthService.java b/services/core/java/com/android/server/biometrics/AuthService.java
+index 7d6f9a12057f..22827ecdaf89 100644
+--- a/services/core/java/com/android/server/biometrics/AuthService.java
++++ b/services/core/java/com/android/server/biometrics/AuthService.java
+@@ -66,6 +66,7 @@ import android.os.ServiceManager;
+ import android.os.SystemProperties;
+ import android.os.UserHandle;
+ import android.provider.Settings;
++import android.text.TextUtils;
+ import android.util.Slog;
+ 
+ import com.android.internal.R;
+@@ -93,6 +94,7 @@ import vendor.samsung.hardware.biometrics.fingerprint.V3_0.ISehBiometricsFingerp
+ import vendor.goodix.hardware.biometrics.fingerprint.V2_1.IGoodixFingerprintDaemon;
+ import vendor.samsung.hardware.sysinput.V1_0.ISehSysInputDev;
+ 
++import vendor.xiaomi.hardware.fingerprintextension.V1_0.IXiaomiFingerprint;
+ /**
+  * System service that provides an interface for authenticating with biometrics and
+  * PIN/pattern/password to BiometricPrompt and lock screen.
+@@ -114,6 +116,7 @@ public class AuthService extends SystemService {
+     private FileObserver fodFileObserver = null;
+     private ISehBiometricsFingerprint mSamsungFingerprint = null;
+ 
++    private IXiaomiFingerprint mXiaomiFingerprint = null;
+     /**
+      * Class for injecting dependencies into AuthService.
+      * TODO(b/141025588): Replace with a dependency injection framework (e.g. Guice, Dagger).
+@@ -677,6 +680,12 @@ public class AuthService extends SystemService {
+         } catch(Exception e) {
+             android.util.Log.e("PHH", "Failed getting Samsung fingerprint HAL", e);
+         }
++        try {
++            mXiaomiFingerprint = IXiaomiFingerprint.getService();
++            android.util.Log.e("PHH", "Got xiaomi fingerprint HAL");
++        } catch(Exception e) {
++            android.util.Log.e("PHH", "Failed getting xiaomi fingerprint HAL", e);
++        }
+         if(samsungHasCmd("fod_enable") && mSamsungFingerprint != null) {
+             samsungCmd("fod_enable,1,1,0");
+             String actualMaskBrightnessPath = "/sys/class/lcd/panel/actual_mask_brightness";
+@@ -737,6 +746,31 @@ public class AuthService extends SystemService {
+             fodFileObserver.startWatching();
+         }
+ 
++        String xiaomiFodPressedStatusPath = "/sys/class/touch/touch_dev/fod_press_status";
++        if(new File(xiaomiFodPressedStatusPath).exists() && mXiaomiFingerprint != null) {
++            fodFileObserver = new FileObserver(xiaomiFodPressedStatusPath, FileObserver.MODIFY) {
++                @Override
++                public void onEvent(int event, String path) {
++                    String isFodPressed = readFile(xiaomiFodPressedStatusPath);
++                    Slog.d("PHH-Enroll", "Fod pressed status: " + isFodPressed);
++                    Slog.d("PHH-Enroll", "Within xiaomi scenario for FOD");
++
++                    try {
++                    if("0".equals(isFodPressed)) {
++                        Slog.d("PHH-Enroll", "Fod un-pressed!");
++                        mXiaomiFingerprint.extCmd(android.os.SystemProperties.getInt("phh.xiaomi.fod.enrollment.id", 4), 0);
++                    } else if("1".equals(isFodPressed)) {
++                        Slog.d("PHH-Enroll", "Fod pressed!");
++                        mXiaomiFingerprint.extCmd(android.os.SystemProperties.getInt("phh.xiaomi.fod.enrollment.id", 4), 1);
++                    }
++                    } catch(Exception e) {
++                        Slog.d("PHH-Enroll", "Failed Xiaomi async extcmd", e);
++                    }
++                }
++            };
++            fodFileObserver.startWatching();
++        }
++
+     }
+ 
+     /**
+@@ -938,6 +972,18 @@ public class AuthService extends SystemService {
+             return udfpsProps;
+         }
+ 
++        if(!TextUtils.isEmpty(android.os.SystemProperties.get("persist.vendor.sys.fp.fod.location.X_Y"))) {
++            int[] udfpsProps = new int[3];
++            String[] coordinates = android.os.SystemProperties.get("persist.vendor.sys.fp.fod.location.X_Y").split(",");
++            udfpsProps[0] = displayRealSize.x/2;
++            udfpsProps[1] = Integer.parseInt(coordinates[1]) + 100;
++
++            String[] widthHeight = android.os.SystemProperties.get("persist.vendor.sys.fp.fod.size.width_height").split(",");
++
++            udfpsProps[2] = (Integer.parseInt(widthHeight[0]) /2);
++            return udfpsProps;
++        }
++
+         return new int[0];
+     }
+ 
+-- 
+2.34.1
+

patches_treble_td/platform_frameworks_base/0040-SystemUI-Add-MTK-s-brightness-path-for-FOD.patch

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

patches_treble_td/platform_system_core/0001-Let-system-override-ro.apex.updatable.patch

@@ -1,7 +1,7 @@
-From 84a2ccce45d2940a18d82665026cdbeaaed9082f Mon Sep 17 00:00:00 2001
+From e85007e417fcdd83eefe4a26addf921f86f8aff8 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/18] Let system override ro.apex.updatable
+Subject: [PATCH 01/19] 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

patches_treble_td/platform_system_core/0002-If-Vboot2-fails-fall-back-to-Vboot1.patch

@@ -1,7 +1,7 @@
-From e8bee0466c8df3d00ef350073c687b592cb17cb7 Mon Sep 17 00:00:00 2001
+From cd85340d03c08becacec737bc899e4d420e554d8 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/18] If Vboot2 fails, fall-back to Vboot1
+Subject: [PATCH 02/19] 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.

patches_treble_td/platform_system_core/0003-Revert-Remove-support-for-AVB-1.0.patch

@@ -1,7 +1,7 @@
-From a3c5e1273b07143deb6674aadc83a48ee533256d Mon Sep 17 00:00:00 2001
+From 02fe28a38594b340e948a4c3f3d0474652c475c3 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/18] Revert "Remove support for AVB 1.0."
+Subject: [PATCH 03/19] Revert "Remove support for AVB 1.0."
 
 This reverts commit 21ef2310eb1ef4e61117b8a63741f3a9577a20c9.
 

patches_treble_td/platform_system_core/0004-Don-t-abandon-creating-property-tree-if-there-is-a-c.patch

@@ -1,7 +1,7 @@
-From 76f477bfcfb884dfc8e744d6965279baf7e30e65 Mon Sep 17 00:00:00 2001
+From 272f83a79cafc441fb351ca537953b8333e8d1a3 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/18] Don't abandon creating property tree if there is a
+Subject: [PATCH 04/19] Don't abandon creating property tree if there is a
  conflict, and hope for the best
 
 Change-Id: I194c815fdd58bfb84aaf7db02b8f0d00b4db21e8

patches_treble_td/platform_system_core/0005-init-Do-not-start-console-service-when-debuggable.patch

@@ -1,7 +1,7 @@
-From 8f3e34d45306f1d56dadc898f903d04ba3d319a4 Mon Sep 17 00:00:00 2001
+From 2867f09c8889a1556e9fe262b408995c0b545afa 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/18] init: Do not start console service when debuggable
+Subject: [PATCH 05/19] 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.

patches_treble_td/platform_system_core/0006-Panic-into-recovery-rather-than-bootloader.patch

@@ -1,7 +1,7 @@
-From ad71b6344150ff1210f8a18466d3e7b5ded363ef Mon Sep 17 00:00:00 2001
+From a7ebb5c1a09be17d547be7914e299a8647fc3c58 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/18] Panic into recovery rather than bootloader
+Subject: [PATCH 06/19] 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

patches_treble_td/platform_system_core/0007-Detect-allowed-sdcard-options-based-on-vndk.patch

@@ -1,7 +1,7 @@
-From 20ec90b2213291c7d944165cfb56d3a5fe83c647 Mon Sep 17 00:00:00 2001
+From e2747a66025dd6e50386996cc64682ef9969af94 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/18] Detect allowed sdcard options based on vndk
+Subject: [PATCH 07/19] Detect allowed sdcard options based on vndk
 
 Some kernel crashes when using too recent sdcardfs options
 

patches_treble_td/platform_system_core/0008-Revert-Set-system-xbin-permissions-to-750.patch

@@ -1,7 +1,7 @@
-From b7e4a2199e4136acf28455ac2ead4a221b9114c0 Mon Sep 17 00:00:00 2001
+From af6a6a3627073c8da06e717e0a17be8796ae627f Mon Sep 17 00:00:00 2001
 From: Alberto Ponces <ponces26@gmail.com>
 Date: Tue, 1 Feb 2022 13:48:35 +0000
-Subject: [PATCH 08/18] Revert "Set /system/xbin permissions to 750."
+Subject: [PATCH 08/19] Revert "Set /system/xbin permissions to 750."
 
 This reverts commit 42a1a126e554a8bca31d0afc832848b7b0fa1f4e.
 

patches_treble_td/platform_system_core/0009-Ugly-but-secure-Set-dev-uinput-as-0666-to-fix-finger.patch

@@ -1,7 +1,7 @@
-From 07019bb5dfc336be516933b632bb4e2e7c8aa76a Mon Sep 17 00:00:00 2001
+From ce08cc848bbee12211a3049d88d7d4263159e2eb 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 09/18] Ugly but secure: Set /dev/uinput as 0666 to fix
+Subject: [PATCH 09/19] 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

patches_treble_td/platform_system_core/0010-Add-my-own-OTA-mechanism-going-over-data.patch

@@ -1,7 +1,7 @@
-From e9708de0e4a9964367ba8b5234744bfcf542775f Mon Sep 17 00:00:00 2001
+From d25ed4dd5a316785439c3058b9ae8aa348383c44 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/18] Add my own OTA mechanism going over /data
+Subject: [PATCH 10/19] Add my own OTA mechanism going over /data
 
 Change-Id: I9cacff2d761affa0376b4bb8ca63353a9d95b5de
 ---

patches_treble_td/platform_system_core/0011-fs_mgr-Keep-allowing-encryptable-fstab-flag.patch

@@ -1,7 +1,7 @@
-From 231e9f580d15d1fa8921997e67658fb309c39e45 Mon Sep 17 00:00:00 2001
+From 17bb6c633e19e1b861009711f0e6d8eb53222c91 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/18] fs_mgr: Keep allowing encryptable fstab flag
+Subject: [PATCH 11/19] fs_mgr: Keep allowing encryptable fstab flag
 
 Some users still use "encryptable" flag while being unencrypted. Let them still boot their devices.
 

patches_treble_td/platform_system_core/0012-Fix-support-for-devices-without-cgroupv2-support.patch

@@ -1,7 +1,7 @@
-From 60859460f47b4c0b49a3940c444f7a3fb8f6d23e Mon Sep 17 00:00:00 2001
+From 7c8773783a0813d0bf5ea11b20cc039feddb59a9 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 12/18] Fix support for devices without cgroupv2 support
+Subject: [PATCH 12/19] 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

patches_treble_td/platform_system_core/0013-FDE-is-dead.-Fallback-FDE-to-no-encryption-and-FDE-F.patch

@@ -1,7 +1,7 @@
-From cd69cc61a42634a79a41d0101d94948fb391245d Mon Sep 17 00:00:00 2001
+From 0aab39174821c9f559f0092a642df737f3f6a53d 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 13/18] FDE is dead. Fallback FDE to no encryption, and FDE+FBE
+Subject: [PATCH 13/19] FDE is dead. Fallback FDE to no encryption, and FDE+FBE
  to FBE
 
 ---

patches_treble_td/platform_system_core/0014-Let-system-override-adb-secure-props-so-we-dont-get-.patch

@@ -1,7 +1,7 @@
-From af0dbba06137841519de13038e8f9196433f5f15 Mon Sep 17 00:00:00 2001
+From 7eacc7109685cc54b04ea65ea3cc5012d7b34863 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 14/18] Let system override adb/secure props, so we dont get
+Subject: [PATCH 14/19] Let system override adb/secure props, so we dont get
  stuck in ro.adb.secure=1 vendors
 
 ---

patches_treble_td/platform_system_core/0015-Allow-apex-on-5.0-kernels.-This-is-needed-because-on.patch

@@ -1,7 +1,7 @@
-From bc006b62fb1e03d21e3c6263e5d4e934c2eb6538 Mon Sep 17 00:00:00 2001
+From 9fde7309a84981a5bb3419ae9b3bcddb6d937697 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 15/18] Allow apex on > 5.0 kernels. This is needed because on
+Subject: [PATCH 15/19] Allow apex on > 5.0 kernels. This is needed because on
  Pixels, camera HAL are exclusively in vendor apex
 
 ---

patches_treble_td/platform_system_core/0016-watchdogd-Support-pinging-two-watchdogs.patch

@@ -1,7 +1,7 @@
-From ed4147cd6f66386bb54bd7761a7c3948d1a249e9 Mon Sep 17 00:00:00 2001
+From bd57112c8e2c9990c858af1da4cf54e313323e26 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 16/18] watchdogd: Support pinging two watchdogs
+Subject: [PATCH 16/19] watchdogd: Support pinging two watchdogs
 
 ---
  watchdogd/watchdogd.cpp | 33 +++++++++++++++++++++++++++++++++