From e4840ca0f4e2cbe4bbd89b45466fe05f427600cd Mon Sep 17 00:00:00 2001
From: ahnet-69 <syedmusicrealise@gmail.com>
Date: Tue, 23 Jan 2024 18:22:51 +0000
Subject: [PATCH] Rebase entire patches

---
 evo.mk                                        |   3 +
 .../0003-Add-Maintainer-Strings.patch         |  36 ++
 ...to-fallback-mCallingSid-to-getpidcon.patch |  64 +++
 .../0001-Remove-PlayAutoInstallConfig.patch   | 356 +++++++-------
 .../0002-Dont-handle-apns.patch               |  40 --
 .../0001-Disable-vndklite-handling.patch      |   2 +-
 ...m-to-fake-vendor-props-on-a-per-proc.patch |   2 +-
 ...t-reboot-if-we-couldn-t-get-bootctrl.patch |   2 +-
 ...-build-remove-emulator-crap-from-GSI.patch |   4 +-
 .../0002-build-Bypass-vendor-calls.patch      |   4 +-
 .../0003-Remove-init.vndk-nodef.rc.patch      |   6 +-
 .../0004-build-Remove-llkd.patch              |   4 +-
 ...05-Include-vndk-v28-sepolicy-support.patch |   4 +-
 ...-log_level-to-get-actual-selinux-err.patch |   2 +-
 ...Make-an-unknown-permission-an-error-.patch |   2 +-
 ...e-phh-treble-conflict-with-SELinux-p.patch |   2 +-
 ...rtual-block-genfscon-conflict-seen-o.patch |   2 +-
 ...rcs-accept-conflict.-Seen-on-Moto-E5.patch |   2 +-
 ...6-Allow-mismatches-of-exfat-genfscon.patch |   2 +-
 ...-on-Moto-devices-using-unknown-class.patch |   2 +-
 ...policy-workaround-on-device-phh-treb.patch |   2 +-
 ...ermark_scale_factor-conflict-seen-on.patch |   2 +-
 .../0010-Allow-conflict-on-fuseblk.patch      |   2 +-
 ...and-Q-behavior-respectively-for-tele.patch |  12 +-
 .../0002-Fix-BT-in-call-on-CAF-devices.patch  |   4 +-
 ...id-is-hardcoded-support-for-Asus-ZF6.patch |  20 +-
 ...again-with-trimmed-audio-port-name-i.patch |   4 +-
 ...-property-to-override-default-camera.patch |   4 +-
 ...SCO-devices.-Fallback-from-one-to-th.patch |   8 +-
 ...phh.samsung.camera_ids-property-to-a.patch |   4 +-
 ...rty-to-force-camera-timestamp-source.patch |   8 +-
 ...IH-devices-Fix-Earpiece-audio-output.patch |   4 +-
 ...e-assigning-legacy-audio-groups-fata.patch |   8 +-
 ...-Make-camera-IDs-filter-out-optional.patch |  36 +-
 .../0014-Support-Samsung-R-multi-cams.patch   |   4 +-
 ...Don-t-crash-on-unknown-audio-devices.patch |   4 +-
 ...in-a-route-are-valid.-Dont-ignore-th.patch |   4 +-
 ...lume-policy-when-none-has-been-found.patch |   8 +-
 ...pport-for-audio-HAL-V2-from-the-fram.patch |  14 +-
 ...rop-to-change-Samsung-flash-strength.patch |   4 +-
 ...gh-pitched-voice-on-Qualcomm-devices.patch |   4 +-
 ...broken-mic-while-video-recording-on-.patch |   4 +-
 ...sable-AUDIO_OUTPUT_FLAG_FAST-from-au.patch |   2 +-
 ...x-echo-on-incoming-or-outgoing-calls.patch |   2 +-
 ...0001-Disable-vendor-mismatch-warning.patch |   8 +-
 ...id-autobrightness-if-brightness-valu.patch |   8 +-
 ...Fix-env-empty-string-ANDROID_STORAGE.patch |   4 +-
 ...h-if-there-is-IR-HAL-is-not-declared.patch |   4 +-
 ...istent-property-to-override-the-defa.patch |  10 +-
 ...-Show-APN-Settings-for-CDMA-carriers.patch |  25 -
 ...s-so-that-it-works-even-without-qtag.patch |   4 +-
 ...-Support-samsung-Pie-and-Q-light-hal.patch |   8 +-
 ...samsung-touch-physical-and-hover-pro.patch |  16 +-
 ...erriding-the-number-of-work-profiles.patch |  32 ++
 ...-wake-up-devices-just-as-well-as-bac.patch |  14 +-
 ...ange-not-being-complete-on-Samsung-d.patch |   4 +-
 ...atch-like-behaviour-for-RRO-java-sid.patch |  34 +-
 ...otification-about-console-service-be.patch |   8 +-
 ...t-Remove-unused-SystemProperties.set.patch |   6 +-
 ...nyManager-bring-back-getNetworkClass.patch |   6 +-
 ...-add-API-annotations-for-setTelephon.patch |   6 +-
 ...tect-pick-up-sensor-so-that-an-overl.patch |   4 +-
 ...nBuiltInDisplayCutoutRectApproximati.patch |   4 +-
 ...t-Fix-backlight-control-on-Galaxy-S9.patch |   4 +-
 ...ch-long-press-power-behavior-in-AOSP.patch |  35 --
 ...of-fingerprint-cleanups-needed-on-so.patch |  12 +-
 ...ze-boot-animation-to-match-screen-si.patch |   4 +-
 ...more-FDE-methods-from-StorageManager.patch |  38 +-
 ...ngerprint-sensors-to-security-strong.patch |   4 +-
 ...SehSysInputDev-to-report-screen-stat.patch |  21 +-
 ...-constrainNitsAndBacklightArrays-and.patch |  35 +-
 ...32-Add-Mediatek-power-hints-on-touch.patch |  26 +-
 ...Detect-Moto-dynamic-hardware-feature.patch |   4 +-
 ...ateForSlotIndex-in-SubscriptionManag.patch |  40 --
 ...CallingIdentity-variant-with-both-ex.patch |   4 +-
 .../0036-Catch-NPE-in-SystemUI.patch          |   8 +-
 ...d-support-for-app-signature-spoofing.patch |  10 +-
 ...e-Samsung-Power-hal-in-libpowermanag.patch |   8 +-
 ...Asus-Samsung-recent-Xiaomi-and-RedMa.patch |  54 +--
 ...htness-slider-curve-for-some-devices.patch |   4 +-
 .../0041-Ignore-cgroup-creation-errors.patch  |  28 +-
 ...use-SW_MACHINE_COVER-rather-than-SW_.patch |  22 +-
 ...rt-Removed-IWLAN-legacy-mode-support.patch |   6 +-
 ...prop-to-use-linear-backlight-control.patch |  10 +-
 ...ix-fod-Extra-Dim-overlap-fod-overlay.patch |  37 +-
 ...-behavior-of-isValid-It-is-legal-to-.patch |   2 +-
 ...ed-to-send-a-hack-message-to-HAL-to-.patch |   6 +-
 ...n-input-with-a-display-uses-uniqueId.patch |   4 +-
 ...n-t-exist-in-O-P-so-detect-its-suppo.patch |   6 +-
 ...Samsung-system-permission-on-sensors.patch |   4 +-
 ...er-input-as-sensor-exclusively-if-th.patch |   8 +-
 ...ide-their-vibrator-HAL-behind-non-de.patch |   6 +-
 ...er-Add-support-Samsung-miscpower-HAL.patch |   4 +-
 ...008-FOD-support-for-Samsung-and-Asus.patch |  20 +-
 ...support-to-fix-broken-Mediatek-gpufr.patch |  34 +-
 ...s-static-ImsManager.updateImsService.patch |   2 +-
 ...roller-Do-not-override-default-calli.patch |   6 +-
 ...ot-call-onUssdRelease-for-Huawei-RIL.patch |   6 +-
 ...ng-too-long-to-fit-into-a-91-chars-p.patch |   6 +-
 ...ength-for-huawei-kirin-hi6250-hi3670.patch |   2 +-
 ...ward-port-support-for-forceCognitive.patch |   2 +-
 ...-Fix-NPE-with-1.0-and-1.1-CardStatus.patch |   2 +-
 ...cSlot-ignore-error-if-we-cant-print-.patch |   2 +-
 ...rt-Removed-IWLAN-legacy-mode-support.patch | 439 ------------------
 ...command-to-be-able-to-call-vendor-sp.patch |   2 +-
 ...-Fix-light-sensor-crash-on-Xiaomi-13.patch |   2 +-
 ...sung-S23-using-stock-properties-beca.patch |   2 +-
 ...-t-crash-when-there-is-no-VR-service.patch |   4 +-
 ...e-when-there-is-no-hal-but-we-believ.patch |   4 +-
 ...-fingerprint-events-they-are-expecte.patch |  10 +-
 ...ash-when-we-get-no-DeviceLockManager.patch |   4 +-
 ...ove-Do-not-validate-option-in-CA-cer.patch | 311 -------------
 ..._interface-Optionally-use-sysbta-HAL.patch |  28 --
 ...n-to-change-eSCO-Transport-Unit-Size.patch |   6 +-
 ...en-failing-to-get-real-time-priority.patch |   6 +-
 ...es-we-need-to-tell-Audio-HAL-if-we-r.patch |   6 +-
 ...o-cap-declared-le-vendor-version.-Fo.patch |   6 +-
 ...-load-bpf-programs-for-BPF-less-devi.patch |   2 +-
 ...e-UID-from-BpfMap-on-BPF-less-kernel.patch |   2 +-
 ...03-Make-the-use-of-IBpfMaps-optional.patch |   2 +-
 ...raffic-indicators-for-legacy-devices.patch |   2 +-
 ...ash-when-we-get-no-DeviceLockManager.patch |   2 +-
 .../0001-Include-vndk-v28-apex.patch          |   2 +-
 .../0001-Support-no-bpf-usecase.patch         |   2 +-
 ...ability-to-write-to-index-0-of-bpf-m.patch |   2 +-
 ...et-system-override-ro.apex.updatable.patch |   8 +-
 ...-If-Vboot2-fails-fall-back-to-Vboot1.patch |   8 +-
 ...03-Revert-Remove-support-for-AVB-1.0.patch |  34 +-
 ...eating-property-tree-if-there-is-a-c.patch |   8 +-
 ...allowed-sdcard-options-based-on-vndk.patch |   8 +-
 ...Set-dev-uinput-as-0666-to-fix-finger.patch |   8 +-
 ...t-Set-system-xbin-permissions-to-750.patch |   8 +-
 ...my-own-OTA-mechanism-going-over-data.patch |  10 +-
 ...Keep-allowing-encryptable-fstab-flag.patch |   8 +-
 ...lback-FDE-to-no-encryption-and-FDE-F.patch |   8 +-
 ...ide-adb-secure-props-so-we-dont-get-.patch |   8 +-
 ...0-kernels.-This-is-needed-because-on.patch |   8 +-
 ...chdogd-Support-pinging-two-watchdogs.patch |   8 +-
 ...d-offline-charger-fix-screen-off-3-3.patch |  14 +-
 ...n-legacy-devices-with-encryption-dis.patch |   8 +-
 ...are_mnt.-Moto-Razr-2019-look-for-fir.patch |   8 +-
 ...for-devices-without-cgroupv2-support.patch |   8 +-
 ...quota-on-old-devices-but-new-enough-.patch |   8 +-
 ...ies-custom-rc-action-prop-validation.patch |   4 +-
 ...-Bail-out-if-we-can-t-open-directory.patch |   2 +-
 .../0001-Disable-vndklite-handling.patch      |   2 +-
 ...rin-960-accept-broken-rpfilter-match.patch |   2 +-
 ...n-t-fail-on-FTP-conntracking-failing.patch |   2 +-
 .../0003-Support-no-bpf-usecase.patch         |   2 +-
 ...ase-of-cgroup-bpf-setup-fail-since-s.patch |   2 +-
 ...priority-over-NFC-config-file-rather.patch |   4 +-
 ...01-Revert-Remove-28.0-compat-support.patch |   2 +-
 .../0001-Allow-deletion-of-symlink.patch      |   4 +-
 ...o-create-facedata-shouldn-t-be-fatal.patch |   4 +-
 ...003-Don-t-unmount-rw-system.sh-binds.patch |   8 +-
 155 files changed, 851 insertions(+), 1661 deletions(-)
 create mode 100644 patches/personal/platform_device_phh_treble/0003-Add-Maintainer-Strings.patch
 create mode 100644 patches/personal/platform_frameworks_native/0001-Try-to-fallback-mCallingSid-to-getpidcon.patch
 delete mode 100644 patches/ponces/platform_device_phh_treble/0002-Dont-handle-apns.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0007-Show-APN-Settings-for-CDMA-carriers.patch
 create mode 100644 patches/trebledroid/platform_frameworks_base/0011-Always-allow-overriding-the-number-of-work-profiles.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0024-Revert-Switch-long-press-power-behavior-in-AOSP.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0034-Restore-getSimStateForSlotIndex-in-SubscriptionManag.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_opt_telephony/0011-Revert-Removed-IWLAN-legacy-mode-support.patch
 delete mode 100644 patches/trebledroid/platform_packages_apps_Settings/0004-Revert-Wi-Fi-Remove-Do-not-validate-option-in-CA-cer.patch
 delete mode 100644 patches/trebledroid/platform_packages_modules_Bluetooth/0002-audio_hal_interface-Optionally-use-sysbta-HAL.patch

diff --git a/evo.mk b/evo.mk
index 655901d..2850d65 100644
--- a/evo.mk
+++ b/evo.mk
@@ -19,3 +19,6 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
 
 PRODUCT_PACKAGES += \
     GCamGOPrebuilt-V3
+
+DEVICE_PACKAGE_OVERLAYS += \
+    device/phh/treble/overlay-evolution
diff --git a/patches/personal/platform_device_phh_treble/0003-Add-Maintainer-Strings.patch b/patches/personal/platform_device_phh_treble/0003-Add-Maintainer-Strings.patch
new file mode 100644
index 0000000..818538d
--- /dev/null
+++ b/patches/personal/platform_device_phh_treble/0003-Add-Maintainer-Strings.patch
@@ -0,0 +1,36 @@
+From 35e3408aeb50c6be66922dbdb6b2e25aa8aef8fc Mon Sep 17 00:00:00 2001
+From: ahnet-69 <syedmusicrealise@gmail.com>
+Date: Tue, 23 Jan 2024 11:52:17 +0000
+Subject: [PATCH] Add Maintainer Strings
+
+---
+ .../apps/Settings/res/values/strings.xml        | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+ create mode 100644 overlay-evolution/packages/apps/Settings/res/values/strings.xml
+
+diff --git a/overlay-evolution/packages/apps/Settings/res/values/strings.xml b/overlay-evolution/packages/apps/Settings/res/values/strings.xml
+new file mode 100644
+index 0000000..f14b444
+--- /dev/null
++++ b/overlay-evolution/packages/apps/Settings/res/values/strings.xml
+@@ -0,0 +1,17 @@
++<?xml version="1.0" encoding="utf-8"?>
++<!-- Copyright (C) 2019-2021 The Evolution X Project
++     Licensed under the Apache License, Version 2.0 (the "License");
++     you may not use this file except in compliance with the License.
++     You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
++     Unless required by applicable law or agreed to in writing, software
++     distributed under the License is distributed on an "AS IS" BASIS,
++     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++     See the License for the specific language governing permissions and
++     limitations under the License.
++-->
++<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
++
++    <string name="build_maintainer_summary">AC GSI</string>
++    <string name="build_maintainer_telegram">https://t.me/ahnetgsi</string>
++
++</resources>
+-- 
+2.34.1
+
diff --git a/patches/personal/platform_frameworks_native/0001-Try-to-fallback-mCallingSid-to-getpidcon.patch b/patches/personal/platform_frameworks_native/0001-Try-to-fallback-mCallingSid-to-getpidcon.patch
new file mode 100644
index 0000000..94f8a96
--- /dev/null
+++ b/patches/personal/platform_frameworks_native/0001-Try-to-fallback-mCallingSid-to-getpidcon.patch
@@ -0,0 +1,64 @@
+From 604b38628f5d1a562c251115bcb1393fef168100 Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Wed, 20 Oct 2021 09:39:47 -0400
+Subject: [PATCH] Try to fallback mCallingSid to getpidcon
+
+This is needed because old vendors (before April 2019 ~) don't support
+reporting SELinux context of the caller.
+This doesn't work for all processes, because it requires some additional
+SELinux permissions. At the moment, only keystore2 requires this
+
+Change-Id: I3b6c4dac9d0e20a3d66f931b283e3a535ab499cd
+---
+ libs/binder/IPCThreadState.cpp | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+diff --git a/libs/binder/IPCThreadState.cpp b/libs/binder/IPCThreadState.cpp
+index 5bf00f6263..347fbf12ca 100644
+--- a/libs/binder/IPCThreadState.cpp
++++ b/libs/binder/IPCThreadState.cpp
+@@ -35,6 +35,7 @@
+ #include <sched.h>
+ #include <signal.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <sys/ioctl.h>
+ #include <sys/resource.h>
+ #include <unistd.h>
+@@ -1400,6 +1401,25 @@ status_t IPCThreadState::executeCommand(int32_t cmd)
+             mHasExplicitIdentity = false;
+             mLastTransactionBinderFlags = tr.flags;
+ 
++            // This is recoding libselinux's getpidcon()
++            // We are in a NDK lib, so we need to keep changes to a minimum
++            bool allocatedSid = false;
++            if(mCallingSid == nullptr && mCallingPid != 0) {
++                char buf[4096];
++                char *path = NULL;
++                (void)asprintf(&path, "/proc/%d/attr/current", mCallingPid);
++                int fd = open(path, O_RDONLY | O_CLOEXEC);
++                if(fd != -1) {
++                    int readRet = read(fd, buf, sizeof(buf)-1);
++                    if(readRet != -1) {
++                        buf[readRet] = 0;
++                        mCallingSid = strdup(buf);
++                        allocatedSid = true;
++                    }
++                    close(fd);
++                }
++            }
++
+             // ALOGI(">>>> TRANSACT from pid %d sid %s uid %d\n", mCallingPid,
+             //    (mCallingSid ? mCallingSid : "<N/A>"), mCallingUid);
+ 
+@@ -1471,6 +1491,7 @@ status_t IPCThreadState::executeCommand(int32_t cmd)
+ 
+             mServingStackPointer = origServingStackPointer;
+             mCallingPid = origPid;
++            if(allocatedSid) free((void*)mCallingSid);
+             mCallingSid = origSid;
+             mCallingUid = origUid;
+             mHasExplicitIdentity = origHasExplicitIdentity;
+-- 
+2.34.1
+
diff --git a/patches/personal/platform_vendor_gms/0001-Remove-PlayAutoInstallConfig.patch b/patches/personal/platform_vendor_gms/0001-Remove-PlayAutoInstallConfig.patch
index 40c6a3d..d53259b 100644
--- a/patches/personal/platform_vendor_gms/0001-Remove-PlayAutoInstallConfig.patch
+++ b/patches/personal/platform_vendor_gms/0001-Remove-PlayAutoInstallConfig.patch
@@ -1,4 +1,4 @@
-From 9f9941cb9c27985ba24e72c4185792f82a15c9e7 Mon Sep 17 00:00:00 2001
+From 4ae5f1cfb2cefbdf861c754b67141aba781684f1 Mon Sep 17 00:00:00 2001
 From: ahnet-69 <syedmusicrealise@gmail.com>
 Date: Sun, 12 Nov 2023 14:00:44 +0500
 Subject: [PATCH] Remove PlayAutoInstallConfig
@@ -9,26 +9,26 @@ This is shipped with OEM skins and is used to install bloatware from the playsto
  gms_full_tablet_wifionly.mk                   |   1 -
  gms_mini.mk                                   |   1 -
  gms_pico.mk                                   |   1 -
- .../apps/PlayAutoInstallConfig/Android.mk     |  32 ------------------
+ .../apps/PlayAutoInstallConfig/Android.mk     |  30 ------------------
  .../PlayAutoInstallConfig.apk                 | Bin 16861 -> 0 bytes
- 6 files changed, 36 deletions(-)
+ 6 files changed, 34 deletions(-)
  delete mode 100644 product/packages/apps/PlayAutoInstallConfig/Android.mk
  delete mode 100644 product/packages/apps/PlayAutoInstallConfig/PlayAutoInstallConfig.apk
 
 diff --git a/gms_full.mk b/gms_full.mk
-index 51dca36..9d425e4 100644
+index 91ba51d..e555a75 100644
 --- a/gms_full.mk
 +++ b/gms_full.mk
-@@ -42,7 +42,6 @@ PRODUCT_PACKAGES += \
+@@ -41,7 +41,6 @@ PRODUCT_PACKAGES += \
      PixelThemesStub \
      PixelThemesStub2022_and_newer \
      PixelWallpapers2023 \
 -    PlayAutoInstallConfig \
+     PrebuiltBugle \
      PrebuiltDeskClockGoogle \
      PrebuiltGmail \
-     SoundAmplifierPrebuilt \
 diff --git a/gms_full_tablet_wifionly.mk b/gms_full_tablet_wifionly.mk
-index 81a12b3..3f5ca95 100644
+index 1a773bf..7cebfb6 100644
 --- a/gms_full_tablet_wifionly.mk
 +++ b/gms_full_tablet_wifionly.mk
 @@ -42,7 +42,6 @@ PRODUCT_PACKAGES += \
@@ -40,7 +40,7 @@ index 81a12b3..3f5ca95 100644
      PrebuiltDeskClockGoogle \
      PrebuiltGmail \
 diff --git a/gms_mini.mk b/gms_mini.mk
-index 9f991d3..3dc6a57 100644
+index b991969..507f010 100644
 --- a/gms_mini.mk
 +++ b/gms_mini.mk
 @@ -35,7 +35,6 @@ PRODUCT_PACKAGES += \
@@ -48,11 +48,11 @@ index 9f991d3..3dc6a57 100644
      PixelThemesStub \
      PixelThemesStub2022_and_newer \
 -    PlayAutoInstallConfig \
+     PrebuiltBugle \
      PrebuiltDeskClockGoogle \
      SoundPickerPrebuilt \
-     TrichromeLibrary-Stub \
 diff --git a/gms_pico.mk b/gms_pico.mk
-index 22e1ac6..af09a11 100644
+index 0d7a1a1..38e8b87 100644
 --- a/gms_pico.mk
 +++ b/gms_pico.mk
 @@ -34,7 +34,6 @@ PRODUCT_PACKAGES += \
@@ -61,14 +61,14 @@ index 22e1ac6..af09a11 100644
      PixelThemesStub2022_and_newer \
 -    PlayAutoInstallConfig \
      PrebuiltDeskClockGoogle \
+     PrebuiltBugle \
      SoundPickerPrebuilt \
-     TrichromeLibrary-Stub \
 diff --git a/product/packages/apps/PlayAutoInstallConfig/Android.mk b/product/packages/apps/PlayAutoInstallConfig/Android.mk
 deleted file mode 100644
-index 0bec1a3..0000000
+index fe1fd90..0000000
 --- a/product/packages/apps/PlayAutoInstallConfig/Android.mk
 +++ /dev/null
-@@ -1,32 +0,0 @@
+@@ -1,30 +0,0 @@
 -#
 -# Copyright (C) 2018-2019 The Google Pixel3ROM Project
 -# Copyright (C) 2020 Raphielscape LLC. and Haruka LLC.
@@ -98,180 +98,178 @@ index 0bec1a3..0000000
 -LOCAL_MODULE_CLASS := APPS
 -LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 -LOCAL_MULTILIB := 64
--LOCAL_ENFORCE_USES_LIBRARIES := false
--LOCAL_DEX_PREOPT := false
 -include $(BUILD_PREBUILT)
 diff --git a/product/packages/apps/PlayAutoInstallConfig/PlayAutoInstallConfig.apk b/product/packages/apps/PlayAutoInstallConfig/PlayAutoInstallConfig.apk
 deleted file mode 100644
-index 9e32de758b190e50774d3ff040f56c20aa754c85..0000000000000000000000000000000000000000
+index 72d2d4d89cce93b6c9549aaaba355af9f23baadd..0000000000000000000000000000000000000000
 GIT binary patch
 literal 0
 HcmV?d00001
 
 literal 16861
-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
-A!vFvP
+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
+Aj{pDw
 
 -- 
-2.40.1
+2.34.1
 
diff --git a/patches/ponces/platform_device_phh_treble/0002-Dont-handle-apns.patch b/patches/ponces/platform_device_phh_treble/0002-Dont-handle-apns.patch
deleted file mode 100644
index 3d78946..0000000
--- a/patches/ponces/platform_device_phh_treble/0002-Dont-handle-apns.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 1e5aef82a995e0244b3eb084fca25c7f1eedc324 Mon Sep 17 00:00:00 2001
-From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
-Date: Sun, 27 Jun 2021 15:37:56 +0000
-Subject: [PATCH 1/6] treble: Don't handle apns-conf
-
-PE has its own well-maintained copy
-
-Change-Id: If568101f21098c75879af8b9b6141af179566960
-
----
- base-pre.mk | 3 ---
- base.mk     | 4 ----
- 2 files changed, 7 deletions(-)
-
-diff --git a/base-pre.mk b/base-pre.mk
-index 6a317e4..e69de29 100644
---- a/base-pre.mk
-+++ b/base-pre.mk
-@@ -1,3 +0,0 @@
--#Use a more decent APN config
--PRODUCT_COPY_FILES += \
--	device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
-diff --git a/base.mk b/base.mk
-index 348799e..15b5104 100644
---- a/base.mk
-+++ b/base.mk
-@@ -17,10 +17,6 @@ PRODUCT_COPY_FILES += \
-     device/phh/treble/bluetooth/audio/config/sysbta_audio_policy_configuration.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysbta_audio_policy_configuration.xml \
-     device/phh/treble/bluetooth/audio/config/sysbta_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysbta_audio_policy_configuration_7_0.xml
- 
--#Use a more decent APN config
--PRODUCT_COPY_FILES += \
--	device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
--
- SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/phh/treble/sepolicy
- PRODUCT_PACKAGE_OVERLAYS += device/phh/treble/overlay
- 
--- 
-2.39.2
-
diff --git a/patches/trebledroid/platform_bionic/0001-Disable-vndklite-handling.patch b/patches/trebledroid/platform_bionic/0001-Disable-vndklite-handling.patch
index 3828e83..fab5fc4 100644
--- a/patches/trebledroid/platform_bionic/0001-Disable-vndklite-handling.patch
+++ b/patches/trebledroid/platform_bionic/0001-Disable-vndklite-handling.patch
@@ -1,4 +1,4 @@
-From cb9d1aaacaa105c20551952ead0ad7a49408efce Mon Sep 17 00:00:00 2001
+From da3e4e28f1087493239cd8991e5cfa2ff576e22f Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 27 Oct 2021 14:39:29 -0400
 Subject: [PATCH 1/2] Disable vndklite handling
diff --git a/patches/trebledroid/platform_bionic/0002-Add-new-mechanism-to-fake-vendor-props-on-a-per-proc.patch b/patches/trebledroid/platform_bionic/0002-Add-new-mechanism-to-fake-vendor-props-on-a-per-proc.patch
index a212392..d81582e 100644
--- a/patches/trebledroid/platform_bionic/0002-Add-new-mechanism-to-fake-vendor-props-on-a-per-proc.patch
+++ b/patches/trebledroid/platform_bionic/0002-Add-new-mechanism-to-fake-vendor-props-on-a-per-proc.patch
@@ -1,4 +1,4 @@
-From ab1289090a65808ee3fbbeb40b0a77e91c1a6aab Mon Sep 17 00:00:00 2001
+From 79369fc64d5ccad0b668c270b25276ec5a4b7d2d Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 19 Feb 2022 08:20:25 -0500
 Subject: [PATCH 2/2] Add new mechanism to fake vendor props on a per-process
diff --git a/patches/trebledroid/platform_bootable_recovery/0001-Don-t-reboot-if-we-couldn-t-get-bootctrl.patch b/patches/trebledroid/platform_bootable_recovery/0001-Don-t-reboot-if-we-couldn-t-get-bootctrl.patch
index c8c91fa..c00be04 100644
--- a/patches/trebledroid/platform_bootable_recovery/0001-Don-t-reboot-if-we-couldn-t-get-bootctrl.patch
+++ b/patches/trebledroid/platform_bootable_recovery/0001-Don-t-reboot-if-we-couldn-t-get-bootctrl.patch
@@ -1,4 +1,4 @@
-From 6b118b279359ded66d661bd5504cfa8a9759b4e2 Mon Sep 17 00:00:00 2001
+From 9805c3d5fd0f23b9d914ef66243d65d9c7a99e4d Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 12 Sep 2019 20:31:07 +0200
 Subject: [PATCH] Don't reboot if we couldn't get bootctrl
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 6350488..82177b1 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
@@ -1,7 +1,7 @@
-From 7914a65a226e6e9677e869b221aa469a5c5e13c0 Mon Sep 17 00:00:00 2001
+From 59ed123b14290b2deb13fe4164b8793142fdce8d Mon Sep 17 00:00:00 2001
 From: sooti <sooti85@gmail.com>
 Date: Tue, 12 Oct 2021 14:32:52 +0300
-Subject: [PATCH 1/5] build: remove emulator crap from GSI
+Subject: [PATCH 1/6] build: remove emulator crap from GSI
 
 Change-Id: Id45f3ff1d31e3d4492f956e68a1eb4b2fb82ce63
 ---
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 b719410..c4a2c86 100644
--- a/patches/trebledroid/platform_build/0002-build-Bypass-vendor-calls.patch
+++ b/patches/trebledroid/platform_build/0002-build-Bypass-vendor-calls.patch
@@ -1,7 +1,7 @@
-From 5e102101733669fa99ed8a53f2053f8576d917d8 Mon Sep 17 00:00:00 2001
+From 4e4a4cce4742c97838ca5811bf49e2cce7de81a0 Mon Sep 17 00:00:00 2001
 From: Alberto Ponces <ponces26@gmail.com>
 Date: Mon, 18 Oct 2021 17:20:18 +0100
-Subject: [PATCH 2/5] build: Bypass vendor calls
+Subject: [PATCH 2/6] build: Bypass vendor calls
 
 Change-Id: I69830d6264356dadd7b037553a899a4eb3d211f1
 ---
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 5a0c1c2..20314d4 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
@@ -1,7 +1,7 @@
-From 4bfcaea596cc197b184691accda8d73efc752558 Mon Sep 17 00:00:00 2001
+From 565248347f94ede02f0c4c33444e9d73926dc754 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Wed, 8 Dec 2021 07:04:53 +0000
-Subject: [PATCH 3/5] Remove init.vndk-nodef.rc
+Subject: [PATCH 3/6] Remove init.vndk-nodef.rc
 
 This partially reverts "Deprecate VNDK-lite support from Legacy GSI".
 
@@ -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 9d102ea515..ec42b2ce77 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 680b622..5461c1b 100644
--- a/patches/trebledroid/platform_build/0004-build-Remove-llkd.patch
+++ b/patches/trebledroid/platform_build/0004-build-Remove-llkd.patch
@@ -1,7 +1,7 @@
-From b69d9d1c76a823d72a1c14128285a47f64e073be Mon Sep 17 00:00:00 2001
+From b05ec5f9d97ea7b30bb7d58ca5f92c03a5077d8d Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Thu, 14 Oct 2021 12:20:52 +0000
-Subject: [PATCH 4/5] build: Remove llkd
+Subject: [PATCH 4/6] build: Remove llkd
 
 ...until someone figures out why Genshin Impact fails it
 
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 4c37892..cf4cccc 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
@@ -1,7 +1,7 @@
-From 67dd639c252c6337e9ad361c364a8f799004f089 Mon Sep 17 00:00:00 2001
+From b060c1658805dd77490f070a2ceaf5ade39895fb Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 6 Oct 2023 19:11:22 -0400
-Subject: [PATCH 5/5] Include vndk v28 sepolicy support
+Subject: [PATCH 5/6] Include vndk v28 sepolicy support
 
 ---
  core/config.mk | 1 +
diff --git a/patches/trebledroid/platform_external_selinux/0001-Increase-default-log_level-to-get-actual-selinux-err.patch b/patches/trebledroid/platform_external_selinux/0001-Increase-default-log_level-to-get-actual-selinux-err.patch
index 153a78a..6afcb0e 100644
--- a/patches/trebledroid/platform_external_selinux/0001-Increase-default-log_level-to-get-actual-selinux-err.patch
+++ b/patches/trebledroid/platform_external_selinux/0001-Increase-default-log_level-to-get-actual-selinux-err.patch
@@ -1,4 +1,4 @@
-From aa0cbcaebbaf0886abfd6bd97232798c7cb5be9b Mon Sep 17 00:00:00 2001
+From 64cf79e704435ac07f5a35422be1a5a782ebfa81 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 01/10] Increase default log_level to get actual selinux error
diff --git a/patches/trebledroid/platform_external_selinux/0002-Revert-libsepol-Make-an-unknown-permission-an-error-.patch b/patches/trebledroid/platform_external_selinux/0002-Revert-libsepol-Make-an-unknown-permission-an-error-.patch
index f89e5ba..25bd852 100644
--- a/patches/trebledroid/platform_external_selinux/0002-Revert-libsepol-Make-an-unknown-permission-an-error-.patch
+++ b/patches/trebledroid/platform_external_selinux/0002-Revert-libsepol-Make-an-unknown-permission-an-error-.patch
@@ -1,4 +1,4 @@
-From a88a863bdd7cee7e8d8a681d7f32d9ff6d0bc746 Mon Sep 17 00:00:00 2001
+From c0a820a83a2b9646e2c833d4ca9529deec59fd99 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 02/10] Revert "libsepol: Make an unknown permission an error
diff --git a/patches/trebledroid/platform_external_selinux/0003-Workaround-device-phh-treble-conflict-with-SELinux-p.patch b/patches/trebledroid/platform_external_selinux/0003-Workaround-device-phh-treble-conflict-with-SELinux-p.patch
index 2587ba3..ea2952d 100644
--- a/patches/trebledroid/platform_external_selinux/0003-Workaround-device-phh-treble-conflict-with-SELinux-p.patch
+++ b/patches/trebledroid/platform_external_selinux/0003-Workaround-device-phh-treble-conflict-with-SELinux-p.patch
@@ -1,4 +1,4 @@
-From 01034f4009d29c401d5f007f76044482c0ed8bd0 Mon Sep 17 00:00:00 2001
+From 19b12aeceee2ff520d952093eb564a5a9a6cb8b3 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 03/10] Workaround device/phh/treble conflict with SELinux
diff --git a/patches/trebledroid/platform_external_selinux/0004-Allow-devices-virtual-block-genfscon-conflict-seen-o.patch b/patches/trebledroid/platform_external_selinux/0004-Allow-devices-virtual-block-genfscon-conflict-seen-o.patch
index 4ee6ec7..280c99e 100644
--- a/patches/trebledroid/platform_external_selinux/0004-Allow-devices-virtual-block-genfscon-conflict-seen-o.patch
+++ b/patches/trebledroid/platform_external_selinux/0004-Allow-devices-virtual-block-genfscon-conflict-seen-o.patch
@@ -1,4 +1,4 @@
-From 81fa34b00d80113ed4015b99dab093826c1acb89 Mon Sep 17 00:00:00 2001
+From cd03927329ace671e78faf24458c894da012c012 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 04/10] Allow /devices/virtual/block/ genfscon conflict (seen
diff --git a/patches/trebledroid/platform_external_selinux/0005-if-service-is-rcs-accept-conflict.-Seen-on-Moto-E5.patch b/patches/trebledroid/platform_external_selinux/0005-if-service-is-rcs-accept-conflict.-Seen-on-Moto-E5.patch
index bbbc4da..1922731 100644
--- a/patches/trebledroid/platform_external_selinux/0005-if-service-is-rcs-accept-conflict.-Seen-on-Moto-E5.patch
+++ b/patches/trebledroid/platform_external_selinux/0005-if-service-is-rcs-accept-conflict.-Seen-on-Moto-E5.patch
@@ -1,4 +1,4 @@
-From 0bc7791b9f1423f70c17b68dd7fb9d672b2bb924 Mon Sep 17 00:00:00 2001
+From c2be8303c21b99a75bb9d4f3e484b670c54c1dab 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 05/10] if service is "rcs", accept conflict. Seen on Moto E5
diff --git a/patches/trebledroid/platform_external_selinux/0006-Allow-mismatches-of-exfat-genfscon.patch b/patches/trebledroid/platform_external_selinux/0006-Allow-mismatches-of-exfat-genfscon.patch
index 90d8b43..e0ed169 100644
--- a/patches/trebledroid/platform_external_selinux/0006-Allow-mismatches-of-exfat-genfscon.patch
+++ b/patches/trebledroid/platform_external_selinux/0006-Allow-mismatches-of-exfat-genfscon.patch
@@ -1,4 +1,4 @@
-From c4100e160008273781973b2098267e7d343b8956 Mon Sep 17 00:00:00 2001
+From 7aea91b1e670f545cb86167e1b1473b84af29eac 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 06/10] Allow mismatches of exfat genfscon
diff --git a/patches/trebledroid/platform_external_selinux/0007-Fix-boot-on-Moto-devices-using-unknown-class.patch b/patches/trebledroid/platform_external_selinux/0007-Fix-boot-on-Moto-devices-using-unknown-class.patch
index 0f21ff9..54c88f9 100644
--- a/patches/trebledroid/platform_external_selinux/0007-Fix-boot-on-Moto-devices-using-unknown-class.patch
+++ b/patches/trebledroid/platform_external_selinux/0007-Fix-boot-on-Moto-devices-using-unknown-class.patch
@@ -1,4 +1,4 @@
-From 4c0afb19a2170e2cd9c4e2a1fdb48cdb16d4100e Mon Sep 17 00:00:00 2001
+From 33bd3585d77cda0b7892f30be14d3721188d5424 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 07/10] Fix boot on Moto devices using unknown class
diff --git a/patches/trebledroid/platform_external_selinux/0008-Improve-SELinux-policy-workaround-on-device-phh-treb.patch b/patches/trebledroid/platform_external_selinux/0008-Improve-SELinux-policy-workaround-on-device-phh-treb.patch
index 88ab3b3..ab0442b 100644
--- a/patches/trebledroid/platform_external_selinux/0008-Improve-SELinux-policy-workaround-on-device-phh-treb.patch
+++ b/patches/trebledroid/platform_external_selinux/0008-Improve-SELinux-policy-workaround-on-device-phh-treb.patch
@@ -1,4 +1,4 @@
-From 18cdd4e9ff37377b80f837c92026f1ce3514d074 Mon Sep 17 00:00:00 2001
+From 6a69271d74ca04fc4edb55a82a910e3210ddafbd Mon Sep 17 00:00:00 2001
 From: ponces <ponces26@gmail.com>
 Date: Mon, 7 Nov 2022 16:14:20 +0000
 Subject: [PATCH 08/10] Improve SELinux policy workaround on device/phh/treble
diff --git a/patches/trebledroid/platform_external_selinux/0009-Allow-sys-vm-watermark_scale_factor-conflict-seen-on.patch b/patches/trebledroid/platform_external_selinux/0009-Allow-sys-vm-watermark_scale_factor-conflict-seen-on.patch
index eeefa34..7991e23 100644
--- a/patches/trebledroid/platform_external_selinux/0009-Allow-sys-vm-watermark_scale_factor-conflict-seen-on.patch
+++ b/patches/trebledroid/platform_external_selinux/0009-Allow-sys-vm-watermark_scale_factor-conflict-seen-on.patch
@@ -1,4 +1,4 @@
-From e62c978dbf5f214f392355a0d111adc772f10b60 Mon Sep 17 00:00:00 2001
+From 8cd620d035d584906d4a7840ffe813fed9b456f9 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 09/10] Allow /sys/vm/watermark_scale_factor conflict -- seen
diff --git a/patches/trebledroid/platform_external_selinux/0010-Allow-conflict-on-fuseblk.patch b/patches/trebledroid/platform_external_selinux/0010-Allow-conflict-on-fuseblk.patch
index 452fd3f..7cab724 100644
--- a/patches/trebledroid/platform_external_selinux/0010-Allow-conflict-on-fuseblk.patch
+++ b/patches/trebledroid/platform_external_selinux/0010-Allow-conflict-on-fuseblk.patch
@@ -1,4 +1,4 @@
-From d69b637d22bd02e44ece4e68e53b9151dfda8247 Mon Sep 17 00:00:00 2001
+From b85e5400f0d5c46ffe96fb4b40e3c22509a40c17 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 6 Oct 2023 08:49:59 -0400
 Subject: [PATCH 10/10] Allow conflict on fuseblk
diff --git a/patches/trebledroid/platform_frameworks_av/0001-APM-Restore-S-R-and-Q-behavior-respectively-for-tele.patch b/patches/trebledroid/platform_frameworks_av/0001-APM-Restore-S-R-and-Q-behavior-respectively-for-tele.patch
index f2f3d7f..480aca5 100644
--- a/patches/trebledroid/platform_frameworks_av/0001-APM-Restore-S-R-and-Q-behavior-respectively-for-tele.patch
+++ b/patches/trebledroid/platform_frameworks_av/0001-APM-Restore-S-R-and-Q-behavior-respectively-for-tele.patch
@@ -1,7 +1,7 @@
-From 22e5fe9453c87c2d7479a8c3da929b1b60eea764 Mon Sep 17 00:00:00 2001
+From 856407e979f3e44e686e69bddd5347b37937c847 Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Thu, 18 Aug 2022 15:44:46 -0400
-Subject: [PATCH 01/21] APM: Restore S, R and Q behavior respectively for
+Subject: [PATCH 01/23] APM: Restore S, R and Q behavior respectively for
  telephony audio
 
 This conditionally reverts part of b2e5cb (T), 51c9cc (S) and afd4ce (R)
@@ -36,7 +36,7 @@ Change-Id: I56d36d2aef4319935cb88a3e4771b23c6d5b2145
  2 files changed, 147 insertions(+), 62 deletions(-)
 
 diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
-index f093e685ba..9a90009f9e 100644
+index b3c68b58d3..470317cb3d 100644
 --- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
 +++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
 @@ -689,6 +689,17 @@ status_t AudioPolicyManager::updateCallRoutingInternal(
@@ -148,7 +148,7 @@ index f093e685ba..9a90009f9e 100644
  bool AudioPolicyManager::isDeviceOfModule(
          const sp<DeviceDescriptor>& devDesc, const char *moduleId) const {
      sp<HwModule> module = mHwModules.getModuleFromName(moduleId);
-@@ -4958,83 +5022,101 @@ status_t AudioPolicyManager::createAudioPatchInternal(const struct audio_patch *
+@@ -5034,83 +5098,101 @@ status_t AudioPolicyManager::createAudioPatchInternal(const struct audio_patch *
                  // in config XML to reach the sink so that is can be declared as available.
                  audio_io_handle_t output = AUDIO_IO_HANDLE_NONE;
                  sp<SwAudioOutputDescriptor> outputDesc;
@@ -308,10 +308,10 @@ index f093e685ba..9a90009f9e 100644
                                      AUDIO_STREAM_PATCH;
                          patchBuilder.addSource(srcMixPortConfig);
 diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.h b/services/audiopolicy/managerdefault/AudioPolicyManager.h
-index 88bafefdb1..188b5732b3 100644
+index 863c785b08..41930138c4 100644
 --- a/services/audiopolicy/managerdefault/AudioPolicyManager.h
 +++ b/services/audiopolicy/managerdefault/AudioPolicyManager.h
-@@ -953,6 +953,9 @@ protected:
+@@ -957,6 +957,9 @@ protected:
  
          SoundTriggerSessionCollection mSoundTriggerSessions;
  
diff --git a/patches/trebledroid/platform_frameworks_av/0002-Fix-BT-in-call-on-CAF-devices.patch b/patches/trebledroid/platform_frameworks_av/0002-Fix-BT-in-call-on-CAF-devices.patch
index e65ff4c..836ff5a 100644
--- a/patches/trebledroid/platform_frameworks_av/0002-Fix-BT-in-call-on-CAF-devices.patch
+++ b/patches/trebledroid/platform_frameworks_av/0002-Fix-BT-in-call-on-CAF-devices.patch
@@ -1,7 +1,7 @@
-From 78d9273cc66e2e8760ffd278b16feeb92b311adf Mon Sep 17 00:00:00 2001
+From 12aae4541dea7fef7d80a5e3dc6a340abc3bef24 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 5 Aug 2019 18:09:50 +0200
-Subject: [PATCH 02/21] Fix BT in-call on CAF devices
+Subject: [PATCH 02/23] Fix BT in-call on CAF devices
 
 See https://github.com/phhusson/treble_experimentations/issues/374
 
diff --git a/patches/trebledroid/platform_frameworks_av/0003-Add-partial-cam-id-is-hardcoded-support-for-Asus-ZF6.patch b/patches/trebledroid/platform_frameworks_av/0003-Add-partial-cam-id-is-hardcoded-support-for-Asus-ZF6.patch
index af0ea5a..38b0445 100644
--- a/patches/trebledroid/platform_frameworks_av/0003-Add-partial-cam-id-is-hardcoded-support-for-Asus-ZF6.patch
+++ b/patches/trebledroid/platform_frameworks_av/0003-Add-partial-cam-id-is-hardcoded-support-for-Asus-ZF6.patch
@@ -1,7 +1,7 @@
-From 9cfec7e7c71763ab2caf4910c0598b8ed47dfb29 Mon Sep 17 00:00:00 2001
+From 482b1394d851a4996fa7bab8c2801f70a0adf6ab Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 1 Oct 2019 13:35:49 +0200
-Subject: [PATCH 03/21] Add (partial, cam id is hardcoded) support for Asus ZF6
+Subject: [PATCH 03/23] Add (partial, cam id is hardcoded) support for Asus ZF6
  motor camera
 
 Change-Id: Iea6e1370780a1d16f728748d1d948d092532d8fe
@@ -11,7 +11,7 @@ Change-Id: Iea6e1370780a1d16f728748d1d948d092532d8fe
  2 files changed, 29 insertions(+)
 
 diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
-index 668a51ae6d..a18425e6b8 100644
+index ebe424ec25..ac1ba38db9 100644
 --- a/services/camera/libcameraservice/CameraService.cpp
 +++ b/services/camera/libcameraservice/CameraService.cpp
 @@ -26,6 +26,7 @@
@@ -30,7 +30,7 @@ index 668a51ae6d..a18425e6b8 100644
          mCameraServiceProxyWrapper(cameraServiceProxyWrapper == nullptr ?
                  std::make_shared<CameraServiceProxyWrapper>() : cameraServiceProxyWrapper),
          mEventLog(DEFAULT_EVENT_LOG_LENGTH),
-@@ -2154,6 +2156,7 @@ Status CameraService::connectHelper(const sp<CALLBACK>& cameraCb, const String8&
+@@ -2344,6 +2346,7 @@ Status CameraService::connectHelper(const sp<CALLBACK>& cameraCb, const String8&
              mServiceLock.lock();
          } else {
              // Otherwise, add client to active clients list
@@ -38,7 +38,7 @@ index 668a51ae6d..a18425e6b8 100644
              finishConnectLocked(client, partial, oomScoreOffset, systemNativeClient);
          }
  
-@@ -2278,6 +2281,27 @@ status_t CameraService::addOfflineClient(String8 cameraId, sp<BasicClient> offli
+@@ -2468,6 +2471,27 @@ status_t CameraService::addOfflineClient(String8 cameraId, sp<BasicClient> offli
      return OK;
  }
  
@@ -63,10 +63,10 @@ index 668a51ae6d..a18425e6b8 100644
 +    }
 +}
 +
- Status CameraService::turnOnTorchWithStrengthLevel(const String16& cameraId, int32_t torchStrength,
+ Status CameraService::turnOnTorchWithStrengthLevel(const String16& unresolvedCameraId,
+         int32_t torchStrength,
          const sp<IBinder>& clientBinder) {
-     Mutex::Autolock lock(mServiceLock);
-@@ -3539,6 +3563,8 @@ binder::Status CameraService::BasicClient::disconnect() {
+@@ -3733,6 +3757,8 @@ binder::Status CameraService::BasicClient::disconnect() {
      }
      mDisconnected = true;
  
@@ -76,10 +76,10 @@ index 668a51ae6d..a18425e6b8 100644
      sCameraService->logDisconnected(mCameraIdStr, mClientPid, String8(mClientPackageName));
      sCameraService->mCameraProviderManager->removeRef(CameraProviderManager::DeviceMode::CAMERA,
 diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h
-index 3214d4c475..69e189d844 100644
+index 208138f4ab..4ac9362621 100644
 --- a/services/camera/libcameraservice/CameraService.h
 +++ b/services/camera/libcameraservice/CameraService.h
-@@ -244,6 +244,9 @@ public:
+@@ -252,6 +252,9 @@ public:
      // Register an offline client for a given active camera id
      status_t addOfflineClient(String8 cameraId, sp<BasicClient> offlineClient);
  
diff --git a/patches/trebledroid/platform_frameworks_av/0006-audiopolicy-try-again-with-trimmed-audio-port-name-i.patch b/patches/trebledroid/platform_frameworks_av/0006-audiopolicy-try-again-with-trimmed-audio-port-name-i.patch
index 7237c16..5d0fe92 100644
--- a/patches/trebledroid/platform_frameworks_av/0006-audiopolicy-try-again-with-trimmed-audio-port-name-i.patch
+++ b/patches/trebledroid/platform_frameworks_av/0006-audiopolicy-try-again-with-trimmed-audio-port-name-i.patch
@@ -1,7 +1,7 @@
-From 3feedb8b6d853c538ad2cb64081ae0eec5c88e33 Mon Sep 17 00:00:00 2001
+From 0ec7a28cd66c506507eac618ab21115a34ae3427 Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Thu, 23 Jan 2020 11:13:43 +0800
-Subject: [PATCH 06/21] audiopolicy: try again with trimmed audio port name if
+Subject: [PATCH 06/23] audiopolicy: try again with trimmed audio port name if
  not found
 
 * In Spreadtrum BSP, some audio routes may contain ports with extra
diff --git a/patches/trebledroid/platform_frameworks_av/0007-camera-Implement-property-to-override-default-camera.patch b/patches/trebledroid/platform_frameworks_av/0007-camera-Implement-property-to-override-default-camera.patch
index d2c3753..097eb3a 100644
--- a/patches/trebledroid/platform_frameworks_av/0007-camera-Implement-property-to-override-default-camera.patch
+++ b/patches/trebledroid/platform_frameworks_av/0007-camera-Implement-property-to-override-default-camera.patch
@@ -1,7 +1,7 @@
-From 111915f4efcfc83d0869606d9610f430eaa180ea Mon Sep 17 00:00:00 2001
+From d9980880c7cf143da72bf2617a318f465757af1d Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Wed, 1 Jun 2022 16:56:46 -0400
-Subject: [PATCH 07/21] camera: Implement property to override default camera
+Subject: [PATCH 07/23] camera: Implement property to override default camera
 
 Complement to the frameworks/base patch.
 
diff --git a/patches/trebledroid/platform_frameworks_av/0008-There-are-three-SCO-devices.-Fallback-from-one-to-th.patch b/patches/trebledroid/platform_frameworks_av/0008-There-are-three-SCO-devices.-Fallback-from-one-to-th.patch
index deadc43..99faab4 100644
--- a/patches/trebledroid/platform_frameworks_av/0008-There-are-three-SCO-devices.-Fallback-from-one-to-th.patch
+++ b/patches/trebledroid/platform_frameworks_av/0008-There-are-three-SCO-devices.-Fallback-from-one-to-th.patch
@@ -1,7 +1,7 @@
-From 45bdf7575551dc1e2d97624c3a0c8d4dd6fda1d0 Mon Sep 17 00:00:00 2001
+From ac28c8dc5eea5cbab3ed30e6fab47f9c64af2366 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 13 Apr 2020 21:01:16 +0200
-Subject: [PATCH 08/21] There are three SCO devices. Fallback from one to the
+Subject: [PATCH 08/23] There are three SCO devices. Fallback from one to the
  others if needed
 
 Change-Id: I414dcb6b154855c00cb8520b23dc1069827864b2
@@ -10,10 +10,10 @@ Change-Id: I414dcb6b154855c00cb8520b23dc1069827864b2
  1 file changed, 21 insertions(+)
 
 diff --git a/services/audiopolicy/common/managerdefinitions/src/HwModule.cpp b/services/audiopolicy/common/managerdefinitions/src/HwModule.cpp
-index 418b7ebe88..a97f76be59 100644
+index 5f14ee4623..166ab7acbb 100644
 --- a/services/audiopolicy/common/managerdefinitions/src/HwModule.cpp
 +++ b/services/audiopolicy/common/managerdefinitions/src/HwModule.cpp
-@@ -311,6 +311,27 @@ sp<HwModule> HwModuleCollection::getModuleForDeviceType(audio_devices_t type,
+@@ -318,6 +318,27 @@ sp<HwModule> HwModuleCollection::getModuleForDeviceType(audio_devices_t type,
              }
          }
      }
diff --git a/patches/trebledroid/platform_frameworks_av/0009-Add-persist.sys.phh.samsung.camera_ids-property-to-a.patch b/patches/trebledroid/platform_frameworks_av/0009-Add-persist.sys.phh.samsung.camera_ids-property-to-a.patch
index fd4f876..3368b99 100644
--- a/patches/trebledroid/platform_frameworks_av/0009-Add-persist.sys.phh.samsung.camera_ids-property-to-a.patch
+++ b/patches/trebledroid/platform_frameworks_av/0009-Add-persist.sys.phh.samsung.camera_ids-property-to-a.patch
@@ -1,7 +1,7 @@
-From 84a0b30b1e7c0aca15c76560349ccc64eafca25c Mon Sep 17 00:00:00 2001
+From c27dc68a363c13c603743a363dbb0715d1b5e216 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 14 May 2020 19:54:55 +0200
-Subject: [PATCH 09/21] Add persist.sys.phh.samsung.camera_ids property to
+Subject: [PATCH 09/23] Add persist.sys.phh.samsung.camera_ids property to
  access hidden Samsung cameras
 
 Change-Id: I2c7bf535272acc28ed2277e96c78ddd28a0b4593
diff --git a/patches/trebledroid/platform_frameworks_av/0010-Add-a-property-to-force-camera-timestamp-source.patch b/patches/trebledroid/platform_frameworks_av/0010-Add-a-property-to-force-camera-timestamp-source.patch
index 73d6a47..0365f51 100644
--- a/patches/trebledroid/platform_frameworks_av/0010-Add-a-property-to-force-camera-timestamp-source.patch
+++ b/patches/trebledroid/platform_frameworks_av/0010-Add-a-property-to-force-camera-timestamp-source.patch
@@ -1,7 +1,7 @@
-From aed8d42599ec27f307fa4a6faf040304d8b46992 Mon Sep 17 00:00:00 2001
+From 6a869eb01235ad946012b8a91f6f2562e9b361f3 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 19 May 2020 14:01:14 +0200
-Subject: [PATCH 10/21] Add a property to force camera timestamp source
+Subject: [PATCH 10/23] Add a property to force camera timestamp source
 
 Some devices wrongly report their timesource
 Camera's timesource can either be CLOCK_MONOTONIC, or CLOCK_BOOTTIME
@@ -18,10 +18,10 @@ timestamp source.
  1 file changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
-index 61c3298403..db2ecbc703 100644
+index c3f6e4925e..971d40f7fd 100644
 --- a/services/camera/libcameraservice/device3/Camera3Device.cpp
 +++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
-@@ -210,8 +210,16 @@ status_t Camera3Device::initializeCommonLocked() {
+@@ -211,8 +211,16 @@ status_t Camera3Device::initializeCommonLocked() {
      mTimestampOffset = getMonoToBoottimeOffset();
      camera_metadata_entry timestampSource =
              mDeviceInfo.find(ANDROID_SENSOR_INFO_TIMESTAMP_SOURCE);
diff --git a/patches/trebledroid/platform_frameworks_av/0011-FIH-devices-Fix-Earpiece-audio-output.patch b/patches/trebledroid/platform_frameworks_av/0011-FIH-devices-Fix-Earpiece-audio-output.patch
index 826617b..732bd27 100644
--- a/patches/trebledroid/platform_frameworks_av/0011-FIH-devices-Fix-Earpiece-audio-output.patch
+++ b/patches/trebledroid/platform_frameworks_av/0011-FIH-devices-Fix-Earpiece-audio-output.patch
@@ -1,7 +1,7 @@
-From 139301c7192accbbab701366bba4bb2aafe48e4e Mon Sep 17 00:00:00 2001
+From 1af5ce9e27e141b0bd821690c9998db43ba19d5f Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 24 Apr 2018 00:14:28 +0200
-Subject: [PATCH 11/21] FIH devices: Fix "Earpiece" audio output
+Subject: [PATCH 11/23] FIH devices: Fix "Earpiece" audio output
 
 On some FIH devices (confirmed on Razer, and probably on Aquos SS2),
 Earpiece is not listed in attachedDevices, and devicePort's profile
diff --git a/patches/trebledroid/platform_frameworks_av/0012-No-longer-make-re-assigning-legacy-audio-groups-fata.patch b/patches/trebledroid/platform_frameworks_av/0012-No-longer-make-re-assigning-legacy-audio-groups-fata.patch
index a7d712b..bfbe8bb 100644
--- a/patches/trebledroid/platform_frameworks_av/0012-No-longer-make-re-assigning-legacy-audio-groups-fata.patch
+++ b/patches/trebledroid/platform_frameworks_av/0012-No-longer-make-re-assigning-legacy-audio-groups-fata.patch
@@ -1,7 +1,7 @@
-From 0328b324b5606cda6a4efd7dae9f7eda2b8de74f Mon Sep 17 00:00:00 2001
+From c574311f39d631b504d790fdabcd94e47ace088a Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 12 Sep 2020 12:32:50 +0200
-Subject: [PATCH 12/21] No longer make re-assigning legacy audio groups fatal.
+Subject: [PATCH 12/23] No longer make re-assigning legacy audio groups fatal.
  Mi9 declares AUDIO_STREAM_PATCH and AUDIO_STREAM_REROUTING which is defined
  by framework too
 
@@ -11,10 +11,10 @@ Change-Id: I794fe22d63a8af705be4f5f09b9879ecaab3eae5
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/services/audiopolicy/engine/common/src/EngineBase.cpp b/services/audiopolicy/engine/common/src/EngineBase.cpp
-index 7d6a3087c3..356ca7645c 100644
+index 218aff80e6..c7ea035191 100644
 --- a/services/audiopolicy/engine/common/src/EngineBase.cpp
 +++ b/services/audiopolicy/engine/common/src/EngineBase.cpp
-@@ -223,9 +223,9 @@ engineConfig::ParsingResult EngineBase::loadAudioPolicyEngineConfig(const std::s
+@@ -245,9 +245,9 @@ engineConfig::ParsingResult EngineBase::processParsingResult(
              }
              if (group.stream != AUDIO_STREAM_DEFAULT) {
                  // A legacy stream can be assigned once to a volume group
diff --git a/patches/trebledroid/platform_frameworks_av/0013-Make-camera-IDs-filter-out-optional.patch b/patches/trebledroid/platform_frameworks_av/0013-Make-camera-IDs-filter-out-optional.patch
index 3adb93f..6957d0c 100644
--- a/patches/trebledroid/platform_frameworks_av/0013-Make-camera-IDs-filter-out-optional.patch
+++ b/patches/trebledroid/platform_frameworks_av/0013-Make-camera-IDs-filter-out-optional.patch
@@ -1,4 +1,4 @@
-From f9763a604f1195d0c4292dd7488747c489360f11 Mon Sep 17 00:00:00 2001
+From cbe88f387de8eb9f02338fc18544010d158fd95f Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 21 Dec 2020 20:19:11 +0100
 Subject: [PATCH] Make camera IDs filter-out optional
@@ -7,11 +7,11 @@ Nowadays most people have Camera 2 apps, and would like to have all
 cameras, rather than limit which cameras are available.
 Add a property for that.
 ---
- .../common/CameraProviderManager.cpp             | 16 ++++++++++------
- 1 file changed, 10 insertions(+), 6 deletions(-)
+ .../common/CameraProviderManager.cpp                 | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
-index b163971..74e245b 100644
+index b163971..4d4f579 100644
 --- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
 +++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
 @@ -265,7 +265,9 @@ std::vector<std::string> CameraProviderManager::getAPI1CompatibleCameraDeviceIds
@@ -25,25 +25,21 @@ index b163971..74e245b 100644
          collectDeviceIdsLocked(providerDeviceIds, publicDeviceIds, systemDeviceIds);
      }
      auto sortFunc =
-@@ -962,11 +964,13 @@ void CameraProviderManager::ProviderInfo::DeviceInfo3::queryPhysicalCameraIds()
-     camera_metadata_entry_t entryCap;
- 
-     entryCap = mCameraCharacteristics.find(ANDROID_REQUEST_AVAILABLE_CAPABILITIES);
--    for (size_t i = 0; i < entryCap.count; ++i) {
--        uint8_t capability = entryCap.data.u8[i];
--        if (capability == ANDROID_REQUEST_AVAILABLE_CAPABILITIES_LOGICAL_MULTI_CAMERA) {
--            mIsLogicalCamera = true;
--            break;
+@@ -994,6 +996,14 @@ SystemCameraKind CameraProviderManager::ProviderInfo::DeviceInfo3::getSystemCame
+             entryCap.data.u8[0] == ANDROID_REQUEST_AVAILABLE_CAPABILITIES_SECURE_IMAGE_DATA) {
+         return SystemCameraKind::HIDDEN_SECURE_CAMERA;
+     }
 +    if(!property_get_bool("persist.sys.phh.include_all_cameras", false)) {
 +        for (size_t i = 0; i < entryCap.count; ++i) {
 +            uint8_t capability = entryCap.data.u8[i];
-+            if (capability == ANDROID_REQUEST_AVAILABLE_CAPABILITIES_LOGICAL_MULTI_CAMERA) {
-+               mIsLogicalCamera = true;
-+               break;
++            if (capability == ANDROID_REQUEST_AVAILABLE_CAPABILITIES_SYSTEM_CAMERA) {
++                return SystemCameraKind::SYSTEM_ONLY_CAMERA;
 +            }
-         }
-     }
-     if (!mIsLogicalCamera) {
++        }
++    }
+     return SystemCameraKind::PUBLIC;
+ }
+ 
 -- 
-2.40.1
+2.34.1
 
diff --git a/patches/trebledroid/platform_frameworks_av/0014-Support-Samsung-R-multi-cams.patch b/patches/trebledroid/platform_frameworks_av/0014-Support-Samsung-R-multi-cams.patch
index 35cf9bb..0f72b45 100644
--- a/patches/trebledroid/platform_frameworks_av/0014-Support-Samsung-R-multi-cams.patch
+++ b/patches/trebledroid/platform_frameworks_av/0014-Support-Samsung-R-multi-cams.patch
@@ -1,7 +1,7 @@
-From b00f88c4281727344e601641b08c2f2441ebca40 Mon Sep 17 00:00:00 2001
+From b47625e7c74c572727415505f8ecf3fa09e34fd3 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 13 Mar 2021 14:20:03 -0500
-Subject: [PATCH 14/21] Support Samsung R multi-cams
+Subject: [PATCH 14/23] Support Samsung R multi-cams
 
 Change-Id: If46f385e8dd16185cbf37ab083e6a1242e1d1555
 ---
diff --git a/patches/trebledroid/platform_frameworks_av/0015-Don-t-crash-on-unknown-audio-devices.patch b/patches/trebledroid/platform_frameworks_av/0015-Don-t-crash-on-unknown-audio-devices.patch
index 6962a6f..8db2dd7 100644
--- a/patches/trebledroid/platform_frameworks_av/0015-Don-t-crash-on-unknown-audio-devices.patch
+++ b/patches/trebledroid/platform_frameworks_av/0015-Don-t-crash-on-unknown-audio-devices.patch
@@ -1,7 +1,7 @@
-From eb2f8fc537129eeffa0044de14466a9c3aeef808 Mon Sep 17 00:00:00 2001
+From e1e58862b5b53558e7bcdeb4a3f6ea52e98b3351 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 23 Mar 2021 00:16:42 +0100
-Subject: [PATCH 15/21] Don't crash on unknown audio devices
+Subject: [PATCH 15/23] Don't crash on unknown audio devices
 
 Change-Id: I2df8d88f742da6a84aa8888cdf19de25444de919
 ---
diff --git a/patches/trebledroid/platform_frameworks_av/0016-Not-all-sources-in-a-route-are-valid.-Dont-ignore-th.patch b/patches/trebledroid/platform_frameworks_av/0016-Not-all-sources-in-a-route-are-valid.-Dont-ignore-th.patch
index 16ae348..9cb9c99 100644
--- a/patches/trebledroid/platform_frameworks_av/0016-Not-all-sources-in-a-route-are-valid.-Dont-ignore-th.patch
+++ b/patches/trebledroid/platform_frameworks_av/0016-Not-all-sources-in-a-route-are-valid.-Dont-ignore-th.patch
@@ -1,7 +1,7 @@
-From 0d1eede6fe3c315fb9067fcc8c23ecc98804d275 Mon Sep 17 00:00:00 2001
+From 7bec783857ca1571566eadd953fc50d291b0291a Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 28 Mar 2021 18:54:47 +0200
-Subject: [PATCH 16/21] Not all sources in a route are valid. Dont ignore the
+Subject: [PATCH 16/23] Not all sources in a route are valid. Dont ignore the
  whole route because of one broken source
 
 Change-Id: If8a51740e71bef3a4738262ad7b43a337b0ec36d
diff --git a/patches/trebledroid/platform_frameworks_av/0017-Use-a-fake-volume-policy-when-none-has-been-found.patch b/patches/trebledroid/platform_frameworks_av/0017-Use-a-fake-volume-policy-when-none-has-been-found.patch
index 17b93c8..cec555d 100644
--- a/patches/trebledroid/platform_frameworks_av/0017-Use-a-fake-volume-policy-when-none-has-been-found.patch
+++ b/patches/trebledroid/platform_frameworks_av/0017-Use-a-fake-volume-policy-when-none-has-been-found.patch
@@ -1,7 +1,7 @@
-From f2fc80503fa719af9c1a2d158c798cb992707d19 Mon Sep 17 00:00:00 2001
+From 5068591a24e600c80830a9dd348d132c694a1501 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 28 Mar 2021 14:48:49 +0200
-Subject: [PATCH 17/21] Use a fake volume policy when none has been found
+Subject: [PATCH 17/23] Use a fake volume policy when none has been found
 
 This is useful, because on Samsung devices, the "real"
 (=non-gsi-cheating) audio policy doesn't have any volume policy.
@@ -15,10 +15,10 @@ Change-Id: I461a3f22893ab2b1d96d67f22397369b2cae41e5
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/services/audiopolicy/engine/config/src/EngineConfig.cpp b/services/audiopolicy/engine/config/src/EngineConfig.cpp
-index ac117f0efb..06d2adc1a3 100644
+index ca78ce7213..59211577c4 100644
 --- a/services/audiopolicy/engine/config/src/EngineConfig.cpp
 +++ b/services/audiopolicy/engine/config/src/EngineConfig.cpp
-@@ -717,7 +717,12 @@ android::status_t parseLegacyVolumeFile(const char* path, VolumeGroups &volumeGr
+@@ -800,7 +800,12 @@ android::status_t parseLegacyVolumeFile(const char* path, VolumeGroups &volumeGr
  android::status_t parseLegacyVolumes(VolumeGroups &volumeGroups) {
      if (std::string audioPolicyXmlConfigFile = audio_get_audio_policy_config_file();
              !audioPolicyXmlConfigFile.empty()) {
diff --git a/patches/trebledroid/platform_frameworks_av/0018-Revert-Remove-support-for-audio-HAL-V2-from-the-fram.patch b/patches/trebledroid/platform_frameworks_av/0018-Revert-Remove-support-for-audio-HAL-V2-from-the-fram.patch
index 6a5d729..433b630 100644
--- a/patches/trebledroid/platform_frameworks_av/0018-Revert-Remove-support-for-audio-HAL-V2-from-the-fram.patch
+++ b/patches/trebledroid/platform_frameworks_av/0018-Revert-Remove-support-for-audio-HAL-V2-from-the-fram.patch
@@ -1,7 +1,7 @@
-From 487baf3933e16834bbe93ba2c154f4cb407effad Mon Sep 17 00:00:00 2001
+From b9267ea8eaadb61a19d3da7670d11075b4d2ea59 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Mon, 11 Oct 2021 16:10:42 -0400
-Subject: [PATCH 18/21] Revert "Remove support for audio HAL V2 from the
+Subject: [PATCH 18/23] Revert "Remove support for audio HAL V2 from the
  framework"
 
 This reverts commit cbf517f837f7bf8a59f3ff8aa1e0e3e19612e251.
@@ -51,7 +51,7 @@ index f88915d7f4..24e5adbae3 100644
  
  static const std::map<AudioHalVersionInfo::Type, InterfaceName> sDevicesHALInterfaces = {
 diff --git a/media/libaudiohal/impl/Android.bp b/media/libaudiohal/impl/Android.bp
-index 09e70ebfb8..78050513ae 100644
+index 16893655f0..1271756bd1 100644
 --- a/media/libaudiohal/impl/Android.bp
 +++ b/media/libaudiohal/impl/Android.bp
 @@ -82,6 +82,32 @@ cc_defaults {
@@ -88,10 +88,10 @@ index 09e70ebfb8..78050513ae 100644
      name: "libaudiohal@4.0",
      defaults: [
 diff --git a/media/libaudiohal/impl/DeviceHalHidl.cpp b/media/libaudiohal/impl/DeviceHalHidl.cpp
-index 826461f9a5..b05c9e1427 100644
+index 0d71fd338c..c228bf7a6f 100644
 --- a/media/libaudiohal/impl/DeviceHalHidl.cpp
 +++ b/media/libaudiohal/impl/DeviceHalHidl.cpp
-@@ -574,6 +574,7 @@ status_t DeviceHalHidl::setConnectedState(const struct audio_port_v7 *port, bool
+@@ -577,6 +577,7 @@ status_t DeviceHalHidl::setConnectedState(const struct audio_port_v7 *port, bool
          // call is successful. Also remove the cache here to avoid a large cache after a long run.
          return NO_ERROR;
      }
@@ -99,7 +99,7 @@ index 826461f9a5..b05c9e1427 100644
  #if MAJOR_VERSION == 7 && MINOR_VERSION == 1
      if (supportsSetConnectedState7_1) {
          AudioPort hidlPort;
-@@ -596,11 +597,17 @@ status_t DeviceHalHidl::setConnectedState(const struct audio_port_v7 *port, bool
+@@ -599,11 +600,17 @@ status_t DeviceHalHidl::setConnectedState(const struct audio_port_v7 *port, bool
          return result;
      }
      return processReturn("setConnectedState", mDevice->setConnectedState(hidlAddress, connected));
@@ -117,7 +117,7 @@ index 826461f9a5..b05c9e1427 100644
      audio_hw_sync_t value;
      Result result;
      Return<void> ret = mDevice->getHwAvSync([&value, &result](Result r, audio_hw_sync_t v) {
-@@ -609,6 +616,9 @@ error::Result<audio_hw_sync_t> DeviceHalHidl::getHwAvSync() {
+@@ -612,6 +619,9 @@ error::Result<audio_hw_sync_t> DeviceHalHidl::getHwAvSync() {
      });
      RETURN_IF_ERROR(processReturn("getHwAvSync", ret, result));
      return value;
diff --git a/patches/trebledroid/platform_frameworks_av/0019-Add-a-prop-to-change-Samsung-flash-strength.patch b/patches/trebledroid/platform_frameworks_av/0019-Add-a-prop-to-change-Samsung-flash-strength.patch
index 5a7cbd7..910902d 100644
--- a/patches/trebledroid/platform_frameworks_av/0019-Add-a-prop-to-change-Samsung-flash-strength.patch
+++ b/patches/trebledroid/platform_frameworks_av/0019-Add-a-prop-to-change-Samsung-flash-strength.patch
@@ -1,7 +1,7 @@
-From 62e86c3346659667a1902917ce148d0f079a0089 Mon Sep 17 00:00:00 2001
+From 69ae25b128b43ccb09f07e3a796e08301445f767 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 16 Apr 2022 14:30:14 -0400
-Subject: [PATCH 19/21] Add a prop to change Samsung flash strength
+Subject: [PATCH 19/23] Add a prop to change Samsung flash strength
 
 ---
  services/camera/libcameraservice/Android.bp   |  2 ++
diff --git a/patches/trebledroid/platform_frameworks_av/0020-voip-Fix-high-pitched-voice-on-Qualcomm-devices.patch b/patches/trebledroid/platform_frameworks_av/0020-voip-Fix-high-pitched-voice-on-Qualcomm-devices.patch
index 1e24e44..146f6b5 100644
--- a/patches/trebledroid/platform_frameworks_av/0020-voip-Fix-high-pitched-voice-on-Qualcomm-devices.patch
+++ b/patches/trebledroid/platform_frameworks_av/0020-voip-Fix-high-pitched-voice-on-Qualcomm-devices.patch
@@ -1,7 +1,7 @@
-From 826b61a88791da133524738277ca1df6369cce9e Mon Sep 17 00:00:00 2001
+From 34e3cc711d9c76235de0b876334516b3423f9661 Mon Sep 17 00:00:00 2001
 From: ponces <ponces26@gmail.com>
 Date: Mon, 24 Oct 2022 09:38:34 +0100
-Subject: [PATCH 20/21] voip: Fix high pitched voice on Qualcomm devices
+Subject: [PATCH 20/23] voip: Fix high pitched voice on Qualcomm devices
 
 ---
  .../common/managerdefinitions/src/Serializer.cpp         | 9 +++++++++
diff --git a/patches/trebledroid/platform_frameworks_av/0021-audiopolicy-Fix-broken-mic-while-video-recording-on-.patch b/patches/trebledroid/platform_frameworks_av/0021-audiopolicy-Fix-broken-mic-while-video-recording-on-.patch
index f7ed723..3ffda9b 100644
--- a/patches/trebledroid/platform_frameworks_av/0021-audiopolicy-Fix-broken-mic-while-video-recording-on-.patch
+++ b/patches/trebledroid/platform_frameworks_av/0021-audiopolicy-Fix-broken-mic-while-video-recording-on-.patch
@@ -1,7 +1,7 @@
-From e7ad97b0d5b482e6f857d4650c847653723a6699 Mon Sep 17 00:00:00 2001
+From d05e5da997931d4202dfc8cd528c1e2a55b572dc Mon Sep 17 00:00:00 2001
 From: Alberto Ponces <ponces26@gmail.com>
 Date: Sun, 30 Apr 2023 23:29:04 +0100
-Subject: [PATCH 21/21] audiopolicy: Fix broken mic while video recording on
+Subject: [PATCH 21/23] audiopolicy: Fix broken mic while video recording on
  some Exynos devices This should fix
  https://github.com/phhusson/treble_experimentations/issues/2021 and
  https://github.com/phhusson/treble_experimentations/issues/2384. Credits to
diff --git a/patches/trebledroid/platform_frameworks_av/0022-Add-a-prop-to-disable-AUDIO_OUTPUT_FLAG_FAST-from-au.patch b/patches/trebledroid/platform_frameworks_av/0022-Add-a-prop-to-disable-AUDIO_OUTPUT_FLAG_FAST-from-au.patch
index 410b4f8..3601cad 100644
--- a/patches/trebledroid/platform_frameworks_av/0022-Add-a-prop-to-disable-AUDIO_OUTPUT_FLAG_FAST-from-au.patch
+++ b/patches/trebledroid/platform_frameworks_av/0022-Add-a-prop-to-disable-AUDIO_OUTPUT_FLAG_FAST-from-au.patch
@@ -1,4 +1,4 @@
-From ef6b5781f61db53698826b707e5b14a9a177655c Mon Sep 17 00:00:00 2001
+From d1386377b38ecfff6e281fb5f154961b9bc92036 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 30 Oct 2023 10:30:58 -0400
 Subject: [PATCH 22/23] Add a prop to disable AUDIO_OUTPUT_FLAG_FAST from audio
diff --git a/patches/trebledroid/platform_frameworks_av/0023-Add-a-prop-to-fix-echo-on-incoming-or-outgoing-calls.patch b/patches/trebledroid/platform_frameworks_av/0023-Add-a-prop-to-fix-echo-on-incoming-or-outgoing-calls.patch
index 39cd79f..83ec195 100644
--- a/patches/trebledroid/platform_frameworks_av/0023-Add-a-prop-to-fix-echo-on-incoming-or-outgoing-calls.patch
+++ b/patches/trebledroid/platform_frameworks_av/0023-Add-a-prop-to-fix-echo-on-incoming-or-outgoing-calls.patch
@@ -1,4 +1,4 @@
-From 9632977dbf935cae1496730f779fa872e619b596 Mon Sep 17 00:00:00 2001
+From a00e9a0e0ac67d7b6348f254728298a89a6905ff Mon Sep 17 00:00:00 2001
 From: Alberto Ponces <ponces26@gmail.com>
 Date: Sun, 5 Nov 2023 15:18:03 +0000
 Subject: [PATCH 23/23] Add a prop to fix echo on incoming or outgoing calls
diff --git a/patches/trebledroid/platform_frameworks_base/0001-Disable-vendor-mismatch-warning.patch b/patches/trebledroid/platform_frameworks_base/0001-Disable-vendor-mismatch-warning.patch
index ffd501a..c0f8c2f 100644
--- a/patches/trebledroid/platform_frameworks_base/0001-Disable-vendor-mismatch-warning.patch
+++ b/patches/trebledroid/platform_frameworks_base/0001-Disable-vendor-mismatch-warning.patch
@@ -1,7 +1,7 @@
-From d5569f56dc1bb217a3c20620f4c719b67e0b7e26 Mon Sep 17 00:00:00 2001
+From ed3a5e94a1bc6c13147e0fbbe21dde05001001c0 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Thu, 5 Apr 2018 10:01:19 +0800
-Subject: [PATCH 01/47] Disable vendor mismatch warning
+Subject: [PATCH 01/46] Disable vendor mismatch warning
 
 Change-Id: Ieb8fe91e2f02462f074312ed0f4885d183e9780b
 ---
@@ -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 47b51ac164b9..1f4bca47b683 100644
+index d7489f2c7b91..8e890a39e6de 100644
 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
 +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
-@@ -6081,20 +6081,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
+@@ -6094,20 +6094,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
                  }
  
                  if (!Build.isBuildConsistent()) {
diff --git a/patches/trebledroid/platform_frameworks_base/0002-Fallback-to-stupid-autobrightness-if-brightness-valu.patch b/patches/trebledroid/platform_frameworks_base/0002-Fallback-to-stupid-autobrightness-if-brightness-valu.patch
index 1b1c532..23cf29e 100644
--- a/patches/trebledroid/platform_frameworks_base/0002-Fallback-to-stupid-autobrightness-if-brightness-valu.patch
+++ b/patches/trebledroid/platform_frameworks_base/0002-Fallback-to-stupid-autobrightness-if-brightness-valu.patch
@@ -1,7 +1,7 @@
-From 7a43cefe8c152ffd8819a2be104a096961db3f97 Mon Sep 17 00:00:00 2001
+From ba7a834e3dfc496970973b3541f7b032e61adfb2 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 5 Oct 2021 17:59:16 -0400
-Subject: [PATCH 02/47] Fallback to stupid autobrightness if brightness values
+Subject: [PATCH 02/46] Fallback to stupid autobrightness if brightness values
  are broken
 
 This is needed because of:
@@ -14,10 +14,10 @@ Change-Id: Ieb679b34239013a5e31b34cb010b12febd9ef6d9
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/services/core/java/com/android/server/display/DisplayDeviceConfig.java b/services/core/java/com/android/server/display/DisplayDeviceConfig.java
-index 7a797dd2250c..3af484071e43 100644
+index 2464eb0141b8..b0ebab8e4002 100644
 --- a/services/core/java/com/android/server/display/DisplayDeviceConfig.java
 +++ b/services/core/java/com/android/server/display/DisplayDeviceConfig.java
-@@ -732,9 +732,14 @@ public class DisplayDeviceConfig {
+@@ -777,9 +777,14 @@ public class DisplayDeviceConfig {
       * @return A configuration instance.
       */
      public static DisplayDeviceConfig create(Context context, boolean useConfigXml) {
diff --git a/patches/trebledroid/platform_frameworks_base/0003-Fix-env-empty-string-ANDROID_STORAGE.patch b/patches/trebledroid/platform_frameworks_base/0003-Fix-env-empty-string-ANDROID_STORAGE.patch
index f438c62..a72a70f 100644
--- a/patches/trebledroid/platform_frameworks_base/0003-Fix-env-empty-string-ANDROID_STORAGE.patch
+++ b/patches/trebledroid/platform_frameworks_base/0003-Fix-env-empty-string-ANDROID_STORAGE.patch
@@ -1,7 +1,7 @@
-From 03c19dc430fa6b954fdef5346d49cd645add594c Mon Sep 17 00:00:00 2001
+From 83e00d63b8755ebd5aa364fd7003c0d51224b3ae Mon Sep 17 00:00:00 2001
 From: Raphael Mounier <mounierr07@gmail.com>
 Date: Sat, 6 Aug 2022 18:08:36 +0200
-Subject: [PATCH 03/47] Fix env empty string - ANDROID_STORAGE
+Subject: [PATCH 03/46] Fix env empty string - ANDROID_STORAGE
 
 Huawei hi6250 define in init.hi6250.rc ANDROID_STORAGE to "", so check empty string and replace with default path. Apply change for all env directory
 ---
diff --git a/patches/trebledroid/platform_frameworks_base/0005-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch b/patches/trebledroid/platform_frameworks_base/0005-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch
index 8b7b19d..b0280c8 100644
--- a/patches/trebledroid/platform_frameworks_base/0005-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch
+++ b/patches/trebledroid/platform_frameworks_base/0005-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch
@@ -1,7 +1,7 @@
-From 20e7ad25ec793ba9291a39cb99832193342ac3a5 Mon Sep 17 00:00:00 2001
+From 0b025b95b427b9f5b793b1028df941b8db10a4a5 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 17 May 2018 20:28:35 +0200
-Subject: [PATCH 05/47] Don't crash if there is IR HAL is not declared
+Subject: [PATCH 05/46] Don't crash if there is IR HAL is not declared
 
 Change-Id: I3afded27441bbee8244d5fda544b3e6d1238dc1b
 ---
diff --git a/patches/trebledroid/platform_frameworks_base/0006-Implement-a-persistent-property-to-override-the-defa.patch b/patches/trebledroid/platform_frameworks_base/0006-Implement-a-persistent-property-to-override-the-defa.patch
index 7801dc1..6da88d4 100644
--- a/patches/trebledroid/platform_frameworks_base/0006-Implement-a-persistent-property-to-override-the-defa.patch
+++ b/patches/trebledroid/platform_frameworks_base/0006-Implement-a-persistent-property-to-override-the-defa.patch
@@ -1,4 +1,4 @@
-From 70dead8a16e74b51e7f1e2d9ff64e85676972078 Mon Sep 17 00:00:00 2001
+From b122ffaa4bd3ada63eda6b6fb0a9a089ed872411 Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Wed, 1 Jun 2022 16:56:20 -0400
 Subject: [PATCH] Implement a persistent property to override the default
@@ -11,7 +11,7 @@ Change-Id: I49b45d00bf71d7932591b3516d49a680e1b6568b
  2 files changed, 14 insertions(+)
 
 diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java
-index cbe1ce83..b6c277e2 100644
+index cbe1ce83e..b6c277e2c 100644
 --- a/core/java/android/hardware/Camera.java
 +++ b/core/java/android/hardware/Camera.java
 @@ -481,6 +481,11 @@ public class Camera {
@@ -27,10 +27,10 @@ index cbe1ce83..b6c277e2 100644
          CameraInfo cameraInfo = new CameraInfo();
          for (int i = 0; i < numberOfCameras; i++) {
 diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java
-index c6597532..71afa69a 100644
+index a15c103e3..b1393dbe8 100644
 --- a/core/java/android/hardware/camera2/CameraManager.java
 +++ b/core/java/android/hardware/camera2/CameraManager.java
-@@ -2029,6 +2029,15 @@ public final class CameraManager {
+@@ -2095,6 +2095,15 @@ public final class CameraManager {
                          }
                      }});
  
@@ -47,5 +47,5 @@ index c6597532..71afa69a 100644
  
          public static boolean cameraStatusesContains(CameraStatus[] cameraStatuses, String id) {
 -- 
-2.42.0
+2.34.1
 
diff --git a/patches/trebledroid/platform_frameworks_base/0007-Show-APN-Settings-for-CDMA-carriers.patch b/patches/trebledroid/platform_frameworks_base/0007-Show-APN-Settings-for-CDMA-carriers.patch
deleted file mode 100644
index e609ba3..0000000
--- a/patches/trebledroid/platform_frameworks_base/0007-Show-APN-Settings-for-CDMA-carriers.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2348038ffbe8071c7db1e37d3aaa7d78852994af Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Mon, 6 Aug 2018 12:49:00 +0200
-Subject: [PATCH 07/47] Show APN Settings for CDMA carriers
-
----
- telephony/java/android/telephony/CarrierConfigManager.java | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
-index 5b1c6b1c88b8..f38d900d3b58 100644
---- a/telephony/java/android/telephony/CarrierConfigManager.java
-+++ b/telephony/java/android/telephony/CarrierConfigManager.java
-@@ -9823,7 +9823,7 @@ public class CarrierConfigManager {
-         sDefaults.putBoolean(KEY_OPERATOR_SELECTION_EXPAND_BOOL, true);
-         sDefaults.putBoolean(KEY_PREFER_2G_BOOL, false);
-         sDefaults.putBoolean(KEY_4G_ONLY_BOOL, false);
--        sDefaults.putBoolean(KEY_SHOW_APN_SETTING_CDMA_BOOL, false);
-+        sDefaults.putBoolean(KEY_SHOW_APN_SETTING_CDMA_BOOL, true);
-         sDefaults.putBoolean(KEY_SHOW_CDMA_CHOICES_BOOL, false);
-         sDefaults.putBoolean(KEY_SMS_REQUIRES_DESTINATION_NUMBER_CONVERSION_BOOL, false);
-         sDefaults.putBoolean(KEY_SUPPORT_EMERGENCY_SMS_OVER_IMS_BOOL, false);
--- 
-2.25.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0008-Re-order-services-so-that-it-works-even-without-qtag.patch b/patches/trebledroid/platform_frameworks_base/0008-Re-order-services-so-that-it-works-even-without-qtag.patch
index 8c93985..8be868b 100644
--- a/patches/trebledroid/platform_frameworks_base/0008-Re-order-services-so-that-it-works-even-without-qtag.patch
+++ b/patches/trebledroid/platform_frameworks_base/0008-Re-order-services-so-that-it-works-even-without-qtag.patch
@@ -1,7 +1,7 @@
-From 89fa2cf8f4ee50301f5dac092cb51fbb5b36bed1 Mon Sep 17 00:00:00 2001
+From 079c98abdc4626a283fc85466902cbbb4e60af15 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 8 Nov 2018 23:04:03 +0100
-Subject: [PATCH 08/47] Re-order services so that it works even without qtaguid
+Subject: [PATCH 08/46] Re-order services so that it works even without qtaguid
 
 Change-Id: I0c0f527b3ae151d45c68f7ac6c205da3f34e74df
 ---
diff --git a/patches/trebledroid/platform_frameworks_base/0009-Support-samsung-Pie-and-Q-light-hal.patch b/patches/trebledroid/platform_frameworks_base/0009-Support-samsung-Pie-and-Q-light-hal.patch
index dcf7e45..58df2d3 100644
--- a/patches/trebledroid/platform_frameworks_base/0009-Support-samsung-Pie-and-Q-light-hal.patch
+++ b/patches/trebledroid/platform_frameworks_base/0009-Support-samsung-Pie-and-Q-light-hal.patch
@@ -1,7 +1,7 @@
-From 10840f40c1a6221fa9d08079667e27f758923581 Mon Sep 17 00:00:00 2001
+From c7ab96785599a347ed565a7a625af2d7f189e7f4 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 24 Mar 2019 23:05:14 +0100
-Subject: [PATCH 09/47] Support samsung Pie and Q light hal
+Subject: [PATCH 09/46] Support samsung Pie and Q light hal
 
 Change-Id: I01f94acd7d0672733e48854d80368f9ac6f861c6
 ---
@@ -9,10 +9,10 @@ Change-Id: I01f94acd7d0672733e48854d80368f9ac6f861c6
  1 file changed, 2 insertions(+)
 
 diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp
-index d5217c8295bd..ea0da6918ecc 100644
+index 77db96001e0c..36c13ca121e3 100644
 --- a/services/core/jni/Android.bp
 +++ b/services/core/jni/Android.bp
-@@ -201,6 +201,8 @@ cc_defaults {
+@@ -202,6 +202,8 @@ cc_defaults {
          "android.system.suspend-V1-ndk",
          "server_configurable_flags",
          "service.incremental",
diff --git a/patches/trebledroid/platform_frameworks_base/0010-Add-support-for-samsung-touch-physical-and-hover-pro.patch b/patches/trebledroid/platform_frameworks_base/0010-Add-support-for-samsung-touch-physical-and-hover-pro.patch
index d7b7ba5..3d99b4d 100644
--- a/patches/trebledroid/platform_frameworks_base/0010-Add-support-for-samsung-touch-physical-and-hover-pro.patch
+++ b/patches/trebledroid/platform_frameworks_base/0010-Add-support-for-samsung-touch-physical-and-hover-pro.patch
@@ -1,7 +1,7 @@
-From d44d29905de26fff958aae8b6ae11b43f9ca8f2b Mon Sep 17 00:00:00 2001
+From 14f1569d88cb964d66876551f8a949f524dc0704 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 12 Aug 2019 23:08:26 +0200
-Subject: [PATCH 10/47] Add support for samsung touch, physical and hover
+Subject: [PATCH 10/46] Add support for samsung touch, physical and hover
  proximity sensor as fallback to real proximity sensor
 
 Change-Id: I7a0f8b4665c802140d19197d850b77b2a7ac1865
@@ -10,13 +10,13 @@ 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 9d31572c7d76..efa51e383499 100644
+index 5c53caa8a884..b76bb8d6a4c3 100644
 --- a/services/core/java/com/android/server/display/DisplayPowerController.java
 +++ b/services/core/java/com/android/server/display/DisplayPowerController.java
-@@ -2318,6 +2318,27 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
-                 mDisplayDeviceConfig.getProximitySensor();
-         mProximitySensor = SensorUtils.findSensor(mSensorManager, proxSensor.type, proxSensor.name,
-                 Sensor.TYPE_PROXIMITY);
+@@ -2366,6 +2366,27 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+         }
+         mProximitySensor = SensorUtils.findSensor(mSensorManager,
+                 mDisplayDeviceConfig.getProximitySensor(), Sensor.TYPE_PROXIMITY);
 +        if(mProximitySensor == null) {
 +            java.util.List<Sensor> sensors = mSensorManager.getSensorList(Sensor.TYPE_ALL);
 +            for(Sensor sensor: sensors) {
@@ -41,7 +41,7 @@ index 9d31572c7d76..efa51e383499 100644
          if (mProximitySensor != null) {
              mProximityThreshold = Math.min(mProximitySensor.getMaximumRange(),
                      TYPICAL_PROXIMITY_THRESHOLD);
-@@ -3336,6 +3357,20 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+@@ -3408,6 +3429,20 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
          public void onSensorChanged(SensorEvent event) {
              if (mProximitySensorEnabled) {
                  final long time = mClock.uptimeMillis();
diff --git a/patches/trebledroid/platform_frameworks_base/0011-Always-allow-overriding-the-number-of-work-profiles.patch b/patches/trebledroid/platform_frameworks_base/0011-Always-allow-overriding-the-number-of-work-profiles.patch
new file mode 100644
index 0000000..bc94280
--- /dev/null
+++ b/patches/trebledroid/platform_frameworks_base/0011-Always-allow-overriding-the-number-of-work-profiles.patch
@@ -0,0 +1,32 @@
+From 6caeae5b4ae8eb82d2885851d59b80ce1bf28aa5 Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Sun, 5 Apr 2020 16:32:46 +0200
+Subject: [PATCH 11/46] Always allow overriding the number of work profiles
+
+Change-Id: I6eb09aa71663c6fbe7563e3038bffcabdba0ff6a
+---
+ .../java/com/android/server/pm/UserManagerService.java    | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
+index d2929aef8a63..af0a221bd3e3 100644
+--- a/services/core/java/com/android/server/pm/UserManagerService.java
++++ b/services/core/java/com/android/server/pm/UserManagerService.java
+@@ -7346,12 +7346,8 @@ public class UserManagerService extends IUserManager.Stub {
+      */
+     private static int getMaxUsersOfTypePerParent(UserTypeDetails userTypeDetails) {
+         final int defaultMax = userTypeDetails.getMaxAllowedPerParent();
+-        if (!Build.IS_DEBUGGABLE) {
+-            return defaultMax;
+-        } else {
+-            if (userTypeDetails.isManagedProfile()) {
+-                return SystemProperties.getInt("persist.sys.max_profiles", defaultMax);
+-            }
++        if (userTypeDetails.isManagedProfile()) {
++            return SystemProperties.getInt("persist.sys.max_profiles", defaultMax);
+         }
+         return defaultMax;
+     }
+-- 
+2.25.1
+
diff --git a/patches/trebledroid/platform_frameworks_base/0012-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch b/patches/trebledroid/platform_frameworks_base/0012-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch
index f7f0dba..b39c5f9 100644
--- a/patches/trebledroid/platform_frameworks_base/0012-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch
+++ b/patches/trebledroid/platform_frameworks_base/0012-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch
@@ -1,8 +1,8 @@
-From 966a233eaeb3a02abac02e25335ae5120fe09d02 Mon Sep 17 00:00:00 2001
+From 73d9fbcac74b12b531bb4e1bac770d268c422b04 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 6 Jun 2020 18:21:56 +0200
-Subject: [PATCH 12/47] HOME deserves to wake-up devices just as well as back
- and menu
+Subject: [PATCH] HOME deserves to wake-up devices just as well as back and
+ menu
 
 Change-Id: Ia562bafd8c620d00c17e8eb338e4701c6c4a3c3a
 ---
@@ -10,17 +10,17 @@ Change-Id: Ia562bafd8c620d00c17e8eb338e4701c6c4a3c3a
  1 file changed, 1 insertion(+)
 
 diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java
-index 858da554c670..df9b4d938061 100644
+index de070efb2..79e0a9ccc 100644
 --- a/core/java/android/view/KeyEvent.java
 +++ b/core/java/android/view/KeyEvent.java
-@@ -2061,6 +2061,7 @@ public class KeyEvent extends InputEvent implements Parcelable {
-         switch (keyCode) {
+@@ -2068,6 +2068,7 @@ public class KeyEvent extends InputEvent implements Parcelable {
              case KeyEvent.KEYCODE_CAMERA:
+             case KeyEvent.KEYCODE_FOCUS:
              case KeyEvent.KEYCODE_MENU:
 +            case KeyEvent.KEYCODE_HOME:
              case KeyEvent.KEYCODE_PAIRING:
              case KeyEvent.KEYCODE_STEM_1:
              case KeyEvent.KEYCODE_STEM_2:
 -- 
-2.25.1
+2.34.1
 
diff --git a/patches/trebledroid/platform_frameworks_base/0014-Fix-brightness-range-not-being-complete-on-Samsung-d.patch b/patches/trebledroid/platform_frameworks_base/0014-Fix-brightness-range-not-being-complete-on-Samsung-d.patch
index 6341023..72b7f78 100644
--- a/patches/trebledroid/platform_frameworks_base/0014-Fix-brightness-range-not-being-complete-on-Samsung-d.patch
+++ b/patches/trebledroid/platform_frameworks_base/0014-Fix-brightness-range-not-being-complete-on-Samsung-d.patch
@@ -1,7 +1,7 @@
-From a0d3a673f2fc29205bc227558792917fcb4e8eb6 Mon Sep 17 00:00:00 2001
+From 32ecb023f8e654e04e97280593c9ba4203f772c5 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 29 Sep 2020 22:40:10 +0200
-Subject: [PATCH 14/47] Fix brightness range not being complete on Samsung
+Subject: [PATCH 14/46] Fix brightness range not being complete on Samsung
  devices
 
 On some devices, minimum brightness is 0, which totally messes with
diff --git a/patches/trebledroid/platform_frameworks_base/0015-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch b/patches/trebledroid/platform_frameworks_base/0015-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch
index 04b35f4..49004b0 100644
--- a/patches/trebledroid/platform_frameworks_base/0015-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch
+++ b/patches/trebledroid/platform_frameworks_base/0015-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch
@@ -1,4 +1,4 @@
-From 6b16b192f435621fee2cc040299065a20b596647 Mon Sep 17 00:00:00 2001
+From 5abb4076615e666ffce880e79612dadd5cd57e14 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] Re-implement fnmatch-like behaviour for RRO java-side
@@ -7,28 +7,19 @@ T: Also apply to FrameworkParsingPackageUtils (@PeterCxy)
 
 Change-Id: Id38292a9a1453aa87b8401c1fdb390fa4e63c7d1
 ---
- .../parsing/FrameworkParsingPackageUtils.java | 22 +++++++++----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
+ .../pm/parsing/FrameworkParsingPackageUtils.java   | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
 
 diff --git a/core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java b/core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java
-index b75ba82ad..fb6f1922b 100644
+index 9ddfa1559..679a2a5fa 100644
 --- a/core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java
 +++ b/core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java
-@@ -214,17 +214,17 @@ public class FrameworkParsingPackageUtils {
-         }
-         for (int i = 0; i < propNames.length; i++) {
-             final String currValue = SystemProperties.get(propNames[i]);
--            // 1. Make sure prop is set.
--            if (currValue == null) {
--                return false;
--            }
--            // 2. Check next prop if expected value is a wildcard.
--            if ("*".equals(propValues[i])) {
--                continue;
--            }
--            // 3. Check if prop is equal to expected value.
--            if (!currValue.equals(propValues[i])) {
--                return false;
+@@ -217,8 +217,18 @@ public class FrameworkParsingPackageUtils {
+             final String expectedValue = propValues[i];
+             final String currValue = SystemProperties.get(propName);
+ 
+-            if (currValue == null) return false;
+-            if (!"*".equals(expectedValue) && !currValue.equals(expectedValue)) return false;
 +            final String value = propValues[i];
 +            if(value.startsWith("+")) {
 +                final java.util.regex.Pattern regex = java.util.regex.Pattern.compile(value.substring(1, value.length()).replace("*", ".*"));
@@ -40,9 +31,10 @@ index b75ba82ad..fb6f1922b 100644
 +                if(!value.equals(currValue)) {
 +                    return false;
 +                }
-             }
++            }
          }
          return true;
+     }
 -- 
-2.40.1
+2.34.1
 
diff --git a/patches/trebledroid/platform_frameworks_base/0016-Remove-useless-notification-about-console-service-be.patch b/patches/trebledroid/platform_frameworks_base/0016-Remove-useless-notification-about-console-service-be.patch
index 53a9eb0..996b9ac 100644
--- a/patches/trebledroid/platform_frameworks_base/0016-Remove-useless-notification-about-console-service-be.patch
+++ b/patches/trebledroid/platform_frameworks_base/0016-Remove-useless-notification-about-console-service-be.patch
@@ -1,7 +1,7 @@
-From dfbcca0ba6887ab2944b9412734007545f054481 Mon Sep 17 00:00:00 2001
+From d8e4fddb4ddc852e2534cf2dfb1c431d1477d3eb Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 11 Dec 2020 14:41:09 +0100
-Subject: [PATCH 16/47] Remove useless notification about "console" service
+Subject: [PATCH 16/46] Remove useless notification about "console" service
  being running
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 16/47] 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 476e1b4ef11e..7b95294d1711 100644
+index be96af3e8035..84d8061dbce9 100644
 --- a/services/core/java/com/android/server/am/ActivityManagerService.java
 +++ b/services/core/java/com/android/server/am/ActivityManagerService.java
-@@ -5084,7 +5084,7 @@ public class ActivityManagerService extends IActivityManager.Stub
+@@ -5156,7 +5156,7 @@ public class ActivityManagerService extends IActivityManager.Stub
      }
  
      private void showConsoleNotificationIfActive() {
diff --git a/patches/trebledroid/platform_frameworks_base/0017-Revert-Remove-unused-SystemProperties.set.patch b/patches/trebledroid/platform_frameworks_base/0017-Revert-Remove-unused-SystemProperties.set.patch
index a7fd4a1..df27c42 100644
--- a/patches/trebledroid/platform_frameworks_base/0017-Revert-Remove-unused-SystemProperties.set.patch
+++ b/patches/trebledroid/platform_frameworks_base/0017-Revert-Remove-unused-SystemProperties.set.patch
@@ -1,7 +1,7 @@
-From 42a3481fae87c90e200067457b34934fd17c0901 Mon Sep 17 00:00:00 2001
+From d5e596c961dd0205754cc7eb3385ccc9933c5c6b Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Wed, 16 Dec 2020 21:24:12 +0800
-Subject: [PATCH 17/47] Revert "Remove unused SystemProperties.set"
+Subject: [PATCH 17/46] Revert "Remove unused SystemProperties.set"
 
 This reverts commit debb4616ef67f9ed5054eca51ec58592358ff55f.
 
@@ -11,7 +11,7 @@ This reverts commit debb4616ef67f9ed5054eca51ec58592358ff55f.
  1 file changed, 69 insertions(+)
 
 diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
-index 2a6099a18fab..aa85332f2946 100644
+index 340e4ab132ca..551b73a1706f 100644
 --- a/telephony/java/android/telephony/TelephonyManager.java
 +++ b/telephony/java/android/telephony/TelephonyManager.java
 @@ -8095,6 +8095,75 @@ public class TelephonyManager {
diff --git a/patches/trebledroid/platform_frameworks_base/0018-TelephonyManager-bring-back-getNetworkClass.patch b/patches/trebledroid/platform_frameworks_base/0018-TelephonyManager-bring-back-getNetworkClass.patch
index 1d9eef2..c4255a4 100644
--- a/patches/trebledroid/platform_frameworks_base/0018-TelephonyManager-bring-back-getNetworkClass.patch
+++ b/patches/trebledroid/platform_frameworks_base/0018-TelephonyManager-bring-back-getNetworkClass.patch
@@ -1,7 +1,7 @@
-From 483e24ed172206d8bad47e0db4cdea12a6ef85f6 Mon Sep 17 00:00:00 2001
+From f500eec93a1e40744ed6eb4806ab617bc4e6417c Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Wed, 16 Dec 2020 13:46:15 +0800
-Subject: [PATCH 18/47] TelephonyManager: bring back getNetworkClass()
+Subject: [PATCH 18/46] TelephonyManager: bring back getNetworkClass()
 
 This partially reverts commit c058cac051ab083dc7fb7ea6aa85699110b2e9bf.
 
@@ -11,7 +11,7 @@ This partially reverts commit c058cac051ab083dc7fb7ea6aa85699110b2e9bf.
  1 file changed, 58 insertions(+)
 
 diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
-index aa85332f2946..2146bbf33c80 100644
+index 551b73a1706f..62bd70374c96 100644
 --- a/telephony/java/android/telephony/TelephonyManager.java
 +++ b/telephony/java/android/telephony/TelephonyManager.java
 @@ -3204,6 +3204,64 @@ public class TelephonyManager {
diff --git a/patches/trebledroid/platform_frameworks_base/0019-TelephonyManager-add-API-annotations-for-setTelephon.patch b/patches/trebledroid/platform_frameworks_base/0019-TelephonyManager-add-API-annotations-for-setTelephon.patch
index 0a17f7a..5372642 100644
--- a/patches/trebledroid/platform_frameworks_base/0019-TelephonyManager-add-API-annotations-for-setTelephon.patch
+++ b/patches/trebledroid/platform_frameworks_base/0019-TelephonyManager-add-API-annotations-for-setTelephon.patch
@@ -1,7 +1,7 @@
-From 6fef4936b5844634735f7001bcc9b38e26ade3fc Mon Sep 17 00:00:00 2001
+From 5b09dfdf2027535fc074a22b4700ae91420ea325 Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Wed, 16 Dec 2020 21:26:45 +0800
-Subject: [PATCH 19/47] TelephonyManager: add API annotations for
+Subject: [PATCH 19/46] TelephonyManager: add API annotations for
  setTelephonyProperty
 
 * This method was added back by reverting commit
@@ -14,7 +14,7 @@ Subject: [PATCH 19/47] TelephonyManager: add API annotations for
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
-index 2146bbf33c80..cd42a761ba27 100644
+index 62bd70374c96..7aac41db9c36 100644
 --- a/telephony/java/android/telephony/TelephonyManager.java
 +++ b/telephony/java/android/telephony/TelephonyManager.java
 @@ -8159,7 +8159,7 @@ public class TelephonyManager {
diff --git a/patches/trebledroid/platform_frameworks_base/0021-Automatically-detect-pick-up-sensor-so-that-an-overl.patch b/patches/trebledroid/platform_frameworks_base/0021-Automatically-detect-pick-up-sensor-so-that-an-overl.patch
index 186c880..e1c2972 100644
--- a/patches/trebledroid/platform_frameworks_base/0021-Automatically-detect-pick-up-sensor-so-that-an-overl.patch
+++ b/patches/trebledroid/platform_frameworks_base/0021-Automatically-detect-pick-up-sensor-so-that-an-overl.patch
@@ -1,7 +1,7 @@
-From 2181e71e36cde8ebecacd6b4e70dd6a75c3c7041 Mon Sep 17 00:00:00 2001
+From 7f8a1b8d93a24ee03edf506109a5f69bb03f33c7 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 20 Mar 2021 14:31:01 +0100
-Subject: [PATCH 21/47] Automatically detect pick up sensor, so that an overlay
+Subject: [PATCH 21/46] Automatically detect pick up sensor, so that an overlay
  is required for the sole purpose of enabling pulse doze on pick up sensor
 
 ---
diff --git a/patches/trebledroid/platform_frameworks_base/0022-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch b/patches/trebledroid/platform_frameworks_base/0022-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch
index f61e42c..cab185b 100644
--- a/patches/trebledroid/platform_frameworks_base/0022-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch
+++ b/patches/trebledroid/platform_frameworks_base/0022-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch
@@ -1,7 +1,7 @@
-From d395e20a564ca1023bceb1cec1f2537e653a2655 Mon Sep 17 00:00:00 2001
+From 6abdb008ca62969aba90bc4f21590abb941de5b0 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 23 Mar 2021 19:43:26 +0100
-Subject: [PATCH 22/47] Catch broken mainBuiltInDisplayCutoutRectApproximation
+Subject: [PATCH 22/46] Catch broken mainBuiltInDisplayCutoutRectApproximation
 
 Some devices (Redmi Note 9T) have:
 mainBuiltInDisplayCutoutRectApproximation = @android:mainBuiltInDisplayCutout
diff --git a/patches/trebledroid/platform_frameworks_base/0023-backlight-Fix-backlight-control-on-Galaxy-S9.patch b/patches/trebledroid/platform_frameworks_base/0023-backlight-Fix-backlight-control-on-Galaxy-S9.patch
index a00f407..3743aa8 100644
--- a/patches/trebledroid/platform_frameworks_base/0023-backlight-Fix-backlight-control-on-Galaxy-S9.patch
+++ b/patches/trebledroid/platform_frameworks_base/0023-backlight-Fix-backlight-control-on-Galaxy-S9.patch
@@ -1,7 +1,7 @@
-From 0bcbe26b1b9f3592267db114af6cdcfbcc71e221 Mon Sep 17 00:00:00 2001
+From 0f90d39ebad877acbe691d4acb6a627d01311ad8 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 24 Mar 2018 08:01:48 +0100
-Subject: [PATCH 23/47] backlight: Fix backlight control on Galaxy S9(+)
+Subject: [PATCH 23/46] backlight: Fix backlight control on Galaxy S9(+)
 
 Change-Id: I1fbbb47939c377597ef8ad6b88b2acea5f4acaa6
 
diff --git a/patches/trebledroid/platform_frameworks_base/0024-Revert-Switch-long-press-power-behavior-in-AOSP.patch b/patches/trebledroid/platform_frameworks_base/0024-Revert-Switch-long-press-power-behavior-in-AOSP.patch
deleted file mode 100644
index 2f3d53b..0000000
--- a/patches/trebledroid/platform_frameworks_base/0024-Revert-Switch-long-press-power-behavior-in-AOSP.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 8bef22f83b47dfa1aa7802f0f09dae8c8a6bb536 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] Revert "Switch long-press power behavior in AOSP."
-
-This reverts commit 803c77a0a24624111944832098c6f65158051dc4.
----
- core/res/res/values/config.xml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
-index adac3fa9d..3293407ee 100644
---- a/core/res/res/values/config.xml
-+++ b/core/res/res/values/config.xml
-@@ -1095,7 +1095,7 @@
-             5 - Go to assistant (Settings.Secure.ASSISTANT)
-             6 - Toggle torch on / off (if screen is off)
-     -->
--    <integer name="config_longPressOnPowerBehavior">5</integer>
-+    <integer name="config_longPressOnPowerBehavior">1</integer>
- 
-     <!-- The time in milliseconds after which a press on power button is considered "long". -->
-     <integer name="config_longPressOnPowerDurationMs">500</integer>
-@@ -1127,7 +1127,7 @@
-             1 - Mute toggle
-             2 - Global actions menu
-     -->
--    <integer name="config_keyChordPowerVolumeUp">2</integer>
-+    <integer name="config_keyChordPowerVolumeUp">1</integer>
- 
-     <!-- Control the behavior when the user long presses the back button.  Non-zero values are only
-          valid for watches as part of CDD/CTS.
--- 
-2.40.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0025-Allow-disabling-of-fingerprint-cleanups-needed-on-so.patch b/patches/trebledroid/platform_frameworks_base/0025-Allow-disabling-of-fingerprint-cleanups-needed-on-so.patch
index 42f4cc2..cce1427 100644
--- a/patches/trebledroid/platform_frameworks_base/0025-Allow-disabling-of-fingerprint-cleanups-needed-on-so.patch
+++ b/patches/trebledroid/platform_frameworks_base/0025-Allow-disabling-of-fingerprint-cleanups-needed-on-so.patch
@@ -1,4 +1,4 @@
-From a671ad1edf6438e326397d5c69ca1cc58d5e7c89 Mon Sep 17 00:00:00 2001
+From 56e0932203c83d029dab3e14d7541febbd390066 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] Allow disabling of fingerprint cleanups, needed on some
@@ -9,21 +9,21 @@ Subject: [PATCH] Allow disabling of fingerprint cleanups, needed on some
  1 file changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java
-index 63e4b3ae..891d973b 100644
+index 431f56d39..d7280181e 100644
 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java
 +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java
-@@ -744,9 +744,8 @@ public class Fingerprint21 implements IHwBinder.DeathRecipient, ServiceProvider
+@@ -750,9 +750,8 @@ public class Fingerprint21 implements IHwBinder.DeathRecipient, ServiceProvider
  
      private void scheduleInternalCleanup(int userId,
              @Nullable ClientMonitorCallback callback) {
 -        if (!mCleanup) {
 -            return;
 -        }
-+       final boolean mNocleanup = android.os.SystemProperties.getBoolean("persist.sys.phh.fingerprint.nocleanup", false);
-+       if(mNocleanup) return;
++	final boolean mNocleanup = android.os.SystemProperties.getBoolean("persist.sys.phh.fingerprint.nocleanup", false);
++	if(mNocleanup) return;
          mHandler.post(() -> {
              scheduleUpdateActiveUserWithoutHandler(userId);
  
 -- 
-2.40.1
+2.34.1
 
diff --git a/patches/trebledroid/platform_frameworks_base/0026-Dynamically-resize-boot-animation-to-match-screen-si.patch b/patches/trebledroid/platform_frameworks_base/0026-Dynamically-resize-boot-animation-to-match-screen-si.patch
index 6026c5a..9e76e62 100644
--- a/patches/trebledroid/platform_frameworks_base/0026-Dynamically-resize-boot-animation-to-match-screen-si.patch
+++ b/patches/trebledroid/platform_frameworks_base/0026-Dynamically-resize-boot-animation-to-match-screen-si.patch
@@ -1,7 +1,7 @@
-From 176c2aaa566723e42973d20b85a273251dab6e69 Mon Sep 17 00:00:00 2001
+From 71d8e5906f7099eb28a3567b643dcb92f80ab790 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 20 Dec 2021 15:01:41 -0500
-Subject: [PATCH 26/47] Dynamically resize boot animation to match screen size
+Subject: [PATCH 26/46] Dynamically resize boot animation to match screen size
 
 Change-Id: I54e49fc6b8c670103852e212d1416e27ff976205
 ---
diff --git a/patches/trebledroid/platform_frameworks_base/0027-Revert-Remove-more-FDE-methods-from-StorageManager.patch b/patches/trebledroid/platform_frameworks_base/0027-Revert-Remove-more-FDE-methods-from-StorageManager.patch
index 4169601..7441798 100644
--- a/patches/trebledroid/platform_frameworks_base/0027-Revert-Remove-more-FDE-methods-from-StorageManager.patch
+++ b/patches/trebledroid/platform_frameworks_base/0027-Revert-Remove-more-FDE-methods-from-StorageManager.patch
@@ -1,7 +1,7 @@
-From dbe19e9eef67309210e38cb8c82dde7207af0f43 Mon Sep 17 00:00:00 2001
+From 802bdaaf5ee19687b3a27122b9fc11442969d87c Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 15 Oct 2022 09:33:56 +0000
-Subject: [PATCH 27/47] Revert "Remove more FDE methods from StorageManager"
+Subject: [PATCH 27/46] Revert "Remove more FDE methods from StorageManager"
 
 This reverts commit bd13f84152449a3ead6fa8604fd31f48c0224676.
 
@@ -12,10 +12,10 @@ Change-Id: Ic394934ec27b1a486c60123130825d44dad73412
  2 files changed, 61 insertions(+)
 
 diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java
-index 80dd48825ba7..cb4769ff4ec3 100644
+index ee387e7c284f..0adc55598d9b 100644
 --- a/core/java/android/os/storage/StorageManager.java
 +++ b/core/java/android/os/storage/StorageManager.java
-@@ -1660,6 +1660,15 @@ public class StorageManager {
+@@ -1669,6 +1669,15 @@ public class StorageManager {
          return false;
      }
  
@@ -31,7 +31,7 @@ index 80dd48825ba7..cb4769ff4ec3 100644
      /** {@hide}
       * Is this device encrypted?
       * <p>
-@@ -1693,6 +1702,54 @@ public class StorageManager {
+@@ -1702,6 +1711,54 @@ public class StorageManager {
          return isFileEncrypted();
      }
  
@@ -68,20 +68,20 @@ index 80dd48825ba7..cb4769ff4ec3 100644
 +        return false;
 +    }
 +
-+    /** {@hide}
-+     * Is this device non default block encrypted and in the process of
-+     * prompting for credentials?
-+     * @return true for prompting for credentials.
-+     *         (Implies isNonDefaultBlockEncrypted() == true)
-+     *         false otherwise
-+     * Note that only system services and CryptKeeper will ever see this return
-+     * true - no app will ever be launched in this state.
-+     * Also note that this state will not change without a teardown of the
-+     * framework, so no service needs to check for changes during their lifespan
-+     */
-+    public static boolean inCryptKeeperBounce() {
-+        return false;
-+    }
++
++
++
++
++
++
++
++
++
++
++
++
++
++
 +
      /** {@hide}
       * @deprecated Use {@link #isFileEncrypted} instead, since emulated FBE is no longer supported.
diff --git a/patches/trebledroid/platform_frameworks_base/0029-Set-old-fingerprint-sensors-to-security-strong.patch b/patches/trebledroid/platform_frameworks_base/0029-Set-old-fingerprint-sensors-to-security-strong.patch
index f03fc11..5452d8c 100644
--- a/patches/trebledroid/platform_frameworks_base/0029-Set-old-fingerprint-sensors-to-security-strong.patch
+++ b/patches/trebledroid/platform_frameworks_base/0029-Set-old-fingerprint-sensors-to-security-strong.patch
@@ -1,7 +1,7 @@
-From b6349f97257d8d32b0aeb8361bfabd4158d36808 Mon Sep 17 00:00:00 2001
+From c080cb6b2a2eff27e81b0b7de48ba9694d1b0b1d Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 3 Dec 2022 17:13:24 -0500
-Subject: [PATCH 29/47] Set old fingerprint sensors to security "strong"
+Subject: [PATCH 29/46] Set old fingerprint sensors to security "strong"
 
 This allows removing config_biometric_sensors from overlays, which led
 to Pixels not booting, because they are using AIDL biometric sensor, and
diff --git a/patches/trebledroid/platform_frameworks_base/0030-Call-Samsung-s-ISehSysInputDev-to-report-screen-stat.patch b/patches/trebledroid/platform_frameworks_base/0030-Call-Samsung-s-ISehSysInputDev-to-report-screen-stat.patch
index 34a9e2c..d59ff31 100644
--- a/patches/trebledroid/platform_frameworks_base/0030-Call-Samsung-s-ISehSysInputDev-to-report-screen-stat.patch
+++ b/patches/trebledroid/platform_frameworks_base/0030-Call-Samsung-s-ISehSysInputDev-to-report-screen-stat.patch
@@ -1,4 +1,4 @@
-From db501ffbcbc3026f7a5142677a8d8d549f1dcf89 Mon Sep 17 00:00:00 2001
+From 5085242aebe253c2bab3e89e8885e02ae963995a 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] Call Samsung's ISehSysInputDev to report screen state to
@@ -6,25 +6,24 @@ Subject: [PATCH] Call Samsung's ISehSysInputDev to report screen state to
 
 This fixes touchscreen not waking up on Galaxy F23
 ---
- services/core/Android.bp                      |  2 ++
+ services/core/Android.bp                      |  1 +
  .../server/display/LocalDisplayAdapter.java   | 32 +++++++++++++++++++
- 2 files changed, 34 insertions(+)
+ 2 files changed, 33 insertions(+)
 
 diff --git a/services/core/Android.bp b/services/core/Android.bp
-index f8d19ec99..29f7d42c4 100644
+index 2aa58b1d8..55320bd17 100644
 --- a/services/core/Android.bp
 +++ b/services/core/Android.bp
-@@ -186,6 +186,8 @@ java_library_static {
-         "com.android.sysprop.watchdog",
-         "ImmutabilityAnnotation",
+@@ -189,6 +189,7 @@ java_library_static {
          "securebox",
-+        "vendor.aac.hardware.richtap.vibrator",
+         "vendor.aospa.biometrics.face",
+         "vendor.aac.hardware.richtap.vibrator",
 +        "vendor.samsung.hardware.sysinput-V1.2-java", // HIDL
      ],
      javac_shard_size: 50,
      javacflags: [
 diff --git a/services/core/java/com/android/server/display/LocalDisplayAdapter.java b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
-index c7c0fab61..537027f2d 100644
+index 89d865e5a..9f2793a16 100644
 --- a/services/core/java/com/android/server/display/LocalDisplayAdapter.java
 +++ b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
 @@ -33,6 +33,7 @@ import android.os.Trace;
@@ -53,7 +52,7 @@ index c7c0fab61..537027f2d 100644
  
          LocalDisplayDevice(IBinder displayToken, long physicalDisplayId,
                  SurfaceControl.StaticDisplayInfo staticDisplayInfo,
-@@ -821,17 +826,44 @@ final class LocalDisplayAdapter extends DisplayAdapter {
+@@ -825,17 +830,44 @@ final class LocalDisplayAdapter extends DisplayAdapter {
                              }
                              mSidekickActive = false;
                          }
@@ -99,5 +98,5 @@ index c7c0fab61..537027f2d 100644
                          // have a sidekick available, tell it now that it can take control.
                          if (Display.isSuspendedState(state) && state != Display.STATE_OFF
 -- 
-2.40.1
+2.34.1
 
diff --git a/patches/trebledroid/platform_frameworks_base/0031-Try-catch-around-constrainNitsAndBacklightArrays-and.patch b/patches/trebledroid/platform_frameworks_base/0031-Try-catch-around-constrainNitsAndBacklightArrays-and.patch
index 4d07a03..d05aeb5 100644
--- a/patches/trebledroid/platform_frameworks_base/0031-Try-catch-around-constrainNitsAndBacklightArrays-and.patch
+++ b/patches/trebledroid/platform_frameworks_base/0031-Try-catch-around-constrainNitsAndBacklightArrays-and.patch
@@ -1,32 +1,34 @@
-From 5cb88083662cb28ccb47c6ef896e8dabb4273e94 Mon Sep 17 00:00:00 2001
+From 456b5ce0a795047b48595967c2f436cbbf645bf0 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 2 Jun 2023 19:19:31 -0400
-Subject: [PATCH 31/47] Try catch around constrainNitsAndBacklightArrays, and
+Subject: [PATCH 31/46] Try catch around constrainNitsAndBacklightArrays, and
  falls back to dumb curve. It crashes on Xperia 1 IV.
 
 ---
- .../server/display/DisplayDeviceConfig.java   | 58 ++++++++++---------
- 1 file changed, 32 insertions(+), 26 deletions(-)
+ .../server/display/DisplayDeviceConfig.java   | 56 ++++++++++---------
+ 1 file changed, 31 insertions(+), 25 deletions(-)
 
 diff --git a/services/core/java/com/android/server/display/DisplayDeviceConfig.java b/services/core/java/com/android/server/display/DisplayDeviceConfig.java
-index 3af484071e43..0f91fce1b076 100644
+index b0ebab8e4002..77dafd5068d0 100644
 --- a/services/core/java/com/android/server/display/DisplayDeviceConfig.java
 +++ b/services/core/java/com/android/server/display/DisplayDeviceConfig.java
-@@ -1826,37 +1826,43 @@ public class DisplayDeviceConfig {
+@@ -1903,37 +1903,43 @@ public class DisplayDeviceConfig {
              return;
          }
  
 -        // Use the (preferred) display device config mapping
 -        final List<Point> points = map.getPoint();
 -        final int size = points.size();
--
--        float[] nits = new float[size];
--        float[] backlight = new float[size];
 +        try {
 +            // Use the (preferred) display device config mapping
 +            final List<Point> points = map.getPoint();
 +            final int size = points.size();
  
+-        float[] nits = new float[size];
+-        float[] backlight = new float[size];
++            float[] nits = new float[size];
++            float[] backlight = new float[size];
+ 
 -        mInterpolationType = convertInterpolationType(map.getInterpolation());
 -        int i = 0;
 -        for (Point point : points) {
@@ -38,14 +40,6 @@ index 3af484071e43..0f91fce1b076 100644
 -                            + " of configuration. Nits: " + nits[i] + " < " + nits[i - 1]);
 -                    return;
 -                }
-+            float[] nits = new float[size];
-+            float[] backlight = new float[size];
- 
--                if (backlight[i] < backlight[i - 1]) {
--                    Slog.e(TAG, "screenBrightnessMap must be non-decreasing, ignoring rest "
--                            + " of configuration. Value: " + backlight[i] + " < "
--                            + backlight[i - 1]);
--                    return;
 +            mInterpolationType = convertInterpolationType(map.getInterpolation());
 +            int i = 0;
 +            for (Point point : points) {
@@ -57,7 +51,12 @@ index 3af484071e43..0f91fce1b076 100644
 +                                + " of configuration. Nits: " + nits[i] + " < " + nits[i - 1]);
 +                        return;
 +                    }
-+
+ 
+-                if (backlight[i] < backlight[i - 1]) {
+-                    Slog.e(TAG, "screenBrightnessMap must be non-decreasing, ignoring rest "
+-                            + " of configuration. Value: " + backlight[i] + " < "
+-                            + backlight[i - 1]);
+-                    return;
 +                    if (backlight[i] < backlight[i - 1]) {
 +                        Slog.e(TAG, "screenBrightnessMap must be non-decreasing, ignoring rest "
 +                                + " of configuration. Value: " + backlight[i] + " < "
diff --git a/patches/trebledroid/platform_frameworks_base/0032-Add-Mediatek-power-hints-on-touch.patch b/patches/trebledroid/platform_frameworks_base/0032-Add-Mediatek-power-hints-on-touch.patch
index e5541f9..6f2bd7a 100644
--- a/patches/trebledroid/platform_frameworks_base/0032-Add-Mediatek-power-hints-on-touch.patch
+++ b/patches/trebledroid/platform_frameworks_base/0032-Add-Mediatek-power-hints-on-touch.patch
@@ -1,4 +1,4 @@
-From bc35098ba4a985500dcf4d7b092a58fc6b43b70c Mon Sep 17 00:00:00 2001
+From 2ff789f73b0442c623eccd922c4f4c7068086b5c 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] Add Mediatek power hints on touch
@@ -27,12 +27,12 @@ Change-Id: I9f1eac5a20b98920a5d0c8204fe4d165ba069f5a
  2 files changed, 52 insertions(+), 1 deletion(-)
 
 diff --git a/services/core/Android.bp b/services/core/Android.bp
-index 2b23b936..b58f6494 100644
+index 55320bd17..cee2d4a6d 100644
 --- a/services/core/Android.bp
 +++ b/services/core/Android.bp
-@@ -188,7 +188,9 @@ java_library_static {
-         "ImmutabilityAnnotation",
+@@ -189,7 +189,9 @@ java_library_static {
          "securebox",
+         "vendor.aospa.biometrics.face",
          "vendor.aac.hardware.richtap.vibrator",
 -        "vendor.samsung.hardware.sysinput-V1.2-java", // HIDL
 +        // HIDL
@@ -42,10 +42,10 @@ index 2b23b936..b58f6494 100644
      javac_shard_size: 50,
      javacflags: [
 diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java
-index c4cd1b4b..a75ba406 100644
+index 220d96c77..46d64ad1c 100644
 --- a/services/core/java/com/android/server/wm/DisplayPolicy.java
 +++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
-@@ -208,6 +208,9 @@ public class DisplayPolicy {
+@@ -236,6 +236,9 @@ public class DisplayPolicy {
       */
      private boolean mRemoteInsetsControllerControlsSystemBars;
  
@@ -55,7 +55,7 @@ index c4cd1b4b..a75ba406 100644
      StatusBarManagerInternal getStatusBarManagerInternal() {
          synchronized (mServiceAcquireLock) {
              if (mStatusBarManagerInternal == null) {
-@@ -412,6 +415,19 @@ public class DisplayPolicy {
+@@ -496,6 +499,19 @@ public class DisplayPolicy {
              mScreenOnEarly = true;
              mScreenOnFully = true;
          }
@@ -73,9 +73,9 @@ index c4cd1b4b..a75ba406 100644
 +            mOldMtkPerf = null;
 +        }
  
-         final Looper looper = UiThread.getHandler().getLooper();
-         mHandler = new PolicyHandler(looper);
-@@ -496,6 +512,17 @@ public class DisplayPolicy {
+         if (mPerf != null) {
+             SCROLL_BOOST_SS_ENABLE = Boolean.parseBoolean(mPerf.perfGetProp("vendor.perf.gestureflingboost.enable", "false"));
+@@ -586,6 +602,17 @@ public class DisplayPolicy {
                          mService.mPowerManagerInternal.setPowerBoost(
                                  Boost.INTERACTION, duration);
                      }
@@ -93,7 +93,7 @@ index c4cd1b4b..a75ba406 100644
                  }
  
                  @Override
-@@ -514,6 +541,28 @@ public class DisplayPolicy {
+@@ -604,6 +631,28 @@ public class DisplayPolicy {
                      if (listener != null) {
                          listener.onTouchStart();
                      }
@@ -121,7 +121,7 @@ index c4cd1b4b..a75ba406 100644
 +                    }
                  }
  
-                 @Override
+                     @Override
 -- 
-2.40.1
+2.34.1
 
diff --git a/patches/trebledroid/platform_frameworks_base/0033-Detect-Moto-dynamic-hardware-feature.patch b/patches/trebledroid/platform_frameworks_base/0033-Detect-Moto-dynamic-hardware-feature.patch
index b2d0475..340def4 100644
--- a/patches/trebledroid/platform_frameworks_base/0033-Detect-Moto-dynamic-hardware-feature.patch
+++ b/patches/trebledroid/platform_frameworks_base/0033-Detect-Moto-dynamic-hardware-feature.patch
@@ -1,7 +1,7 @@
-From 9adcc2c90fdd7894cb938a75974e46c1f10f11d3 Mon Sep 17 00:00:00 2001
+From efa112706d84d526ddf1834641239c610df2cdea Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 5 Jul 2023 10:50:36 -0400
-Subject: [PATCH 33/47] Detect Moto dynamic hardware feature
+Subject: [PATCH 33/46] Detect Moto dynamic hardware feature
 
 Moto added a custom node in sysconfig XMLs:
 <unavailable-feature-conditional />
diff --git a/patches/trebledroid/platform_frameworks_base/0034-Restore-getSimStateForSlotIndex-in-SubscriptionManag.patch b/patches/trebledroid/platform_frameworks_base/0034-Restore-getSimStateForSlotIndex-in-SubscriptionManag.patch
deleted file mode 100644
index 12071ec..0000000
--- a/patches/trebledroid/platform_frameworks_base/0034-Restore-getSimStateForSlotIndex-in-SubscriptionManag.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 1629fd7946e9c880d440912c55b7995acfd92770 Mon Sep 17 00:00:00 2001
-From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
-Date: Wed, 2 Aug 2023 20:59:53 +0800
-Subject: [PATCH 34/47] Restore getSimStateForSlotIndex in SubscriptionManager
-
-MTK IMS still needs it here
-
-Change-Id: I41bac57c68055f369232359a464642daab94403b
----
- .../android/telephony/SubscriptionManager.java     | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java
-index 64e43568e4d6..cfb4f12815a2 100644
---- a/telephony/java/android/telephony/SubscriptionManager.java
-+++ b/telephony/java/android/telephony/SubscriptionManager.java
-@@ -2549,6 +2549,20 @@ public class SubscriptionManager {
-         return TelephonyManager.getDefault().isNetworkRoaming(subId);
-     }
- 
-+    /**
-+     * Returns a constant indicating the state of sim for the slot index.
-+     *
-+     * @param slotIndex Logical SIM slot index.
-+     *
-+     * @see TelephonyManager.SimState
-+     *
-+     * @hide
-+     */
-+    @TelephonyManager.SimState
-+    public static int getSimStateForSlotIndex(int slotIndex) {
-+        return TelephonyManager.getSimStateForSlotIndex(slotIndex);
-+    }
-+
-     /**
-      * Set a field in the subscription database. Note not all fields are supported.
-      *
--- 
-2.25.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0035-Add-runWithCleanCallingIdentity-variant-with-both-ex.patch b/patches/trebledroid/platform_frameworks_base/0035-Add-runWithCleanCallingIdentity-variant-with-both-ex.patch
index 58a6e78..7d6da75 100644
--- a/patches/trebledroid/platform_frameworks_base/0035-Add-runWithCleanCallingIdentity-variant-with-both-ex.patch
+++ b/patches/trebledroid/platform_frameworks_base/0035-Add-runWithCleanCallingIdentity-variant-with-both-ex.patch
@@ -1,7 +1,7 @@
-From 58acd8488a8e14021c599da71c532d768518799a Mon Sep 17 00:00:00 2001
+From f0cf0e731a1e910cf8597df2cd9fbf26cda07e48 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 12 Aug 2023 20:11:17 +0800
-Subject: [PATCH 35/47] Add runWithCleanCallingIdentity variant with both
+Subject: [PATCH 35/46] Add runWithCleanCallingIdentity variant with both
  executor and return value
 
 This complements the fixup to ImsPhoneCallTracker (in fw/o/t) for U
diff --git a/patches/trebledroid/platform_frameworks_base/0036-Catch-NPE-in-SystemUI.patch b/patches/trebledroid/platform_frameworks_base/0036-Catch-NPE-in-SystemUI.patch
index 71e46ec..af88074 100644
--- a/patches/trebledroid/platform_frameworks_base/0036-Catch-NPE-in-SystemUI.patch
+++ b/patches/trebledroid/platform_frameworks_base/0036-Catch-NPE-in-SystemUI.patch
@@ -1,7 +1,7 @@
-From cf7d56710717b8d7a3271cb59f100cf77becfe56 Mon Sep 17 00:00:00 2001
+From adea8cbb79dbde2ca017e57a3e80ed16fab5ad21 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 6 Oct 2023 10:57:13 -0400
-Subject: [PATCH 36/47] Catch NPE in SystemUI
+Subject: [PATCH 36/46] Catch NPE in SystemUI
 
 No idea why it triggers, but it crashes SystemUI on boot for my TV
 device
@@ -10,10 +10,10 @@ device
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
-index 1a06b0184bc5..8535a27c8be5 100644
+index 1ae5d0a1a39d..a68be64f7747 100644
 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
 +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
-@@ -3323,7 +3323,11 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
+@@ -3451,7 +3451,11 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
          Trace.beginSection("KeyguardViewMediator#handleMotifyStartedWakingUp");
          synchronized (KeyguardViewMediator.this) {
              if (DEBUG) Log.d(TAG, "handleNotifyWakingUp");
diff --git a/patches/trebledroid/platform_frameworks_base/0037-Add-support-for-app-signature-spoofing.patch b/patches/trebledroid/platform_frameworks_base/0037-Add-support-for-app-signature-spoofing.patch
index d24e318..c460d0b 100644
--- a/patches/trebledroid/platform_frameworks_base/0037-Add-support-for-app-signature-spoofing.patch
+++ b/patches/trebledroid/platform_frameworks_base/0037-Add-support-for-app-signature-spoofing.patch
@@ -1,7 +1,7 @@
-From 1213711846da457a0973dc79ab9dbae7679d396d Mon Sep 17 00:00:00 2001
+From f0494e39fb6c96c0d0d0d0d08b8ae75b69601674 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Sat, 16 Oct 2021 05:27:57 -0700
-Subject: [PATCH 37/47] Add support for app signature spoofing
+Subject: [PATCH 37/46] Add support for app signature spoofing
 
 This is needed by microG GmsCore to pretend to be the official Google
 Play Services package, because client apps check the package signature
@@ -58,10 +58,10 @@ index 288ab479c0fb..2124d89c6e6f 100644
      field public static final String MICROPHONE = "android.permission-group.MICROPHONE";
      field public static final String NEARBY_DEVICES = "android.permission-group.NEARBY_DEVICES";
 diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
-index 2f9f6ae3f3c4..c4cde374ce58 100644
+index 8c9a3ff5149f..4a55643dc503 100644
 --- a/core/res/AndroidManifest.xml
 +++ b/core/res/AndroidManifest.xml
-@@ -4251,6 +4251,21 @@
+@@ -4250,6 +4250,21 @@
          android:description="@string/permdesc_getPackageSize"
          android:protectionLevel="normal" />
  
@@ -84,7 +84,7 @@ index 2f9f6ae3f3c4..c4cde374ce58 100644
           {@link android.content.pm.PackageManager#addPackageToPreferred}
           for details. -->
 diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
-index a5b2b853fddd..f8b48c55ce21 100644
+index 9c018c30f9e3..966fec172070 100644
 --- a/core/res/res/values/strings.xml
 +++ b/core/res/res/values/strings.xml
 @@ -991,6 +991,18 @@
diff --git a/patches/trebledroid/platform_frameworks_base/0038-Once-we-integrate-Samsung-Power-hal-in-libpowermanag.patch b/patches/trebledroid/platform_frameworks_base/0038-Once-we-integrate-Samsung-Power-hal-in-libpowermanag.patch
index 78c52b9..cf33f48 100644
--- a/patches/trebledroid/platform_frameworks_base/0038-Once-we-integrate-Samsung-Power-hal-in-libpowermanag.patch
+++ b/patches/trebledroid/platform_frameworks_base/0038-Once-we-integrate-Samsung-Power-hal-in-libpowermanag.patch
@@ -1,7 +1,7 @@
-From df176e589b203ecdd7350629e9c7364ccbc5d9c2 Mon Sep 17 00:00:00 2001
+From f8b6f79d0cd7d84706459b9b5108864aa7b827d3 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 27 Dec 2021 17:57:11 -0500
-Subject: [PATCH 38/47] Once we integrate Samsung Power hal in libpowermanager,
+Subject: [PATCH 38/46] Once we integrate Samsung Power hal in libpowermanager,
  libpowermanager and its deps require linking against
  vendor.samsung.hardware.miscpower@2.0
 
@@ -11,10 +11,10 @@ Change-Id: I9084f64e505009abe9420d28b44199605cee52d8
  1 file changed, 1 insertion(+)
 
 diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp
-index ea0da6918ecc..ccd13526cb16 100644
+index 36c13ca121e3..00e9cfa998b9 100644
 --- a/services/core/jni/Android.bp
 +++ b/services/core/jni/Android.bp
-@@ -203,6 +203,7 @@ cc_defaults {
+@@ -204,6 +204,7 @@ cc_defaults {
          "service.incremental",
          "vendor.samsung.hardware.light@2.0",
          "vendor.samsung.hardware.light@3.0",
diff --git a/patches/trebledroid/platform_frameworks_base/0039-FOD-support-for-Asus-Samsung-recent-Xiaomi-and-RedMa.patch b/patches/trebledroid/platform_frameworks_base/0039-FOD-support-for-Asus-Samsung-recent-Xiaomi-and-RedMa.patch
index 3279578..c046897 100644
--- a/patches/trebledroid/platform_frameworks_base/0039-FOD-support-for-Asus-Samsung-recent-Xiaomi-and-RedMa.patch
+++ b/patches/trebledroid/platform_frameworks_base/0039-FOD-support-for-Asus-Samsung-recent-Xiaomi-and-RedMa.patch
@@ -1,4 +1,4 @@
-From 1600492432074df3a62d721b4380c114c6d0662c Mon Sep 17 00:00:00 2001
+From 7cbd262cb3589b10116705b4d20ac860cd1db177 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] FOD support for Asus, Samsung recent Xiaomi and RedMagic 8
@@ -25,12 +25,12 @@ Change-Id: Ibd0f9ea8fba584a38c060fd9271549a5e106b4eb
  7 files changed, 578 insertions(+), 27 deletions(-)
 
 diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp
-index 3de183158..4bf60b878 100644
+index b73d16d5f..7dde3b645 100644
 --- a/packages/SystemUI/Android.bp
 +++ b/packages/SystemUI/Android.bp
-@@ -199,6 +199,10 @@ android_library {
+@@ -203,6 +203,10 @@ android_library {
+         "LowLightDreamLib",
          "motion_tool_lib",
-         "bcsmartspace-google",
          "vendor.lineage.powershare-V1.0-java",
 +        "vendor.goodix.hardware.biometrics.fingerprint-V2.1-java",
 +        "vendor.xiaomi.hw.touchfeature-V1.0-java",
@@ -40,10 +40,10 @@ index 3de183158..4bf60b878 100644
      manifest: "AndroidManifest.xml",
      additional_manifests: ["EvolutionManifest.xml"],
 diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java
-index c3a81db92..3788e6dda 100644
+index 6e1faaa32..9b783e24f 100644
 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java
 +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java
-@@ -53,6 +53,7 @@ import android.os.Handler;
+@@ -54,6 +54,7 @@ import android.os.Handler;
  import android.os.PowerManager;
  import android.os.Process;
  import android.os.Trace;
@@ -51,7 +51,7 @@ index c3a81db92..3788e6dda 100644
  import android.os.UserHandle;
  import android.os.VibrationAttributes;
  import android.os.VibrationEffect;
-@@ -119,9 +120,13 @@ import java.util.HashSet;
+@@ -124,9 +125,13 @@ import java.util.HashSet;
  import java.util.Optional;
  import java.util.Set;
  import java.util.concurrent.Executor;
@@ -65,7 +65,7 @@ index c3a81db92..3788e6dda 100644
  
  /**
   * Shows and hides the under-display fingerprint sensor (UDFPS) overlay, handles UDFPS touch events,
-@@ -264,6 +269,46 @@ public class UdfpsController implements DozeReceiver, Dumpable {
+@@ -280,6 +285,46 @@ public class UdfpsController implements DozeReceiver, Dumpable {
              mScreenOn = false;
          }
      };
@@ -112,7 +112,7 @@ index c3a81db92..3788e6dda 100644
  
      @Override
      public void dump(@NonNull PrintWriter pw, @NonNull String[] args) {
-@@ -1332,10 +1377,17 @@ public class UdfpsController implements DozeReceiver, Dumpable {
+@@ -1399,10 +1444,17 @@ public class UdfpsController implements DozeReceiver, Dumpable {
                  view.configureDisplay(() -> dispatchOnUiReady(requestId));
              }
          }
@@ -130,7 +130,7 @@ index c3a81db92..3788e6dda 100644
      }
  
      private void onFingerUp(long requestId, @NonNull UdfpsView view) {
-@@ -1386,6 +1438,10 @@ public class UdfpsController implements DozeReceiver, Dumpable {
+@@ -1453,6 +1505,10 @@ public class UdfpsController implements DozeReceiver, Dumpable {
                      mFingerprintManager.onPointerUp(requestId, mSensorProps.sensorId);
                  }
              }
@@ -142,10 +142,10 @@ index c3a81db92..3788e6dda 100644
                  cb.onFingerUp();
              }
 diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt
-index 909fcbf47..86adada21 100644
+index bca039f00..0e7315a90 100644
 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt
 +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt
-@@ -126,10 +126,8 @@ class UdfpsControllerOverlay @JvmOverloads constructor(
+@@ -135,10 +135,8 @@ class UdfpsControllerOverlay @JvmOverloads constructor(
          gravity = android.view.Gravity.TOP or android.view.Gravity.LEFT
          layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS
          flags = (Utils.FINGERPRINT_OVERLAY_LAYOUT_PARAM_FLAGS or
@@ -158,7 +158,7 @@ index 909fcbf47..86adada21 100644
          privateFlags = WindowManager.LayoutParams.PRIVATE_FLAG_TRUSTED_OVERLAY
          dimAmount = 0.0f
          // Avoid announcing window title.
-@@ -196,6 +194,9 @@ class UdfpsControllerOverlay @JvmOverloads constructor(
+@@ -205,6 +203,9 @@ class UdfpsControllerOverlay @JvmOverloads constructor(
                      windowManager.addView(this, coreLayoutParams.updateDimensions(animation))
                      sensorRect = sensorBounds
                      touchExplorationEnabled = accessibilityManager.isTouchExplorationEnabled
@@ -458,10 +458,10 @@ index ef7fcc954..3949d7baa 100644
      }
  }
 diff --git a/services/core/Android.bp b/services/core/Android.bp
-index 10fcbfffd..23d5e7d5b 100644
+index cee2d4a6d..1fae2afb4 100644
 --- a/services/core/Android.bp
 +++ b/services/core/Android.bp
-@@ -190,6 +190,11 @@ java_library_static {
+@@ -192,6 +192,11 @@ java_library_static {
          // HIDL
          "vendor.mediatek.hardware.mtkpower-V1.1-java",
          "vendor.samsung.hardware.sysinput-V1.2-java",
@@ -474,7 +474,7 @@ index 10fcbfffd..23d5e7d5b 100644
      javac_shard_size: 50,
      javacflags: [
 diff --git a/services/core/java/com/android/server/biometrics/AuthService.java b/services/core/java/com/android/server/biometrics/AuthService.java
-index 3df521a60..69b351fc3 100644
+index 3df521a60..8f37ab0f5 100644
 --- a/services/core/java/com/android/server/biometrics/AuthService.java
 +++ b/services/core/java/com/android/server/biometrics/AuthService.java
 @@ -78,6 +78,25 @@ import java.util.ArrayList;
@@ -827,26 +827,20 @@ index 3df521a60..69b351fc3 100644
 +    }
  }
 diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java
-index ece35c522..8c20b9e1b 100644
+index 5ce0c8b38..df99478da 100644
 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java
 +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java
-@@ -873,7 +873,6 @@ public class FingerprintService extends SystemService {
+@@ -885,8 +885,9 @@ public class FingerprintService extends SystemService {
+                         filteredInstances = filterAvailableHalInstances(hidlSensors, aidlSensors);
  
-             mRegistry.registerAll(() -> {
                  final List<ServiceProvider> providers = new ArrayList<>();
--                providers.addAll(getHidlProviders(hidlSensors));
-                 List<String> aidlSensors = new ArrayList<>();
-                 final String[] instances = mAidlInstanceNameSupplier.get();
-                 if (instances != null) {
-@@ -881,6 +880,8 @@ public class FingerprintService extends SystemService {
-                 }
-                 providers.addAll(getAidlProviders(
-                         Utils.filterAvailableHalInstances(getContext(), aidlSensors)));
+-                providers.addAll(getHidlProviders(filteredInstances.first));
+                 providers.addAll(getAidlProviders(filteredInstances.second));
 +                if (providers.isEmpty())
-+                    providers.addAll(getHidlProviders(hidlSensors));
++                    providers.addAll(getHidlProviders(filteredInstances.first));
+ 
                  return providers;
              });
-         }
 -- 
-2.40.1
+2.34.1
 
diff --git a/patches/trebledroid/platform_frameworks_base/0040-Fix-brightness-slider-curve-for-some-devices.patch b/patches/trebledroid/platform_frameworks_base/0040-Fix-brightness-slider-curve-for-some-devices.patch
index 8f44060..2f971bd 100644
--- a/patches/trebledroid/platform_frameworks_base/0040-Fix-brightness-slider-curve-for-some-devices.patch
+++ b/patches/trebledroid/platform_frameworks_base/0040-Fix-brightness-slider-curve-for-some-devices.patch
@@ -1,4 +1,4 @@
-From 80dc17ff3a339deb49a46fbe24d922b242ee7153 Mon Sep 17 00:00:00 2001
+From 679747f83df981a4ed3dcaf64f158c6b7db2c122 Mon Sep 17 00:00:00 2001
 From: ChonDoit <thphantomblog@gmail.com>
 Date: Thu, 24 Aug 2023 15:58:15 -0300
 Subject: [PATCH] Fix brightness slider curve for some devices
@@ -22,5 +22,5 @@ index 68bb378b8..8cc192f4f 100644
      public static final int GAMMA_SPACE_MIN = 0;
      public static final int GAMMA_SPACE_MAX = sysUseLowGamma ? 255 : 65535;
 -- 
-2.40.1
+2.34.1
 
diff --git a/patches/trebledroid/platform_frameworks_base/0041-Ignore-cgroup-creation-errors.patch b/patches/trebledroid/platform_frameworks_base/0041-Ignore-cgroup-creation-errors.patch
index 71ffdf8..c3ff4f5 100644
--- a/patches/trebledroid/platform_frameworks_base/0041-Ignore-cgroup-creation-errors.patch
+++ b/patches/trebledroid/platform_frameworks_base/0041-Ignore-cgroup-creation-errors.patch
@@ -1,40 +1,36 @@
-From 31c05c7ee91c3db99e2cb085e2ec0ee0c25c9539 Mon Sep 17 00:00:00 2001
+From 2b6e41766dc946720a33a832bb4cfe59e9c1adfa Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 18 Oct 2023 16:53:40 -0400
-Subject: [PATCH 41/44] Ignore cgroup creation errors
+Subject: [PATCH 41/46] Ignore cgroup creation errors
 
 For old kernels who don't have those modern cgroups
 ---
- core/jni/com_android_internal_os_Zygote.cpp               | 3 +++
+ core/jni/com_android_internal_os_Zygote.cpp               | 2 ++
  services/core/java/com/android/server/am/ProcessList.java | 5 -----
- 2 files changed, 3 insertions(+), 5 deletions(-)
+ 2 files changed, 2 insertions(+), 5 deletions(-)
 
 diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp
-index ce806a0fcc08..bac0c8315f26 100644
+index 56066b2d813c..4ee3e92910d0 100644
 --- a/core/jni/com_android_internal_os_Zygote.cpp
 +++ b/core/jni/com_android_internal_os_Zygote.cpp
-@@ -1805,6 +1805,8 @@ static void SpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArray gids,
+@@ -1806,10 +1806,12 @@ static void SpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArray gids,
      if (!is_system_server && getuid() == 0) {
          const int rc = createProcessGroup(uid, getpid());
          if (rc != 0) {
-+                ALOGE("createProcessGroup(%d, %d) failed: %s", uid, /* pid= */ 0, strerror(-rc));
 +#if 0
-             if (rc == -ESRCH) {
-                 // If process is dead, treat this as a non-fatal error
-                 ALOGE("createProcessGroup(%d, %d) failed: %s", uid, /* pid= */ 0, strerror(-rc));
-@@ -1814,6 +1816,7 @@ static void SpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArray gids,
-                                      : CREATE_ERROR("createProcessGroup(%d, %d) failed: %s", uid,
-                                                     /* pid= */ 0, strerror(-rc)));
-             }
+             fail_fn(rc == -EROFS ? CREATE_ERROR("createProcessGroup failed, kernel missing "
+                                                 "CONFIG_CGROUP_CPUACCT?")
+                                  : CREATE_ERROR("createProcessGroup(%d, %d) failed: %s", uid,
+                                                 /* pid= */ 0, strerror(-rc)));
 +#endif
          }
      }
  
 diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java
-index c5776d822c8f..1ea94f34596e 100644
+index b0f77604319b..23ca22fc73f4 100644
 --- a/services/core/java/com/android/server/am/ProcessList.java
 +++ b/services/core/java/com/android/server/am/ProcessList.java
-@@ -2432,14 +2432,9 @@ public final class ProcessList {
+@@ -2433,14 +2433,9 @@ public final class ProcessList {
                          // If we're not told to skip the process group creation, go create it.
                          final int res = Process.createProcessGroup(uid, startResult.pid);
                          if (res < 0) {
diff --git a/patches/trebledroid/platform_frameworks_base/0042-Samsung-tablets-use-SW_MACHINE_COVER-rather-than-SW_.patch b/patches/trebledroid/platform_frameworks_base/0042-Samsung-tablets-use-SW_MACHINE_COVER-rather-than-SW_.patch
index 59e9886..9b9ed24 100644
--- a/patches/trebledroid/platform_frameworks_base/0042-Samsung-tablets-use-SW_MACHINE_COVER-rather-than-SW_.patch
+++ b/patches/trebledroid/platform_frameworks_base/0042-Samsung-tablets-use-SW_MACHINE_COVER-rather-than-SW_.patch
@@ -1,7 +1,7 @@
-From 71de27bb909792591b2aeed08711143ed267679a Mon Sep 17 00:00:00 2001
+From eb2e703d2eda413383d0deaddb64f48ccde45ccc Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 18 Oct 2023 16:57:34 -0400
-Subject: [PATCH 42/44] Samsung tablets use SW_MACHINE_COVER rather than SW_LID
+Subject: [PATCH 42/46] Samsung tablets use SW_MACHINE_COVER rather than SW_LID
 
 So check whether SW_MACHINE_COVER is declared, then use it
 Otherwise stick to SW_LID
@@ -12,10 +12,10 @@ Should fix https://github.com/phhusson/treble_experimentations/issues/2572
  1 file changed, 21 insertions(+), 4 deletions(-)
 
 diff --git a/services/core/java/com/android/server/input/InputManagerService.java b/services/core/java/com/android/server/input/InputManagerService.java
-index 4cb22dbcf308..60d956cc0ba1 100644
+index ff69719c9497..3b168b59423a 100644
 --- a/services/core/java/com/android/server/input/InputManagerService.java
 +++ b/services/core/java/com/android/server/input/InputManagerService.java
-@@ -372,6 +372,9 @@ public class InputManagerService extends IInputManager.Stub
+@@ -369,6 +369,9 @@ public class InputManagerService extends IInputManager.Stub
      /** Switch code: Microphone. When set, the mic is muted. */
      public static final int SW_MUTE_DEVICE = 0x0e;
  
@@ -25,16 +25,16 @@ index 4cb22dbcf308..60d956cc0ba1 100644
      public static final int SW_LID_BIT = 1 << SW_LID;
      public static final int SW_TABLET_MODE_BIT = 1 << SW_TABLET_MODE;
      public static final int SW_KEYPAD_SLIDE_BIT = 1 << SW_KEYPAD_SLIDE;
-@@ -383,6 +386,8 @@ public class InputManagerService extends IInputManager.Stub
+@@ -380,6 +383,8 @@ public class InputManagerService extends IInputManager.Stub
              SW_HEADPHONE_INSERT_BIT | SW_MICROPHONE_INSERT_BIT | SW_JACK_PHYSICAL_INSERT_BIT | SW_LINEOUT_INSERT_BIT;
      public static final int SW_CAMERA_LENS_COVER_BIT = 1 << SW_CAMERA_LENS_COVER;
      public static final int SW_MUTE_DEVICE_BIT = 1 << SW_MUTE_DEVICE;
 +    public static final int SW_MACHINE_COVER_BIT = 1 << SW_MACHINE_COVER;
 +    private int mSwForLid = SW_LID;
  
-     private final String mVelocityTrackerStrategy;
- 
-@@ -473,6 +478,16 @@ public class InputManagerService extends IInputManager.Stub
+     // The following are layer numbers used for z-ordering the input overlay layers on the display.
+     // This is used for ordering layers inside {@code DisplayContent#getInputOverlayLayer()}.
+@@ -488,6 +493,16 @@ public class InputManagerService extends IInputManager.Stub
          mWiredAccessoryCallbacks = callbacks;
      }
  
@@ -51,7 +51,7 @@ index 4cb22dbcf308..60d956cc0ba1 100644
      void registerLidSwitchCallbackInternal(@NonNull LidSwitchCallback callback) {
          synchronized (mLidSwitchLock) {
              mLidSwitchCallbacks.add(callback);
-@@ -481,7 +496,8 @@ public class InputManagerService extends IInputManager.Stub
+@@ -496,7 +511,8 @@ public class InputManagerService extends IInputManager.Stub
              // state will be reported as KEY_STATE_UNKNOWN. The callback will be triggered in
              // systemRunning().
              if (mSystemReady) {
@@ -61,7 +61,7 @@ index 4cb22dbcf308..60d956cc0ba1 100644
                          == KEY_STATE_UP;
                  callback.notifyLidSwitchChanged(0 /* whenNanos */, lidOpen);
              }
-@@ -517,7 +533,8 @@ public class InputManagerService extends IInputManager.Stub
+@@ -534,7 +550,8 @@ public class InputManagerService extends IInputManager.Stub
  
              // Send the initial lid switch state to any callback registered before the system was
              // ready.
@@ -71,7 +71,7 @@ index 4cb22dbcf308..60d956cc0ba1 100644
              for (int i = 0; i < mLidSwitchCallbacks.size(); i++) {
                  LidSwitchCallback callback = mLidSwitchCallbacks.get(i);
                  callback.notifyLidSwitchChanged(0 /* whenNanos */, switchState == KEY_STATE_UP);
-@@ -2311,8 +2328,8 @@ public class InputManagerService extends IInputManager.Stub
+@@ -2328,8 +2345,8 @@ public class InputManagerService extends IInputManager.Stub
                      + ", mask=" + Integer.toHexString(switchMask));
          }
  
diff --git a/patches/trebledroid/platform_frameworks_base/0043-Revert-Removed-IWLAN-legacy-mode-support.patch b/patches/trebledroid/platform_frameworks_base/0043-Revert-Removed-IWLAN-legacy-mode-support.patch
index 6eb6aa6..dd7ee12 100644
--- a/patches/trebledroid/platform_frameworks_base/0043-Revert-Removed-IWLAN-legacy-mode-support.patch
+++ b/patches/trebledroid/platform_frameworks_base/0043-Revert-Removed-IWLAN-legacy-mode-support.patch
@@ -1,7 +1,7 @@
-From e7b0fccd5b75604218aac4dc8b961e83033905dc Mon Sep 17 00:00:00 2001
+From d9bfdcb5622bbb94a1ac5e9f3e4a5caecc15bf2a Mon Sep 17 00:00:00 2001
 From: Alberto Ponces <ponces26@gmail.com>
 Date: Fri, 20 Oct 2023 09:26:19 +0000
-Subject: [PATCH 43/44] Revert "Removed IWLAN legacy mode support"
+Subject: [PATCH 43/46] Revert "Removed IWLAN legacy mode support"
 
 This reverts commit 2832dee607ab33eee688abea206f4adfcfc896f1.
 ---
@@ -9,7 +9,7 @@ This reverts commit 2832dee607ab33eee688abea206f4adfcfc896f1.
  1 file changed, 20 insertions(+), 10 deletions(-)
 
 diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java
-index 523d0b0e55f4..96387a489dcc 100644
+index 74cfbea91e00..698a106582d3 100644
 --- a/telephony/java/android/telephony/ServiceState.java
 +++ b/telephony/java/android/telephony/ServiceState.java
 @@ -1213,8 +1213,13 @@ public class ServiceState implements Parcelable {
diff --git a/patches/trebledroid/platform_frameworks_base/0044-Add-a-prop-to-use-linear-backlight-control.patch b/patches/trebledroid/platform_frameworks_base/0044-Add-a-prop-to-use-linear-backlight-control.patch
index cdc0bbe..c1277e7 100644
--- a/patches/trebledroid/platform_frameworks_base/0044-Add-a-prop-to-use-linear-backlight-control.patch
+++ b/patches/trebledroid/platform_frameworks_base/0044-Add-a-prop-to-use-linear-backlight-control.patch
@@ -1,17 +1,17 @@
-From c0baf7dc997b3c1f0f318521eff78e00e5c45808 Mon Sep 17 00:00:00 2001
+From 0d0f917e63141f3d31b87fdcb2f2231c545c85d1 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 30 Oct 2023 19:25:27 -0400
-Subject: [PATCH 44/44] Add a prop to use linear backlight control
+Subject: [PATCH 44/46] Add a prop to use linear backlight control
 
 ---
  .../settings/brightness/BrightnessController.java      | 10 ++++++++--
  1 file changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessController.java b/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessController.java
-index 9594ba374fc3..8f3bd542c876 100644
+index 6af9b739da52..65e32255dcad 100644
 --- a/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessController.java
 +++ b/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessController.java
-@@ -326,9 +326,15 @@ public class BrightnessController implements ToggleSlider.Listener, MirroredBrig
+@@ -346,9 +346,15 @@ public class BrightnessController implements ToggleSlider.Listener, MirroredBrig
                  : MetricsEvent.ACTION_BRIGHTNESS;
          minBacklight = mBrightnessMin;
          maxBacklight = mBrightnessMax;
@@ -28,7 +28,7 @@ index 9594ba374fc3..8f3bd542c876 100644
          if (stopTracking) {
              // TODO(brightnessfloat): change to use float value instead.
              MetricsLogger.action(mContext, metric,
-@@ -339,7 +345,7 @@ public class BrightnessController implements ToggleSlider.Listener, MirroredBrig
+@@ -359,7 +365,7 @@ public class BrightnessController implements ToggleSlider.Listener, MirroredBrig
          if (!tracking) {
              AsyncTask.execute(new Runnable() {
                      public void run() {
diff --git a/patches/trebledroid/platform_frameworks_base/0045-fix-fod-Extra-Dim-overlap-fod-overlay.patch b/patches/trebledroid/platform_frameworks_base/0045-fix-fod-Extra-Dim-overlap-fod-overlay.patch
index eafd41d..1beecd4 100644
--- a/patches/trebledroid/platform_frameworks_base/0045-fix-fod-Extra-Dim-overlap-fod-overlay.patch
+++ b/patches/trebledroid/platform_frameworks_base/0045-fix-fod-Extra-Dim-overlap-fod-overlay.patch
@@ -1,26 +1,26 @@
-From e2f079e9b30c1b103a86ee37e4e607cdf26c0ad9 Mon Sep 17 00:00:00 2001
+From 92870f74f6fcc5119a581ed81e2aa2b9db2ffc91 Mon Sep 17 00:00:00 2001
 From: MrHereAndThere <38396158+boydaihungst@users.noreply.github.com>
 Date: Fri, 17 Nov 2023 09:22:29 +0700
-Subject: [PATCH 45/46] fix(fod): Extra Dim overlap fod overlay
+Subject: [PATCH] fix(fod): Extra Dim overlap fod overlay
 
 Extra Dim will set display panel brightness to lowest value possible, which will also effect FOD overlay.
 ---
- .../systemui/biometrics/UdfpsController.java  | 20 +++++++++++++++++--
- 1 file changed, 18 insertions(+), 2 deletions(-)
+ .../systemui/biometrics/UdfpsController.java  | 19 ++++++++++++++++++-
+ 1 file changed, 18 insertions(+), 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 19b67b5f3def..ef5e4f617138 100644
+index 9b783e24f..cedfda5a6 100644
 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java
 +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java
-@@ -42,6 +42,7 @@ import android.hardware.fingerprint.FingerprintSensorProperties;
+@@ -47,6 +47,7 @@ import android.hardware.fingerprint.FingerprintSensorProperties;
  import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
  import android.hardware.fingerprint.IUdfpsOverlayController;
  import android.hardware.fingerprint.IUdfpsOverlayControllerCallback;
 +import android.hardware.display.ColorDisplayManager;
  import android.hardware.input.InputManager;
+ import android.net.Uri;
  import android.os.Build;
- import android.os.Handler;
-@@ -184,6 +185,8 @@ public class UdfpsController implements DozeReceiver, Dumpable {
+@@ -195,6 +196,8 @@ public class UdfpsController implements DozeReceiver, Dumpable {
      @NonNull private final UdfpsUtils mUdfpsUtils;
      @NonNull private final InputManager mInputManager;
      @NonNull private final UdfpsKeyguardAccessibilityDelegate mUdfpsKeyguardAccessibilityDelegate;
@@ -29,7 +29,7 @@ index 19b67b5f3def..ef5e4f617138 100644
      private final boolean mIgnoreRefreshRate;
  
      // Currently the UdfpsController supports a single UDFPS sensor. If devices have multiple
-@@ -898,7 +901,8 @@ public class UdfpsController implements DozeReceiver, Dumpable {
+@@ -948,7 +951,8 @@ public class UdfpsController implements DozeReceiver, Dumpable {
              @NonNull UdfpsUtils udfpsUtils,
              @NonNull KeyguardFaceAuthInteractor keyguardFaceAuthInteractor,
              @NonNull UdfpsKeyguardAccessibilityDelegate udfpsKeyguardAccessibilityDelegate,
@@ -39,7 +39,7 @@ index 19b67b5f3def..ef5e4f617138 100644
          mContext = context;
          mExecution = execution;
          mVibrator = vibrator;
-@@ -945,6 +949,7 @@ public class UdfpsController implements DozeReceiver, Dumpable {
+@@ -996,6 +1000,7 @@ public class UdfpsController implements DozeReceiver, Dumpable {
          mUdfpsUtils = udfpsUtils;
          mInputManager = inputManager;
          mUdfpsKeyguardAccessibilityDelegate = udfpsKeyguardAccessibilityDelegate;
@@ -47,19 +47,18 @@ index 19b67b5f3def..ef5e4f617138 100644
  
          mTouchProcessor = mFeatureFlags.isEnabled(Flags.UDFPS_NEW_TOUCH_DETECTION)
                  ? singlePointerTouchProcessor : null;
-@@ -1025,7 +1030,10 @@ public class UdfpsController implements DozeReceiver, Dumpable {
+@@ -1149,6 +1154,10 @@ public class UdfpsController implements DozeReceiver, Dumpable {
  
-     private void showUdfpsOverlay(@NonNull UdfpsControllerOverlay overlay) {
+     private void hideUdfpsOverlay() {
          mExecution.assertIsMainThread();
--
 +        mIgnoreExtraDim = mColorDisplayManager.isReduceBrightColorsActivated();
 +        if (mIgnoreExtraDim) {
 +            Log.d(TAG, "Current extra dim state (showUdfpsOverlay): " + mIgnoreExtraDim);
 +        }
-         mOverlay = overlay;
-         final int requestReason = overlay.getRequestReason();
-         if (requestReason == REASON_AUTH_KEYGUARD
-@@ -1244,6 +1252,10 @@ public class UdfpsController implements DozeReceiver, Dumpable {
+ 
+         if (mOverlay != null) {
+             // Reset the controller back to its starting state.
+@@ -1402,6 +1411,10 @@ public class UdfpsController implements DozeReceiver, Dumpable {
              return;
          }
          if (isOptical()) {
@@ -70,7 +69,7 @@ index 19b67b5f3def..ef5e4f617138 100644
              mLatencyTracker.onActionStart(LatencyTracker.ACTION_UDFPS_ILLUMINATE);
          }
          // Refresh screen timeout and boost process priority if possible.
-@@ -1330,6 +1342,10 @@ public class UdfpsController implements DozeReceiver, Dumpable {
+@@ -1488,6 +1501,10 @@ public class UdfpsController implements DozeReceiver, Dumpable {
          mActivePointerId = -1;
          mAcquiredReceived = false;
          if (mOnFingerDown) {
@@ -82,5 +81,5 @@ index 19b67b5f3def..ef5e4f617138 100644
                  mBiometricExecutor.execute(() -> {
                      mAlternateTouchProvider.onPointerUp(requestId);
 -- 
-2.25.1
+2.34.1
 
diff --git a/patches/trebledroid/platform_frameworks_libs_net/0001-Restore-back-the-behavior-of-isValid-It-is-legal-to-.patch b/patches/trebledroid/platform_frameworks_libs_net/0001-Restore-back-the-behavior-of-isValid-It-is-legal-to-.patch
index 507bc2e..8ecda34 100644
--- a/patches/trebledroid/platform_frameworks_libs_net/0001-Restore-back-the-behavior-of-isValid-It-is-legal-to-.patch
+++ b/patches/trebledroid/platform_frameworks_libs_net/0001-Restore-back-the-behavior-of-isValid-It-is-legal-to-.patch
@@ -1,4 +1,4 @@
-From 8d695b3a2448e132263dd993265e95361bbb8540 Mon Sep 17 00:00:00 2001
+From 59ec627f36542896a6d839cd33796c9fa79a8b40 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 26 Oct 2022 18:02:18 -0400
 Subject: [PATCH] Restore back the behavior of isValid(): It is legal to have
diff --git a/patches/trebledroid/platform_frameworks_native/0001-On-Samsung-we-need-to-send-a-hack-message-to-HAL-to-.patch b/patches/trebledroid/platform_frameworks_native/0001-On-Samsung-we-need-to-send-a-hack-message-to-HAL-to-.patch
index 461c9c8..ac046e2 100644
--- a/patches/trebledroid/platform_frameworks_native/0001-On-Samsung-we-need-to-send-a-hack-message-to-HAL-to-.patch
+++ b/patches/trebledroid/platform_frameworks_native/0001-On-Samsung-we-need-to-send-a-hack-message-to-HAL-to-.patch
@@ -1,8 +1,8 @@
-From aebe42c92ee6101179d0f53216db245575eff123 Mon Sep 17 00:00:00 2001
+From 626a012830935f544a350cb6c05b78460e13deb2 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 14 Aug 2019 23:37:10 +0200
-Subject: [PATCH 1/8] On Samsung, we need to send a hack-message to HAL to get
- all Sensors
+Subject: [PATCH 01/10] On Samsung, we need to send a hack-message to HAL to
+ get all Sensors
 
 Change-Id: Id6a1fa48340de61c418493668e9abd22c2599376
 ---
diff --git a/patches/trebledroid/platform_frameworks_native/0002-Matching-an-input-with-a-display-uses-uniqueId.patch b/patches/trebledroid/platform_frameworks_native/0002-Matching-an-input-with-a-display-uses-uniqueId.patch
index 995f669..3b48b87 100644
--- a/patches/trebledroid/platform_frameworks_native/0002-Matching-an-input-with-a-display-uses-uniqueId.patch
+++ b/patches/trebledroid/platform_frameworks_native/0002-Matching-an-input-with-a-display-uses-uniqueId.patch
@@ -1,7 +1,7 @@
-From 384d42fd907cc47e6bb057aee4021a888663b89e Mon Sep 17 00:00:00 2001
+From 78027d1c82159858474b14b4dd2d95c2c305a64a Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 22 Oct 2020 23:22:46 +0200
-Subject: [PATCH 2/8] Matching an input with a display uses uniqueId
+Subject: [PATCH 02/10] Matching an input with a display uses uniqueId
 
 Not all devices have a `location`, notably bluetooth devices.
 However, we might still want to associate them with a screen,
diff --git a/patches/trebledroid/platform_frameworks_native/0003-unshared_oob-didn-t-exist-in-O-P-so-detect-its-suppo.patch b/patches/trebledroid/platform_frameworks_native/0003-unshared_oob-didn-t-exist-in-O-P-so-detect-its-suppo.patch
index 8ffd4ec..797e65f 100644
--- a/patches/trebledroid/platform_frameworks_native/0003-unshared_oob-didn-t-exist-in-O-P-so-detect-its-suppo.patch
+++ b/patches/trebledroid/platform_frameworks_native/0003-unshared_oob-didn-t-exist-in-O-P-so-detect-its-suppo.patch
@@ -1,8 +1,8 @@
-From 88885ee67a4b6d37e1607b25f3c17ecab04772eb Mon Sep 17 00:00:00 2001
+From 5d0af52e702f3d2baf418d375440029bae1c9524 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 5 Jan 2021 23:44:00 +0100
-Subject: [PATCH 3/8] unshared_oob didn't exist in O/P, so detect its supported
- based on vndk version
+Subject: [PATCH 03/10] unshared_oob didn't exist in O/P, so detect its
+ supported based on vndk version
 
 ---
  cmds/installd/migrate_legacy_obb_data.sh | 2 +-
diff --git a/patches/trebledroid/platform_frameworks_native/0004-Remove-Samsung-system-permission-on-sensors.patch b/patches/trebledroid/platform_frameworks_native/0004-Remove-Samsung-system-permission-on-sensors.patch
index b16030d..93c0624 100644
--- a/patches/trebledroid/platform_frameworks_native/0004-Remove-Samsung-system-permission-on-sensors.patch
+++ b/patches/trebledroid/platform_frameworks_native/0004-Remove-Samsung-system-permission-on-sensors.patch
@@ -1,7 +1,7 @@
-From 37956832948b4a3dad64aa06d1c155a5418145fa Mon Sep 17 00:00:00 2001
+From 7f81aa8ae94a4853a919bd697aba67c361377b15 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 31 Mar 2021 23:36:03 +0200
-Subject: [PATCH 4/8] Remove Samsung system permission on sensors
+Subject: [PATCH 04/10] Remove Samsung system permission on sensors
 
 ---
  libs/sensor/Sensor.cpp              | 1 +
diff --git a/patches/trebledroid/platform_frameworks_native/0005-Mark-accelerometer-input-as-sensor-exclusively-if-th.patch b/patches/trebledroid/platform_frameworks_native/0005-Mark-accelerometer-input-as-sensor-exclusively-if-th.patch
index 9bc24d8..a1105bd 100644
--- a/patches/trebledroid/platform_frameworks_native/0005-Mark-accelerometer-input-as-sensor-exclusively-if-th.patch
+++ b/patches/trebledroid/platform_frameworks_native/0005-Mark-accelerometer-input-as-sensor-exclusively-if-th.patch
@@ -1,7 +1,7 @@
-From f4ecf382a6a93dc0e970c499a12c15647cc74d24 Mon Sep 17 00:00:00 2001
+From 3c78e805a8896f00c48336f1d2ad626a547f3c15 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 12 Dec 2021 08:45:36 -0500
-Subject: [PATCH 5/8] Mark accelerometer input as sensor exclusively if there
+Subject: [PATCH 05/10] Mark accelerometer input as sensor exclusively if there
  are ABS axis
 
 The reason this is needed is that on -fucked up- Xiami Mi A2 Lite and
@@ -15,10 +15,10 @@ Change-Id: I491ab89724c908ef09a23a6427d24a8889bf806a
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/services/inputflinger/reader/EventHub.cpp b/services/inputflinger/reader/EventHub.cpp
-index 0354164155..f0fcd56540 100644
+index 44e80a732c..88dd11467b 100644
 --- a/services/inputflinger/reader/EventHub.cpp
 +++ b/services/inputflinger/reader/EventHub.cpp
-@@ -2341,7 +2341,13 @@ void EventHub::openDeviceLocked(const std::string& devicePath) {
+@@ -2339,7 +2339,13 @@ void EventHub::openDeviceLocked(const std::string& devicePath) {
  
      // Check whether this device is an accelerometer.
      if (device->propBitmask.test(INPUT_PROP_ACCELEROMETER)) {
diff --git a/patches/trebledroid/platform_frameworks_native/0006-MIUI13-devices-hide-their-vibrator-HAL-behind-non-de.patch b/patches/trebledroid/platform_frameworks_native/0006-MIUI13-devices-hide-their-vibrator-HAL-behind-non-de.patch
index 379b9ed..93d0d80 100644
--- a/patches/trebledroid/platform_frameworks_native/0006-MIUI13-devices-hide-their-vibrator-HAL-behind-non-de.patch
+++ b/patches/trebledroid/platform_frameworks_native/0006-MIUI13-devices-hide-their-vibrator-HAL-behind-non-de.patch
@@ -1,8 +1,8 @@
-From 39d7a358622fc48f3eb66be6ee0d4d49da8cebd6 Mon Sep 17 00:00:00 2001
+From 859000f5700481d40e21edb3c82343a2837b336a Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 25 Mar 2022 05:37:56 -0400
-Subject: [PATCH 6/8] MIUI13 devices hide their vibrator HAL behind non-default
- name: "vibratorfeature"
+Subject: [PATCH 06/10] MIUI13 devices hide their vibrator HAL behind
+ non-default name: "vibratorfeature"
 
 ---
  services/vibratorservice/VibratorHalController.cpp | 6 ++++++
diff --git a/patches/trebledroid/platform_frameworks_native/0007-powermanager-Add-support-Samsung-miscpower-HAL.patch b/patches/trebledroid/platform_frameworks_native/0007-powermanager-Add-support-Samsung-miscpower-HAL.patch
index 0c7b53f..31a5393 100644
--- a/patches/trebledroid/platform_frameworks_native/0007-powermanager-Add-support-Samsung-miscpower-HAL.patch
+++ b/patches/trebledroid/platform_frameworks_native/0007-powermanager-Add-support-Samsung-miscpower-HAL.patch
@@ -1,7 +1,7 @@
-From c017671a27c9c1290c1a46b24790b8454a2c9a03 Mon Sep 17 00:00:00 2001
+From ee29ecd4e2ee1a6fb04a3a2bf3f036bc567766d0 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 27 Dec 2021 18:00:43 -0500
-Subject: [PATCH 7/8] powermanager: Add support Samsung miscpower HAL
+Subject: [PATCH 07/10] powermanager: Add support Samsung miscpower HAL
 
 Several various configurations need to be supported:
 - Android Pie vendors have a android.hardware.power HIDL default + "miscpower"
diff --git a/patches/trebledroid/platform_frameworks_native/0008-FOD-support-for-Samsung-and-Asus.patch b/patches/trebledroid/platform_frameworks_native/0008-FOD-support-for-Samsung-and-Asus.patch
index 644bf1e..f27783e 100644
--- a/patches/trebledroid/platform_frameworks_native/0008-FOD-support-for-Samsung-and-Asus.patch
+++ b/patches/trebledroid/platform_frameworks_native/0008-FOD-support-for-Samsung-and-Asus.patch
@@ -1,7 +1,7 @@
-From ff9f10a985972242dd06e975275c469c279c9293 Mon Sep 17 00:00:00 2001
+From 3dfb2a604c9c9633c29c9b80484e1da0c3b723ce Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 18 Dec 2022 18:17:30 -0500
-Subject: [PATCH 8/8] FOD support for Samsung and Asus
+Subject: [PATCH 08/10] FOD support for Samsung and Asus
 
 ---
  libs/gui/BLASTBufferQueue.cpp                 | 20 ++++++++++++++--
@@ -19,7 +19,7 @@ Subject: [PATCH 8/8] FOD support for Samsung and Asus
  12 files changed, 77 insertions(+), 5 deletions(-)
 
 diff --git a/libs/gui/BLASTBufferQueue.cpp b/libs/gui/BLASTBufferQueue.cpp
-index 5c324b29cd..01b6eb5f1b 100644
+index 207fa4fd31..a162658e30 100644
 --- a/libs/gui/BLASTBufferQueue.cpp
 +++ b/libs/gui/BLASTBufferQueue.cpp
 @@ -35,12 +35,21 @@
@@ -100,18 +100,18 @@ index b6274ab9c0..f35009fe28 100644
  
      // Combinations that are only allowed with gralloc 4.1.
 diff --git a/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp b/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp
-index 0ac0ecb727..b563132281 100644
+index fc5f8ca1d3..4b81cc1df0 100644
 --- a/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp
 +++ b/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp
-@@ -27,6 +27,7 @@
+@@ -26,6 +26,7 @@
  #include "system/graphics-base-v1.0.h"
  
- #include <ui/DataspaceUtils.h>
+ #include <ui/HdrRenderTypeUtils.h>
 +#include <cutils/properties.h>
  
  // TODO(b/129481165): remove the #pragma below and fix conversion issues
  #pragma clang diagnostic push
-@@ -37,6 +38,9 @@
+@@ -36,6 +37,9 @@
  // TODO(b/129481165): remove the #pragma below and fix conversion issues
  #pragma clang diagnostic pop // ignored "-Wconversion"
  
@@ -121,7 +121,7 @@ index 0ac0ecb727..b563132281 100644
  using aidl::android::hardware::graphics::composer3::Composition;
  
  namespace android::compositionengine {
-@@ -432,6 +436,26 @@ void OutputLayer::writeOutputDependentGeometryStateToHWC(HWC2::Layer* hwcLayer,
+@@ -438,6 +442,26 @@ void OutputLayer::writeOutputDependentGeometryStateToHWC(HWC2::Layer* hwcLayer,
                                                       ->getHeight()));
      }
  
@@ -167,10 +167,10 @@ index c0eb36dc02..782e22cbc2 100644
  } // namespace Hwc2
  } // namespace android
 diff --git a/services/surfaceflinger/DisplayHardware/AidlComposerHal.h b/services/surfaceflinger/DisplayHardware/AidlComposerHal.h
-index b8ae26f879..c8dc40955c 100644
+index 8d21b491c3..349278771d 100644
 --- a/services/surfaceflinger/DisplayHardware/AidlComposerHal.h
 +++ b/services/surfaceflinger/DisplayHardware/AidlComposerHal.h
-@@ -237,6 +237,8 @@ public:
+@@ -238,6 +238,8 @@ public:
      Error setHdrConversionStrategy(HdrConversionStrategy, Hdr*) override;
      Error setRefreshRateChangedCallbackDebugEnabled(Display, bool) override;
  
diff --git a/patches/trebledroid/platform_frameworks_native/0009-Add-MTK-GED-KPI-support-to-fix-broken-Mediatek-gpufr.patch b/patches/trebledroid/platform_frameworks_native/0009-Add-MTK-GED-KPI-support-to-fix-broken-Mediatek-gpufr.patch
index 1f28bbb..60d19c1 100644
--- a/patches/trebledroid/platform_frameworks_native/0009-Add-MTK-GED-KPI-support-to-fix-broken-Mediatek-gpufr.patch
+++ b/patches/trebledroid/platform_frameworks_native/0009-Add-MTK-GED-KPI-support-to-fix-broken-Mediatek-gpufr.patch
@@ -1,7 +1,7 @@
-From a695e2d74ee804856e3a5066068d2092d23e4fc6 Mon Sep 17 00:00:00 2001
+From 262f0d377f410ee646defdc80d977292d09f3743 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 25 Nov 2023 08:15:28 -0500
-Subject: [PATCH 09/10] Add MTK GED KPI support to fix broken Mediatek gpufreq
+Subject: [PATCH] Add MTK GED KPI support to fix broken Mediatek gpufreq
 
 Mediatek GPU scheduler likes to have the timestamps of the frames to be
 able to adjust DVFS.
@@ -17,12 +17,12 @@ than just standard DVFS.
 Thanks @sarthakroy2002 for the help and support (other people helped as
 well)
 ---
- libs/gui/Surface.cpp           | 202 +++++++++++++++++++++++++++++++++
+ libs/gui/Surface.cpp           | 201 +++++++++++++++++++++++++++++++++
  libs/gui/include/gui/Surface.h |   3 +
- 2 files changed, 205 insertions(+)
+ 2 files changed, 204 insertions(+)
 
 diff --git a/libs/gui/Surface.cpp b/libs/gui/Surface.cpp
-index 53a2f64d11..1eb40aa3c1 100644
+index a22b6ca..171ad41 100644
 --- a/libs/gui/Surface.cpp
 +++ b/libs/gui/Surface.cpp
 @@ -24,6 +24,9 @@
@@ -35,17 +35,17 @@ index 53a2f64d11..1eb40aa3c1 100644
  
  #include <inttypes.h>
  
-@@ -49,6 +52,9 @@
+@@ -49,7 +52,9 @@
  #include <gui/LayerState.h>
  #include <private/gui/ComposerService.h>
  #include <private/gui/ComposerServiceAIDL.h>
 +#include <android-base/properties.h>
-+
-+#include <binder/IPCThreadState.h>
  
- namespace android {
- 
-@@ -72,6 +78,37 @@ bool isInterceptorRegistrationOp(int op) {
++#include <binder/IPCThreadState.h>
+ #include <string>
+ #include <sys/ioctl.h>
+ #include <fcntl.h>
+@@ -249,6 +254,37 @@ inline static void feasDisconnect(const uint64_t& identifier) {
  }
  
  } // namespace
@@ -83,7 +83,7 @@ index 53a2f64d11..1eb40aa3c1 100644
  
  Surface::Surface(const sp<IGraphicBufferProducer>& bufferProducer, bool controlledByApp,
                   const sp<IBinder>& surfaceControlHandle)
-@@ -124,6 +161,47 @@ Surface::Surface(const sp<IGraphicBufferProducer>& bufferProducer, bool controll
+@@ -301,6 +337,47 @@ Surface::Surface(const sp<IGraphicBufferProducer>& bufferProducer, bool controll
      mSwapIntervalZero = false;
      mMaxBufferCount = NUM_BUFFER_SLOTS;
      mSurfaceControlHandle = surfaceControlHandle;
@@ -131,7 +131,7 @@ index 53a2f64d11..1eb40aa3c1 100644
  }
  
  Surface::~Surface() {
-@@ -643,6 +721,36 @@ int Surface::dequeueBuffer(android_native_buffer_t** buffer, int* fenceFd) {
+@@ -820,6 +897,36 @@ int Surface::dequeueBuffer(android_native_buffer_t** buffer, int* fenceFd) {
          }
      }
  
@@ -168,7 +168,7 @@ index 53a2f64d11..1eb40aa3c1 100644
      if (fence->isValid()) {
          *fenceFd = fence->dup();
          if (*fenceFd == -1) {
-@@ -1086,6 +1194,60 @@ void Surface::onBufferQueuedLocked(int slot, sp<Fence> fence,
+@@ -1263,6 +1370,60 @@ void Surface::onBufferQueuedLocked(int slot, sp<Fence> fence,
      }
  
      mQueueBufferCondition.broadcast();
@@ -229,7 +229,7 @@ index 53a2f64d11..1eb40aa3c1 100644
  
      if (CC_UNLIKELY(atrace_is_tag_enabled(ATRACE_TAG_GRAPHICS))) {
          static gui::FenceMonitor gpuCompletionThread("GPU completion");
-@@ -1853,6 +2015,46 @@ int Surface::connect(
+@@ -2038,6 +2199,46 @@ int Surface::connect(
  
          mConsumerRunningBehind = (output.numPendingBuffers >= 2);
      }
@@ -277,7 +277,7 @@ index 53a2f64d11..1eb40aa3c1 100644
          mConnectedToCpu = true;
          // Clear the dirty region in case we're switching from a non-CPU API
 diff --git a/libs/gui/include/gui/Surface.h b/libs/gui/include/gui/Surface.h
-index 39a59e42aa..ff595dd188 100644
+index 39a59e4..ff595dd 100644
 --- a/libs/gui/include/gui/Surface.h
 +++ b/libs/gui/include/gui/Surface.h
 @@ -638,6 +638,9 @@ protected:
@@ -291,5 +291,5 @@ index 39a59e42aa..ff595dd188 100644
  
  } // namespace android
 -- 
-2.25.1
+2.34.1
 
diff --git a/patches/trebledroid/platform_frameworks_opt_net_ims/0001-Pie-MTK-IMS-calls-static-ImsManager.updateImsService.patch b/patches/trebledroid/platform_frameworks_opt_net_ims/0001-Pie-MTK-IMS-calls-static-ImsManager.updateImsService.patch
index c16564b..f41f25c 100644
--- a/patches/trebledroid/platform_frameworks_opt_net_ims/0001-Pie-MTK-IMS-calls-static-ImsManager.updateImsService.patch
+++ b/patches/trebledroid/platform_frameworks_opt_net_ims/0001-Pie-MTK-IMS-calls-static-ImsManager.updateImsService.patch
@@ -1,4 +1,4 @@
-From bf201d96538a54998774dbe9f04e3b0ddd587487 Mon Sep 17 00:00:00 2001
+From 671ea085bf35f02d76e16131404a32a41b9eb23e Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 14 Nov 2021 13:47:29 -0500
 Subject: [PATCH] Pie MTK IMS calls static
diff --git a/patches/trebledroid/platform_frameworks_opt_telephony/0001-SubscriptionController-Do-not-override-default-calli.patch b/patches/trebledroid/platform_frameworks_opt_telephony/0001-SubscriptionController-Do-not-override-default-calli.patch
index 6c85c08..0b12590 100644
--- a/patches/trebledroid/platform_frameworks_opt_telephony/0001-SubscriptionController-Do-not-override-default-calli.patch
+++ b/patches/trebledroid/platform_frameworks_opt_telephony/0001-SubscriptionController-Do-not-override-default-calli.patch
@@ -1,4 +1,4 @@
-From 0fe03c946b6978f567f397589129523e1eedadfb Mon Sep 17 00:00:00 2001
+From 7d143a73d28ae80ef40b039ccfc5cd4ec952375d Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Mon, 5 Sep 2022 14:02:37 -0400
 Subject: [PATCH 01/11] SubscriptionController: Do not override default calling
@@ -18,7 +18,7 @@ Change-Id: Iccab64e9b3b3ab4773bd8944d47c2006f229d472
  1 file changed, 17 insertions(+), 1 deletion(-)
 
 diff --git a/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java b/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java
-index 8e773c072d..1efe9ba3b4 100644
+index b462daf041..d9d5345825 100644
 --- a/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java
 +++ b/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java
 @@ -78,6 +78,7 @@ import android.util.Base64;
@@ -29,7 +29,7 @@ index 8e773c072d..1efe9ba3b4 100644
  
  import com.android.internal.R;
  import com.android.internal.annotations.VisibleForTesting;
-@@ -2839,7 +2840,22 @@ public class SubscriptionManagerService extends ISub.Stub {
+@@ -2847,7 +2848,22 @@ public class SubscriptionManagerService extends ISub.Stub {
  
                  TelecomManager telecomManager = mContext.getSystemService(TelecomManager.class);
                  if (telecomManager != null) {
diff --git a/patches/trebledroid/platform_frameworks_opt_telephony/0002-Telephony-Don-not-call-onUssdRelease-for-Huawei-RIL.patch b/patches/trebledroid/platform_frameworks_opt_telephony/0002-Telephony-Don-not-call-onUssdRelease-for-Huawei-RIL.patch
index ca1af7e..05828db 100644
--- a/patches/trebledroid/platform_frameworks_opt_telephony/0002-Telephony-Don-not-call-onUssdRelease-for-Huawei-RIL.patch
+++ b/patches/trebledroid/platform_frameworks_opt_telephony/0002-Telephony-Don-not-call-onUssdRelease-for-Huawei-RIL.patch
@@ -1,4 +1,4 @@
-From b53a8aa2cf0ed2c5c9d626f590288a2e4e51d9c4 Mon Sep 17 00:00:00 2001
+From 03634ac2829ad0e1031e7aee76d8c5c37ca27847 Mon Sep 17 00:00:00 2001
 From: Artem Borisov <dedsa2002@gmail.com>
 Date: Sat, 10 Nov 2018 17:19:17 +0000
 Subject: [PATCH 02/11] Telephony: Don not call onUssdRelease for Huawei RIL
@@ -13,10 +13,10 @@ Change-Id: I69faed1c51d4582834879975d6ab13daf7f48ad4
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/src/java/com/android/internal/telephony/GsmCdmaPhone.java b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
-index 5eae06112c..2116dc7f7e 100644
+index 6e2601e635..e48d10e8b5 100644
 --- a/src/java/com/android/internal/telephony/GsmCdmaPhone.java
 +++ b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
-@@ -2971,7 +2971,11 @@ public class GsmCdmaPhone extends Phone {
+@@ -2973,7 +2973,11 @@ public class GsmCdmaPhone extends Phone {
          if (found != null) {
              // Complete pending USSD
              if (isUssdRelease) {
diff --git a/patches/trebledroid/platform_frameworks_opt_telephony/0003-Fix-baseband-being-too-long-to-fit-into-a-91-chars-p.patch b/patches/trebledroid/platform_frameworks_opt_telephony/0003-Fix-baseband-being-too-long-to-fit-into-a-91-chars-p.patch
index 0754e01..77c8916 100644
--- a/patches/trebledroid/platform_frameworks_opt_telephony/0003-Fix-baseband-being-too-long-to-fit-into-a-91-chars-p.patch
+++ b/patches/trebledroid/platform_frameworks_opt_telephony/0003-Fix-baseband-being-too-long-to-fit-into-a-91-chars-p.patch
@@ -1,4 +1,4 @@
-From 48569205a4d36141584dc879bf8806a852baad42 Mon Sep 17 00:00:00 2001
+From 813621855b2221af6444e751af328717f850395f Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 6 Dec 2021 16:28:22 -0500
 Subject: [PATCH 03/11] Fix baseband being too long to fit into a 91 chars
@@ -10,10 +10,10 @@ Change-Id: I1762e4a8cc137626be89f350229d6be162bdaf57
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/java/com/android/internal/telephony/GsmCdmaPhone.java b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
-index 2116dc7f7e..34af3f1256 100644
+index e48d10e8b5..3e97f0ab32 100644
 --- a/src/java/com/android/internal/telephony/GsmCdmaPhone.java
 +++ b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
-@@ -3286,7 +3286,7 @@ public class GsmCdmaPhone extends Phone {
+@@ -3288,7 +3288,7 @@ public class GsmCdmaPhone extends Phone {
                  String version = (String)ar.result;
                  if (version != null) {
                      int length = version.length();
diff --git a/patches/trebledroid/platform_frameworks_opt_telephony/0005-Fix-signalstrength-for-huawei-kirin-hi6250-hi3670.patch b/patches/trebledroid/platform_frameworks_opt_telephony/0005-Fix-signalstrength-for-huawei-kirin-hi6250-hi3670.patch
index 3dfdb1f..ac640e0 100644
--- a/patches/trebledroid/platform_frameworks_opt_telephony/0005-Fix-signalstrength-for-huawei-kirin-hi6250-hi3670.patch
+++ b/patches/trebledroid/platform_frameworks_opt_telephony/0005-Fix-signalstrength-for-huawei-kirin-hi6250-hi3670.patch
@@ -1,4 +1,4 @@
-From 20748e3c5508725c893ee6f52a58eb66a0865598 Mon Sep 17 00:00:00 2001
+From 7931aae2ec6768100170b67520512119e9d6e94b Mon Sep 17 00:00:00 2001
 From: Raphael Mounier <mounierr07@gmail.com>
 Date: Thu, 6 Oct 2022 08:35:38 +0200
 Subject: [PATCH 05/11] Fix signalstrength for huawei kirin (hi6250, hi3670)
diff --git a/patches/trebledroid/platform_frameworks_opt_telephony/0006-telephony-forward-port-support-for-forceCognitive.patch b/patches/trebledroid/platform_frameworks_opt_telephony/0006-telephony-forward-port-support-for-forceCognitive.patch
index d36388e..d64bc08 100644
--- a/patches/trebledroid/platform_frameworks_opt_telephony/0006-telephony-forward-port-support-for-forceCognitive.patch
+++ b/patches/trebledroid/platform_frameworks_opt_telephony/0006-telephony-forward-port-support-for-forceCognitive.patch
@@ -1,4 +1,4 @@
-From c2b3f07945a05d386d2b538acdcf57186a4daae6 Mon Sep 17 00:00:00 2001
+From 82ce22b4fdf4ed53e175889531fc2e9b96239468 Mon Sep 17 00:00:00 2001
 From: corneranchu <corneranchu@gmail.com>
 Date: Sat, 1 Oct 2022 01:49:58 +0000
 Subject: [PATCH 06/11] telephony: forward-port support for forceCognitive
diff --git a/patches/trebledroid/platform_frameworks_opt_telephony/0008-Fix-NPE-with-1.0-and-1.1-CardStatus.patch b/patches/trebledroid/platform_frameworks_opt_telephony/0008-Fix-NPE-with-1.0-and-1.1-CardStatus.patch
index 6d21d90..1dc25bf 100644
--- a/patches/trebledroid/platform_frameworks_opt_telephony/0008-Fix-NPE-with-1.0-and-1.1-CardStatus.patch
+++ b/patches/trebledroid/platform_frameworks_opt_telephony/0008-Fix-NPE-with-1.0-and-1.1-CardStatus.patch
@@ -1,4 +1,4 @@
-From c244e37c04e1c9601d11544adac52051159a7972 Mon Sep 17 00:00:00 2001
+From 1b8794951b91612a5628d759302aff0cb84660db Mon Sep 17 00:00:00 2001
 From: Christian Hoffmann <chrmhoffmann@gmail.com>
 Date: Fri, 21 Oct 2022 12:58:04 +0200
 Subject: [PATCH 08/11] Fix NPE with 1.0 and 1.1 CardStatus
diff --git a/patches/trebledroid/platform_frameworks_opt_telephony/0010-When-logging-UiccSlot-ignore-error-if-we-cant-print-.patch b/patches/trebledroid/platform_frameworks_opt_telephony/0010-When-logging-UiccSlot-ignore-error-if-we-cant-print-.patch
index d98ece8..bd3ece1 100644
--- a/patches/trebledroid/platform_frameworks_opt_telephony/0010-When-logging-UiccSlot-ignore-error-if-we-cant-print-.patch
+++ b/patches/trebledroid/platform_frameworks_opt_telephony/0010-When-logging-UiccSlot-ignore-error-if-we-cant-print-.patch
@@ -1,4 +1,4 @@
-From 08eca1bfdc1644bb5d507a2738c8f827933901e0 Mon Sep 17 00:00:00 2001
+From dcef2cbbca1b4f74579893b601f1f65d42a2ca1a Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 17 Oct 2023 11:08:06 -0400
 Subject: [PATCH 10/11] When logging UiccSlot, ignore error if we cant print
diff --git a/patches/trebledroid/platform_frameworks_opt_telephony/0011-Revert-Removed-IWLAN-legacy-mode-support.patch b/patches/trebledroid/platform_frameworks_opt_telephony/0011-Revert-Removed-IWLAN-legacy-mode-support.patch
deleted file mode 100644
index 158fbbc..0000000
--- a/patches/trebledroid/platform_frameworks_opt_telephony/0011-Revert-Removed-IWLAN-legacy-mode-support.patch
+++ /dev/null
@@ -1,439 +0,0 @@
-From d349626689ae331e9598c5a6f62e0c54e8932a3f Mon Sep 17 00:00:00 2001
-From: Alberto Ponces <ponces26@gmail.com>
-Date: Fri, 20 Oct 2023 09:11:55 +0000
-Subject: [PATCH 11/11] Revert "Removed IWLAN legacy mode support"
-
-This reverts commit d8d3ed41243ba1fc4b5a5a2a6e30be3f6a404a9d.
-
-Change-Id: I1fd5a803ea3b01f902ff14e1ee6225312b2d3206
----
- .../telephony/ServiceStateTracker.java        |  65 +++++++++--
- .../telephony/data/AccessNetworksManager.java | 110 +++++++++++++++---
- .../telephony/data/DataNetworkController.java |  10 +-
- .../internal/telephony/imsphone/ImsPhone.java |  42 ++++++-
- 4 files changed, 190 insertions(+), 37 deletions(-)
-
-diff --git a/src/java/com/android/internal/telephony/ServiceStateTracker.java b/src/java/com/android/internal/telephony/ServiceStateTracker.java
-index 50eea7f695..33a04fb830 100644
---- a/src/java/com/android/internal/telephony/ServiceStateTracker.java
-+++ b/src/java/com/android/internal/telephony/ServiceStateTracker.java
-@@ -659,7 +659,7 @@ public class ServiceStateTracker extends Handler {
- 
-         mAccessNetworksManager = mPhone.getAccessNetworksManager();
-         mOutOfServiceSS = new ServiceState();
--        mOutOfServiceSS.setOutOfService(false);
-+        mOutOfServiceSS.setOutOfService(mAccessNetworksManager.isInLegacyMode(), false);
- 
-         for (int transportType : mAccessNetworksManager.getAvailableTransports()) {
-             mRegStateManagers.append(transportType, new NetworkRegistrationManager(
-@@ -776,9 +776,9 @@ public class ServiceStateTracker extends Handler {
-         }
- 
-         mSS = new ServiceState();
--        mSS.setOutOfService(false);
-+        mSS.setOutOfService(mAccessNetworksManager.isInLegacyMode(), false);
-         mNewSS = new ServiceState();
--        mNewSS.setOutOfService(false);
-+        mNewSS.setOutOfService(mAccessNetworksManager.isInLegacyMode(), false);
-         mLastCellInfoReqTime = 0;
-         mLastCellInfoList = null;
-         mStartedGprsRegCheck = false;
-@@ -3308,7 +3308,7 @@ public class ServiceStateTracker extends Handler {
-                 nri = mNewSS.getNetworkRegistrationInfo(
-                         NetworkRegistrationInfo.DOMAIN_PS,
-                         AccessNetworkConstants.TRANSPORT_TYPE_WLAN);
--                mNewSS.setOutOfService(false);
-+                mNewSS.setOutOfService(mAccessNetworksManager.isInLegacyMode(), false);
-                 // Add the IWLAN registration info back to service state.
-                 if (nri != null) {
-                     mNewSS.addNetworkRegistrationInfo(nri);
-@@ -3325,7 +3325,7 @@ public class ServiceStateTracker extends Handler {
-                 nri = mNewSS.getNetworkRegistrationInfo(
-                         NetworkRegistrationInfo.DOMAIN_PS,
-                         AccessNetworkConstants.TRANSPORT_TYPE_WLAN);
--                mNewSS.setOutOfService(true);
-+                mNewSS.setOutOfService(mAccessNetworksManager.isInLegacyMode(), true);
-                 // Add the IWLAN registration info back to service state.
-                 if (nri != null) {
-                     mNewSS.addNetworkRegistrationInfo(nri);
-@@ -3452,10 +3452,14 @@ public class ServiceStateTracker extends Handler {
-                 mSS.getState() == ServiceState.STATE_POWER_OFF
-                         && mNewSS.getState() != ServiceState.STATE_POWER_OFF;
- 
--        SparseBooleanArray hasDataAttached = new SparseBooleanArray();
--        SparseBooleanArray hasDataDetached = new SparseBooleanArray();
--        SparseBooleanArray hasRilDataRadioTechnologyChanged = new SparseBooleanArray();
--        SparseBooleanArray hasDataRegStateChanged = new SparseBooleanArray();
-+        SparseBooleanArray hasDataAttached = new SparseBooleanArray(
-+                mAccessNetworksManager.getAvailableTransports().length);
-+        SparseBooleanArray hasDataDetached = new SparseBooleanArray(
-+                mAccessNetworksManager.getAvailableTransports().length);
-+        SparseBooleanArray hasRilDataRadioTechnologyChanged = new SparseBooleanArray(
-+                mAccessNetworksManager.getAvailableTransports().length);
-+        SparseBooleanArray hasDataRegStateChanged = new SparseBooleanArray(
-+                mAccessNetworksManager.getAvailableTransports().length);
-         boolean anyDataRegChanged = false;
-         boolean anyDataRatChanged = false;
-         boolean hasAlphaRawChanged =
-@@ -3641,7 +3645,7 @@ public class ServiceStateTracker extends Handler {
-         ServiceState oldMergedSS = new ServiceState(mPhone.getServiceState());
-         mSS = new ServiceState(mNewSS);
- 
--        mNewSS.setOutOfService(false);
-+        mNewSS.setOutOfService(mAccessNetworksManager.isInLegacyMode(), false);
- 
-         mCellIdentity = primaryCellIdentity;
-         if (mSS.getState() == ServiceState.STATE_IN_SERVICE && primaryCellIdentity != null) {
-@@ -5503,7 +5507,8 @@ public class ServiceStateTracker extends Handler {
-     }
- 
-     /**
--     * This method makes some adjustments when the device camps on IWLAN in airplane mode.
-+     * This method adds IWLAN registration info for legacy mode devices camped on IWLAN. It also
-+     * makes some adjustments when the device camps on IWLAN in airplane mode.
-      */
-     private void processIwlanRegistrationInfo() {
-         if (mCi.getRadioState() == TelephonyManager.RADIO_POWER_OFF) {
-@@ -5517,7 +5522,7 @@ public class ServiceStateTracker extends Handler {
-             }
-             // operator info should be kept in SS
-             String operator = mNewSS.getOperatorAlphaLong();
--            mNewSS.setOutOfService(true);
-+            mNewSS.setOutOfService(mAccessNetworksManager.isInLegacyMode(), true);
-             if (resetIwlanRatVal) {
-                 mNewSS.setDataRegState(ServiceState.STATE_IN_SERVICE);
-                 NetworkRegistrationInfo nri = new NetworkRegistrationInfo.Builder()
-@@ -5527,6 +5532,17 @@ public class ServiceStateTracker extends Handler {
-                         .setRegistrationState(NetworkRegistrationInfo.REGISTRATION_STATE_HOME)
-                         .build();
-                 mNewSS.addNetworkRegistrationInfo(nri);
-+                if (mAccessNetworksManager.isInLegacyMode()) {
-+                    // If in legacy mode, simulate the behavior that IWLAN registration info
-+                    // is reported through WWAN transport.
-+                    nri = new NetworkRegistrationInfo.Builder()
-+                            .setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
-+                            .setDomain(NetworkRegistrationInfo.DOMAIN_PS)
-+                            .setAccessNetworkTechnology(TelephonyManager.NETWORK_TYPE_IWLAN)
-+                            .setRegistrationState(NetworkRegistrationInfo.REGISTRATION_STATE_HOME)
-+                            .build();
-+                    mNewSS.addNetworkRegistrationInfo(nri);
-+                }
-                 mNewSS.setOperatorAlphaLong(operator);
-                 // Since it's in airplane mode, cellular must be out of service. The only possible
-                 // transport for data to go through is the IWLAN transport. Setting this to true
-@@ -5536,6 +5552,31 @@ public class ServiceStateTracker extends Handler {
-             }
-             return;
-         }
-+
-+        // If the device operates in legacy mode and camps on IWLAN, modem reports IWLAN as a RAT
-+        // through WWAN registration info. To be consistent with the behavior with AP-assisted mode,
-+        // we manually make a WLAN registration info for clients to consume. In this scenario,
-+        // both WWAN and WLAN registration info are the IWLAN registration info and that's the
-+        // unfortunate limitation we have when the device operates in legacy mode. In AP-assisted
-+        // mode, the WWAN registration will correctly report the actual cellular registration info
-+        // when the device camps on IWLAN.
-+        if (mAccessNetworksManager.isInLegacyMode()) {
-+            NetworkRegistrationInfo wwanNri = mNewSS.getNetworkRegistrationInfo(
-+                    NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN);
-+            if (wwanNri != null && wwanNri.getAccessNetworkTechnology()
-+                    == TelephonyManager.NETWORK_TYPE_IWLAN) {
-+                NetworkRegistrationInfo wlanNri = new NetworkRegistrationInfo.Builder()
-+                        .setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WLAN)
-+                        .setDomain(NetworkRegistrationInfo.DOMAIN_PS)
-+                        .setRegistrationState(wwanNri.getNetworkRegistrationState())
-+                        .setAccessNetworkTechnology(TelephonyManager.NETWORK_TYPE_IWLAN)
-+                        .setRejectCause(wwanNri.getRejectCause())
-+                        .setEmergencyOnly(wwanNri.isEmergencyEnabled())
-+                        .setAvailableServices(wwanNri.getAvailableServices())
-+                        .build();
-+                mNewSS.addNetworkRegistrationInfo(wlanNri);
-+            }
-+        }
-     }
- 
-     /**
-diff --git a/src/java/com/android/internal/telephony/data/AccessNetworksManager.java b/src/java/com/android/internal/telephony/data/AccessNetworksManager.java
-index 267f70b389..73f4c7b847 100644
---- a/src/java/com/android/internal/telephony/data/AccessNetworksManager.java
-+++ b/src/java/com/android/internal/telephony/data/AccessNetworksManager.java
-@@ -16,9 +16,12 @@
- 
- package com.android.internal.telephony.data;
- 
-+import static android.telephony.TelephonyManager.HAL_SERVICE_DATA;
-+
- import android.annotation.CallbackExecutor;
- import android.annotation.NonNull;
- import android.annotation.Nullable;
-+import android.annotation.StringDef;
- import android.content.ComponentName;
- import android.content.Context;
- import android.content.Intent;
-@@ -32,6 +35,7 @@ import android.os.PersistableBundle;
- import android.os.Registrant;
- import android.os.RegistrantList;
- import android.os.RemoteException;
-+import android.os.SystemProperties;
- import android.telephony.AccessNetworkConstants;
- import android.telephony.AccessNetworkConstants.AccessNetworkType;
- import android.telephony.AccessNetworkConstants.RadioAccessNetworkType;
-@@ -52,11 +56,14 @@ import android.util.LocalLog;
- import android.util.SparseArray;
- 
- import com.android.internal.telephony.Phone;
-+import com.android.internal.telephony.RIL;
- import com.android.internal.telephony.SlidingWindowEventCounter;
- import com.android.telephony.Rlog;
- 
- import java.io.FileDescriptor;
- import java.io.PrintWriter;
-+import java.lang.annotation.Retention;
-+import java.lang.annotation.RetentionPolicy;
- import java.util.ArrayList;
- import java.util.Arrays;
- import java.util.List;
-@@ -74,6 +81,35 @@ import java.util.stream.Collectors;
-  */
- public class AccessNetworksManager extends Handler {
-     private static final boolean DBG = false;
-+    public static final String SYSTEM_PROPERTIES_IWLAN_OPERATION_MODE =
-+            "ro.telephony.iwlan_operation_mode";
-+
-+    @Retention(RetentionPolicy.SOURCE)
-+    @StringDef(prefix = {"IWLAN_OPERATION_MODE_"},
-+            value = {
-+                    IWLAN_OPERATION_MODE_DEFAULT,
-+                    IWLAN_OPERATION_MODE_LEGACY,
-+                    IWLAN_OPERATION_MODE_AP_ASSISTED})
-+    public @interface IwlanOperationMode {}
-+
-+    /**
-+     * IWLAN default mode. On device that has IRadio 1.4 or above, it means
-+     * {@link #IWLAN_OPERATION_MODE_AP_ASSISTED}. On device that has IRadio 1.3 or below, it means
-+     * {@link #IWLAN_OPERATION_MODE_LEGACY}.
-+     */
-+    public static final String IWLAN_OPERATION_MODE_DEFAULT = "default";
-+
-+    /**
-+     * IWLAN legacy mode. IWLAN is completely handled by the modem, and when the device is on
-+     * IWLAN, modem reports IWLAN as a RAT.
-+     */
-+    public static final String IWLAN_OPERATION_MODE_LEGACY = "legacy";
-+
-+    /**
-+     * IWLAN application processor assisted mode. IWLAN is handled by the bound IWLAN data service
-+     * and network service separately.
-+     */
-+    public static final String IWLAN_OPERATION_MODE_AP_ASSISTED = "AP-assisted";
- 
-     /** Event to guide a transport type for initial data connection of emergency data network. */
-     private static final int EVENT_GUIDE_TRANSPORT_TYPE_FOR_EMERGENCY = 1;
-@@ -344,21 +380,29 @@ public class AccessNetworksManager extends Handler {
-                 Context.CARRIER_CONFIG_SERVICE);
-         mLogTag = "ANM-" + mPhone.getPhoneId();
-         mApnTypeToQnsChangeNetworkCounter = new SparseArray<>();
--        mAvailableTransports = new int[]{AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
--                AccessNetworkConstants.TRANSPORT_TYPE_WLAN};
--
--        // bindQualifiedNetworksService posts real work to handler thread. So here we can
--        // let the callback execute in binder thread to avoid post twice.
--        mCarrierConfigManager.registerCarrierConfigChangeListener(Runnable::run,
--                (slotIndex, subId, carrierId, specificCarrierId) -> {
--                    if (slotIndex != mPhone.getPhoneId()) return;
--                    // We should wait for carrier config changed event because the target binding
--                    // package name can come from the carrier config. Note that we still get this
--                    // event even when SIM is absent.
--                    if (DBG) log("Carrier config changed. Try to bind qualified network service.");
--                    bindQualifiedNetworksService();
--                });
--        bindQualifiedNetworksService();
-+        if (isInLegacyMode()) {
-+            log("operates in legacy mode.");
-+            // For legacy mode, WWAN is the only transport to handle all data connections, even
-+            // the IWLAN ones.
-+            mAvailableTransports = new int[]{AccessNetworkConstants.TRANSPORT_TYPE_WWAN};
-+        } else {
-+            log("operates in AP-assisted mode.");
-+            mAvailableTransports = new int[]{AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
-+                    AccessNetworkConstants.TRANSPORT_TYPE_WLAN};
-+
-+            // bindQualifiedNetworksService posts real work to handler thread. So here we can
-+            // let the callback execute in binder thread to avoid post twice.
-+            mCarrierConfigManager.registerCarrierConfigChangeListener(Runnable::run,
-+                    (slotIndex, subId, carrierId, specificCarrierId) -> {
-+                        if (slotIndex != mPhone.getPhoneId()) return;
-+                        // We should wait for carrier config changed event because the target binding
-+                        // package name can come from the carrier config. Note that we still get this
-+                        // event even when SIM is absent.
-+                        if (DBG) log("Carrier config changed. Try to bind qualified network service.");
-+                        bindQualifiedNetworksService();
-+                    });
-+            bindQualifiedNetworksService();
-+        }
- 
-         // Using post to delay the registering because data retry manager and data config
-         // manager instances are created later than access networks manager.
-@@ -463,7 +507,8 @@ public class AccessNetworksManager extends Handler {
-     /**
-      * Get the qualified network service package.
-      *
--     * @return package name of the qualified networks service package.
-+     * @return package name of the qualified networks service package. Return empty string when in
-+     * legacy mode (i.e. Dedicated IWLAN data/network service is not supported).
-      */
-     private String getQualifiedNetworksServicePackageName() {
-         // Read package name from the resource
-@@ -552,9 +597,30 @@ public class AccessNetworksManager extends Handler {
-     }
- 
-     /**
--     * @return The available transports.
-+     * @return {@code true} if the device operates in legacy mode, otherwise {@code false}.
-      */
--    public @NonNull int[] getAvailableTransports() {
-+    public boolean isInLegacyMode() {
-+        // Get IWLAN operation mode from the system property. If the system property is configured
-+        // to default or not configured, the mode is tied to IRadio version. For 1.4 or above, it's
-+        // AP-assisted mode, for 1.3 or below, it's legacy mode.
-+        String mode = SystemProperties.get(SYSTEM_PROPERTIES_IWLAN_OPERATION_MODE);
-+
-+        if (mode.equals(IWLAN_OPERATION_MODE_AP_ASSISTED)) {
-+            return false;
-+        } else if (mode.equals(IWLAN_OPERATION_MODE_LEGACY)) {
-+            return true;
-+        }
-+
-+        return mPhone.getHalVersion(HAL_SERVICE_DATA).less(RIL.RADIO_HAL_VERSION_1_4);
-+    }
-+
-+    /**
-+     * @return The available transports. Note that on legacy devices, the only available transport
-+     * would be WWAN only. If the device is configured as AP-assisted mode, the available transport
-+     * will always be WWAN and WLAN (even if the device is not camped on IWLAN).
-+     * See {@link #isInLegacyMode()} for mode details.
-+     */
-+    public synchronized @NonNull int[] getAvailableTransports() {
-         return mAvailableTransports;
-     }
- 
-@@ -589,6 +655,11 @@ public class AccessNetworksManager extends Handler {
-      * @return The preferred transport.
-      */
-     public @TransportType int getPreferredTransport(@ApnType int apnType) {
-+        // In legacy mode, always preferred on cellular.
-+        if (isInLegacyMode()) {
-+            return AccessNetworkConstants.TRANSPORT_TYPE_WWAN;
-+        }
-+
-         return mPreferredTransports.get(apnType) == null
-                 ? AccessNetworkConstants.TRANSPORT_TYPE_WWAN : mPreferredTransports.get(apnType);
-     }
-@@ -691,6 +762,9 @@ public class AccessNetworksManager extends Handler {
-         }
- 
-         pw.decreaseIndent();
-+        pw.println("isInLegacy=" + isInLegacyMode());
-+        pw.println("IWLAN operation mode="
-+                + SystemProperties.get(SYSTEM_PROPERTIES_IWLAN_OPERATION_MODE));
-         pw.println("Local logs=");
-         pw.increaseIndent();
-         mLocalLog.dump(fd, pw, args);
-diff --git a/src/java/com/android/internal/telephony/data/DataNetworkController.java b/src/java/com/android/internal/telephony/data/DataNetworkController.java
-index 127400bb05..28ada4ab7a 100644
---- a/src/java/com/android/internal/telephony/data/DataNetworkController.java
-+++ b/src/java/com/android/internal/telephony/data/DataNetworkController.java
-@@ -984,10 +984,12 @@ public class DataNetworkController extends Handler {
-         mDataServiceManagers.get(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
-                 .registerForServiceBindingChanged(this, EVENT_DATA_SERVICE_BINDING_CHANGED);
- 
--        mPhone.getServiceStateTracker().registerForServiceStateChanged(this,
--                EVENT_SERVICE_STATE_CHANGED, null);
--        mDataServiceManagers.get(AccessNetworkConstants.TRANSPORT_TYPE_WLAN)
--                .registerForServiceBindingChanged(this, EVENT_DATA_SERVICE_BINDING_CHANGED);
-+        if (!mAccessNetworksManager.isInLegacyMode()) {
-+            mPhone.getServiceStateTracker().registerForServiceStateChanged(this,
-+                    EVENT_SERVICE_STATE_CHANGED, null);
-+            mDataServiceManagers.get(AccessNetworkConstants.TRANSPORT_TYPE_WLAN)
-+                    .registerForServiceBindingChanged(this, EVENT_DATA_SERVICE_BINDING_CHANGED);
-+        }
- 
-         mPhone.getContext().getSystemService(TelephonyRegistryManager.class)
-                 .addOnSubscriptionsChangedListener(new OnSubscriptionsChangedListener() {
-diff --git a/src/java/com/android/internal/telephony/imsphone/ImsPhone.java b/src/java/com/android/internal/telephony/imsphone/ImsPhone.java
-index 4b150cc533..47f107e50e 100644
---- a/src/java/com/android/internal/telephony/imsphone/ImsPhone.java
-+++ b/src/java/com/android/internal/telephony/imsphone/ImsPhone.java
-@@ -483,7 +483,11 @@ public class ImsPhone extends ImsPhoneBase {
-         mCT.registerPhoneStateListener(mExternalCallTracker);
-         mExternalCallTracker.setCallPuller(mCT);
- 
--        mSS.setOutOfService(false);
-+        boolean legacyMode = true;
-+        if (mDefaultPhone.getAccessNetworksManager() != null) {
-+            legacyMode = mDefaultPhone.getAccessNetworksManager().isInLegacyMode();
-+        }
-+        mSS.setOutOfService(legacyMode, false);
- 
-         mPhoneId = mDefaultPhone.getPhoneId();
- 
-@@ -2405,7 +2409,7 @@ public class ImsPhone extends ImsPhoneBase {
-     /**
-      * Update roaming state and WFC mode in the following situations:
-      *     1) voice is in service.
--     *     2) data is in service.
-+     *     2) data is in service and it is not IWLAN (if in legacy mode).
-      * @param ss non-null ServiceState
-      */
-     private void updateRoamingState(ServiceState ss) {
-@@ -2426,7 +2430,15 @@ public class ImsPhone extends ImsPhoneBase {
-             logi("updateRoamingState: we are not IN_SERVICE, ignoring roaming change.");
-             return;
-         }
--
-+        // We ignore roaming changes when moving to IWLAN because it always sets the roaming
-+        // mode to home and masks the actual cellular roaming status if voice is not registered. If
-+        // we just moved to IWLAN because WFC roaming mode is IWLAN preferred and WFC home mode is
-+        // cell preferred, we can get into a condition where the modem keeps bouncing between
-+        // IWLAN->cell->IWLAN->cell...
-+        if (isCsNotInServiceAndPsWwanReportingWlan(ss)) {
-+            logi("updateRoamingState: IWLAN masking roaming, ignore roaming change.");
-+            return;
-+        }
-         if (mCT.getState() == PhoneConstants.State.IDLE) {
-             if (DBG) logd("updateRoamingState now: " + newRoamingState);
-             mLastKnownRoamingState = newRoamingState;
-@@ -2445,6 +2457,30 @@ public class ImsPhone extends ImsPhoneBase {
-         }
-     }
- 
-+    /**
-+     * In legacy mode, data registration will report IWLAN when we are using WLAN for data,
-+     * effectively masking the true roaming state of the device if voice is not registered.
-+     *
-+     * @return true if we are reporting not in service for CS domain over WWAN transport and WLAN
-+     * for PS domain over WWAN transport.
-+     */
-+    private boolean isCsNotInServiceAndPsWwanReportingWlan(ServiceState ss) {
-+        // We can not get into this condition if we are in AP-Assisted mode.
-+        if (mDefaultPhone.getAccessNetworksManager() == null
-+                || !mDefaultPhone.getAccessNetworksManager().isInLegacyMode()) {
-+            return false;
-+        }
-+        NetworkRegistrationInfo csInfo = ss.getNetworkRegistrationInfo(
-+                NetworkRegistrationInfo.DOMAIN_CS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN);
-+        NetworkRegistrationInfo psInfo = ss.getNetworkRegistrationInfo(
-+                NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN);
-+        // We will return roaming state correctly if the CS domain is in service because
-+        // ss.getRoaming() returns isVoiceRoaming||isDataRoaming result and isDataRoaming==false
-+        // when the modem reports IWLAN RAT.
-+        return psInfo != null && csInfo != null && !csInfo.isInService()
-+                && psInfo.getAccessNetworkTechnology() == TelephonyManager.NETWORK_TYPE_IWLAN;
-+    }
-+
-     public RegistrationManager.RegistrationCallback getImsMmTelRegistrationCallback() {
-         return mImsMmTelRegistrationHelper.getCallback();
-     }
--- 
-2.25.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 6cb29e1..0440325 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,4 +1,4 @@
-From b4326dbe1c0ad9c80c5a5da3b6222f08f25628ab Mon Sep 17 00:00:00 2001
+From a89b84cd737b85a5e71bf64d4ee979cecbf40600 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/3] Add a vendor800 command, to be able to call
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 fed7e65..f79a745 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,4 +1,4 @@
-From 7adc66904796a05023a6ed6ec81e5ada75fe3991 Mon Sep 17 00:00:00 2001
+From 5fcd965b22998e72d7cc8100bdf5be657cf91ba0 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/3] Fix light sensor crash on Xiaomi 13
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
index 82a42b7..151a2b1 100644
--- 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
@@ -1,4 +1,4 @@
-From cd80c23bc3bd357946d679da60704a70757eaffd Mon Sep 17 00:00:00 2001
+From 70e2131690533463ea51b8d9c3beb52c3f33c7c1 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
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
index ca5a9b3..84dcb91 100644
--- 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
@@ -1,4 +1,4 @@
-From 0e5671e933147c3a6d4c334dcd9bebf4c76a00ba Mon Sep 17 00:00:00 2001
+From 89738446a7859155250c29a44f542fb52fd5b983 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
@@ -9,7 +9,7 @@ Change-Id: I02d672f9a2688df7b1abf16377634fdcf4132511
  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
+index 175e4e9a..339e019e 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
diff --git a/patches/trebledroid/platform_packages_apps_Settings/0001-Act-as-usb-device-when-there-is-no-hal-but-we-believ.patch b/patches/trebledroid/platform_packages_apps_Settings/0001-Act-as-usb-device-when-there-is-no-hal-but-we-believ.patch
index cbcc96b..e3e51ee 100644
--- a/patches/trebledroid/platform_packages_apps_Settings/0001-Act-as-usb-device-when-there-is-no-hal-but-we-believ.patch
+++ b/patches/trebledroid/platform_packages_apps_Settings/0001-Act-as-usb-device-when-there-is-no-hal-but-we-believ.patch
@@ -1,7 +1,7 @@
-From eb6d8eadd61948777c643b6d30595b9b06dba818 Mon Sep 17 00:00:00 2001
+From 8c9436be3276660716b83f8f4785f9793d3043e9 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 14 Aug 2018 21:48:19 +0200
-Subject: [PATCH 1/2] Act as usb device when there is no hal, but we believe we
+Subject: [PATCH 1/5] Act as usb device when there is no hal, but we believe we
  are a device
 
 Change-Id: I036090738525fd8cc63534d52d02ab1852950a7d
diff --git a/patches/trebledroid/platform_packages_apps_Settings/0002-Ignore-cancelled-fingerprint-events-they-are-expecte.patch b/patches/trebledroid/platform_packages_apps_Settings/0002-Ignore-cancelled-fingerprint-events-they-are-expecte.patch
index aabc67c..2c68ff7 100644
--- a/patches/trebledroid/platform_packages_apps_Settings/0002-Ignore-cancelled-fingerprint-events-they-are-expecte.patch
+++ b/patches/trebledroid/platform_packages_apps_Settings/0002-Ignore-cancelled-fingerprint-events-they-are-expecte.patch
@@ -1,7 +1,7 @@
-From 04cc22def60ac9828d7348e5c3b244c57c56329e Mon Sep 17 00:00:00 2001
+From 8f91441175231c7eb8a96bb78cdd17e97eea3fb1 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 2 May 2022 17:44:28 -0400
-Subject: [PATCH 2/2] Ignore cancelled fingerprint events, they are expected,
+Subject: [PATCH 2/5] Ignore cancelled fingerprint events, they are expected,
  plus add more fingerprint enroll logs
 
 ---
@@ -10,10 +10,10 @@ Subject: [PATCH 2/2] Ignore cancelled fingerprint events, they are expected,
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
-index 7e764059b9..29fa94d39f 100644
+index a62bd6723e..e10ff1220d 100644
 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
 +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
-@@ -856,6 +856,9 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
+@@ -765,6 +765,9 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
  
      @Override
      public void onEnrollmentError(int errMsgId, CharSequence errString) {
@@ -23,7 +23,7 @@ index 7e764059b9..29fa94d39f 100644
          onCancelEnrollment(errMsgId);
          dismissTouchDialogIfSfps();
      }
-@@ -1333,4 +1336,4 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
+@@ -1175,4 +1178,4 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
              return SettingsEnums.DIALOG_FINGERPRINT_ICON_TOUCH;
          }
      }
diff --git a/patches/trebledroid/platform_packages_apps_Settings/0003-Don-t-crash-when-we-get-no-DeviceLockManager.patch b/patches/trebledroid/platform_packages_apps_Settings/0003-Don-t-crash-when-we-get-no-DeviceLockManager.patch
index 45ca14a..a1b9e43 100644
--- a/patches/trebledroid/platform_packages_apps_Settings/0003-Don-t-crash-when-we-get-no-DeviceLockManager.patch
+++ b/patches/trebledroid/platform_packages_apps_Settings/0003-Don-t-crash-when-we-get-no-DeviceLockManager.patch
@@ -1,7 +1,7 @@
-From 4c2aa214c094ae085b866cf28eafcbcb82ce446a Mon Sep 17 00:00:00 2001
+From 8fa302ed4a0fe21da73c58b6f90332e4bbc92091 Mon Sep 17 00:00:00 2001
 From: Alberto Ponces <ponces26@gmail.com>
 Date: Sun, 29 Oct 2023 18:34:01 +0000
-Subject: [PATCH 3/3] Don't crash when we get no DeviceLockManager
+Subject: [PATCH 3/5] Don't crash when we get no DeviceLockManager
 
 Change-Id: I8f87cdb00e0950ee6528598b8dff2cafff0309e7
 ---
diff --git a/patches/trebledroid/platform_packages_apps_Settings/0004-Revert-Wi-Fi-Remove-Do-not-validate-option-in-CA-cer.patch b/patches/trebledroid/platform_packages_apps_Settings/0004-Revert-Wi-Fi-Remove-Do-not-validate-option-in-CA-cer.patch
deleted file mode 100644
index dd397a2..0000000
--- a/patches/trebledroid/platform_packages_apps_Settings/0004-Revert-Wi-Fi-Remove-Do-not-validate-option-in-CA-cer.patch
+++ /dev/null
@@ -1,311 +0,0 @@
-From 99c4744df7361c8d675ea699f36aa11b6cf36ec8 Mon Sep 17 00:00:00 2001
-From: TogoFire <italomellopereira@gmail.com>
-Date: Fri, 6 Aug 2021 08:54:07 -0300
-Subject: [PATCH 4/5] Revert "[Wi-Fi] Remove 'Do not validate' option in CA
- certificate spinner"
-
-This is not a definitive fix, so revert it. WPA2-Enterprise (802.1X) or
-WPA2-PSK.
-
-[xawlw]:
-- Sometimes we can't connect to some Enterprise WiFi networks because we
-  don't know its domain so let's revert this 'Security' feature
-- Read more about it here:
-  https://www.xda-developers.com/android-11-break-enterprise-wifi-connection/
-
-This reverts commit 33cde5dbeee934269f16d72e26e651d56a13733e.
-This reverts commit 94b8579607c6f1201cea9d6601e88cec897b2ff6.
-
-Signed-off-by: TogoFire <italomellopereira@gmail.com>
-Signed-off-by: xawlw <abdulazizawlw@gmail.com>
-Change-Id: I3cec92b74a419b5463c5e5db496863e66d034703
----
- res/layout/wifi_network_config.xml            | 12 +++++++
- res/values/strings.xml                        |  4 +++
- .../settings/wifi/WifiConfigController.java   | 33 +++++++++++++------
- .../settings/wifi/WifiConfigController2.java  | 33 +++++++++++++------
- 4 files changed, 62 insertions(+), 20 deletions(-)
-
-diff --git a/res/layout/wifi_network_config.xml b/res/layout/wifi_network_config.xml
-index 6fe39bf026..5a9d6e64df 100644
---- a/res/layout/wifi_network_config.xml
-+++ b/res/layout/wifi_network_config.xml
-@@ -224,6 +224,18 @@
-                          android:entries="@array/eap_ocsp_type"/>
-             </LinearLayout>
- 
-+            <LinearLayout android:id="@+id/no_ca_cert_warning"
-+                    android:layout_width="match_parent"
-+                    android:layout_height="wrap_content"
-+                    android:visibility="gone"
-+                    style="@style/wifi_item" >
-+                <TextView
-+                        android:layout_width="wrap_content"
-+                        android:layout_height="wrap_content"
-+                        style="@style/wifi_item_warning"
-+                        android:text="@string/wifi_do_not_validate_eap_server_warning" />
-+            </LinearLayout>
-+
-             <LinearLayout android:id="@+id/l_domain"
-                           android:layout_width="match_parent"
-                           android:layout_height="wrap_content"
-diff --git a/res/values/strings.xml b/res/values/strings.xml
-index 7fe1daa5cb..b5e993fe84 100644
---- a/res/values/strings.xml
-+++ b/res/values/strings.xml
-@@ -1895,6 +1895,10 @@
-     <string name="wifi_use_system_certs">Use system certificates</string>
-     <!-- Menu option for not providing an EAP user certificate -->
-     <string name="wifi_do_not_provide_eap_user_cert">Do not provide</string>
-+    <!-- Menu option for not validating the EAP server -->
-+    <string name="wifi_do_not_validate_eap_server">Do not validate</string>
-+    <!-- Warning message displayed if user choses not to validate the EAP server -->
-+    <string name="wifi_do_not_validate_eap_server_warning">No certificate specified. Your connection will not be private.</string>
-     <!-- Menu option for Trust On First Use[CHAR_LIMIT=64] -->
-     <string name="wifi_trust_on_first_use">Trust on First Use</string>
-     <!-- Warning message displayed if network name (ssid) is too long -->
-diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
-index 8f0a983d1f..6ca97c329c 100644
---- a/src/com/android/settings/wifi/WifiConfigController.java
-+++ b/src/com/android/settings/wifi/WifiConfigController.java
-@@ -166,6 +166,7 @@ public class WifiConfigController implements TextWatcher,
-     private String mMultipleCertSetString;
-     private String mUseSystemCertsString;
-     private String mDoNotProvideEapUserCertString;
-+    private String mDoNotValidateEapServerString;
- 
-     private Spinner mSecuritySpinner;
-     @VisibleForTesting Spinner mEapMethodSpinner;
-@@ -272,6 +273,8 @@ public class WifiConfigController implements TextWatcher,
-         mUseSystemCertsString = mContext.getString(R.string.wifi_use_system_certs);
-         mDoNotProvideEapUserCertString =
-             mContext.getString(R.string.wifi_do_not_provide_eap_user_cert);
-+        mDoNotValidateEapServerString =
-+            mContext.getString(R.string.wifi_do_not_validate_eap_server);
- 
-         mSsidScanButton = (ImageButton) mView.findViewById(R.id.ssid_scanner_button);
-         mIpSettingsSpinner = (Spinner) mView.findViewById(R.id.ip_settings);
-@@ -544,7 +547,8 @@ public class WifiConfigController implements TextWatcher,
-                 // Disallow submit if the user has not selected a CA certificate for an EAP network
-                 // configuration.
-                 enabled = false;
--            } else if (mEapDomainView != null
-+            } else if (!caCertSelection.equals(mDoNotValidateEapServerString)
-+                    && mEapDomainView != null
-                     && mView.findViewById(R.id.l_domain).getVisibility() != View.GONE
-                     && TextUtils.isEmpty(mEapDomainView.getText().toString())) {
-                 // Disallow submit if the user chooses to use a certificate for EAP server
-@@ -566,6 +570,7 @@ public class WifiConfigController implements TextWatcher,
-     }
- 
-     void showWarningMessagesIfAppropriate() {
-+        mView.findViewById(R.id.no_ca_cert_warning).setVisibility(View.GONE);
-         mView.findViewById(R.id.no_user_cert_warning).setVisibility(View.GONE);
-         mView.findViewById(R.id.no_domain_warning).setVisibility(View.GONE);
-         mView.findViewById(R.id.ssid_too_long_warning).setVisibility(View.GONE);
-@@ -578,7 +583,13 @@ public class WifiConfigController implements TextWatcher,
-         }
-         if (mEapCaCertSpinner != null
-                 && mView.findViewById(R.id.l_ca_cert).getVisibility() != View.GONE) {
--            if (mEapDomainView != null
-+            String caCertSelection = (String) mEapCaCertSpinner.getSelectedItem();
-+            if (caCertSelection.equals(mDoNotValidateEapServerString)) {
-+                // Display warning if user chooses not to validate the EAP server with a
-+                // user-supplied CA certificate in an EAP network configuration.
-+                mView.findViewById(R.id.no_ca_cert_warning).setVisibility(View.VISIBLE);
-+            } else if (!caCertSelection.equals(mUnspecifiedCertString)
-+                    && mEapDomainView != null
-                     && mView.findViewById(R.id.l_domain).getVisibility() != View.GONE
-                     && TextUtils.isEmpty(mEapDomainView.getText().toString())) {
-                 // Display warning if user chooses to use a certificate without restricting the
-@@ -719,7 +730,8 @@ public class WifiConfigController implements TextWatcher,
-                 config.enterpriseConfig.setCaCertificateAliases(null);
-                 config.enterpriseConfig.setCaPath(null);
-                 config.enterpriseConfig.setDomainSuffixMatch(mEapDomainView.getText().toString());
--                if (caCert.equals(mUnspecifiedCertString)) {
-+                if (caCert.equals(mUnspecifiedCertString)
-+                        || caCert.equals(mDoNotValidateEapServerString)) {
-                     // ca_cert already set to null, so do nothing.
-                 } else if (caCert.equals(mUseSystemCertsString)) {
-                     config.enterpriseConfig.setCaPath(SYSTEM_CA_STORE_PATH);
-@@ -753,7 +765,8 @@ public class WifiConfigController implements TextWatcher,
-                 }
- 
-                 // Only set OCSP option if there is a valid CA certificate.
--                if (caCert.equals(mUnspecifiedCertString)) {
-+                if (caCert.equals(mUnspecifiedCertString)
-+                        || caCert.equals(mDoNotValidateEapServerString)) {
-                     config.enterpriseConfig.setOcsp(WifiEnterpriseConfig.OCSP_NONE);
-                 } else {
-                     config.enterpriseConfig.setOcsp(mEapOcspSpinner.getSelectedItemPosition());
-@@ -1057,7 +1070,7 @@ public class WifiConfigController implements TextWatcher,
-             loadCertificates(
-                     mEapCaCertSpinner,
-                     androidKeystoreAliasLoader.getCaCertAliases(),
--                    null /* noCertificateString */,
-+                    mDoNotValidateEapServerString /* noCertificateString */,
-                     false /* showMultipleCerts */,
-                     true /* showUsePreinstalledCertOption */);
-             loadCertificates(
-@@ -1141,7 +1154,7 @@ public class WifiConfigController implements TextWatcher,
-             } else {
-                 String[] caCerts = enterpriseConfig.getCaCertificateAliases();
-                 if (caCerts == null) {
--                    setSelection(mEapCaCertSpinner, mUnspecifiedCertString);
-+                    setSelection(mEapCaCertSpinner, mDoNotValidateEapServerString);
-                 } else if (caCerts.length == 1) {
-                     setSelection(mEapCaCertSpinner, caCerts[0]);
-                 } else {
-@@ -1152,7 +1165,7 @@ public class WifiConfigController implements TextWatcher,
-                     loadCertificates(
-                             mEapCaCertSpinner,
-                             androidKeystoreAliasLoader.getCaCertAliases(),
--                            null /* noCertificateString */,
-+                            mDoNotValidateEapServerString /* noCertificateString */,
-                             true /* showMultipleCerts */,
-                             true /* showUsePreinstalledCertOption */);
-                     setSelection(mEapCaCertSpinner, mMultipleCertSetString);
-@@ -1285,7 +1298,8 @@ public class WifiConfigController implements TextWatcher,
- 
-         if (mView.findViewById(R.id.l_ca_cert).getVisibility() != View.GONE) {
-             String eapCertSelection = (String) mEapCaCertSpinner.getSelectedItem();
--            if (eapCertSelection.equals(mUnspecifiedCertString)) {
-+            if (eapCertSelection.equals(mDoNotValidateEapServerString)
-+                    || eapCertSelection.equals(mUnspecifiedCertString)) {
-                 // Domain suffix matching is not relevant if the user hasn't chosen a CA
-                 // certificate yet, or chooses not to validate the EAP server.
-                 setDomainInvisible();
-@@ -1546,8 +1560,7 @@ public class WifiConfigController implements TextWatcher,
-                     }).collect(Collectors.toList()));
-         }
- 
--        if (!TextUtils.isEmpty(noCertificateString)
--                && mAccessPointSecurity != AccessPoint.SECURITY_EAP_SUITE_B) {
-+        if (mAccessPointSecurity != AccessPoint.SECURITY_EAP_SUITE_B) {
-             certs.add(noCertificateString);
-         }
- 
-diff --git a/src/com/android/settings/wifi/WifiConfigController2.java b/src/com/android/settings/wifi/WifiConfigController2.java
-index f92b58fbd1..6074202a97 100644
---- a/src/com/android/settings/wifi/WifiConfigController2.java
-+++ b/src/com/android/settings/wifi/WifiConfigController2.java
-@@ -174,6 +174,7 @@ public class WifiConfigController2 implements TextWatcher,
-     private String mUseSystemCertsString;
-     private String mTrustOnFirstUse;
-     private String mDoNotProvideEapUserCertString;
-+    private String mDoNotValidateEapServerString;
-     @VisibleForTesting String mInstallCertsString;
- 
-     private Spinner mSecuritySpinner;
-@@ -279,6 +280,8 @@ public class WifiConfigController2 implements TextWatcher,
-         mTrustOnFirstUse = mContext.getString(R.string.wifi_trust_on_first_use);
-         mDoNotProvideEapUserCertString =
-             mContext.getString(R.string.wifi_do_not_provide_eap_user_cert);
-+        mDoNotValidateEapServerString =
-+            mContext.getString(R.string.wifi_do_not_validate_eap_server);
-         mInstallCertsString = mContext.getString(R.string.wifi_install_credentials);
- 
-         mSsidScanButton = (ImageButton) mView.findViewById(R.id.ssid_scanner_button);
-@@ -532,7 +535,8 @@ public class WifiConfigController2 implements TextWatcher,
-                 // Disallow submit if the user has not selected a CA certificate for an EAP network
-                 // configuration.
-                 enabled = false;
--            } else if (mEapDomainView != null
-+            } else if (!caCertSelection.equals(mDoNotValidateEapServerString)
-+                    && mEapDomainView != null
-                     && mView.findViewById(R.id.l_domain).getVisibility() != View.GONE
-                     && TextUtils.isEmpty(mEapDomainView.getText().toString())) {
-                 // Disallow submit if the user chooses to use a certificate for EAP server
-@@ -554,6 +558,7 @@ public class WifiConfigController2 implements TextWatcher,
-     }
- 
-     void showWarningMessagesIfAppropriate() {
-+        mView.findViewById(R.id.no_ca_cert_warning).setVisibility(View.GONE);
-         mView.findViewById(R.id.no_user_cert_warning).setVisibility(View.GONE);
-         mView.findViewById(R.id.no_domain_warning).setVisibility(View.GONE);
-         mView.findViewById(R.id.ssid_too_long_warning).setVisibility(View.GONE);
-@@ -566,7 +571,13 @@ public class WifiConfigController2 implements TextWatcher,
-         }
-         if (mEapCaCertSpinner != null
-                 && mView.findViewById(R.id.l_ca_cert).getVisibility() != View.GONE) {
--            if (mEapDomainView != null
-+            String caCertSelection = (String) mEapCaCertSpinner.getSelectedItem();
-+            if (caCertSelection.equals(mDoNotValidateEapServerString)) {
-+                // Display warning if user chooses not to validate the EAP server with a
-+                // user-supplied CA certificate in an EAP network configuration.
-+                mView.findViewById(R.id.no_ca_cert_warning).setVisibility(View.VISIBLE);
-+            } else if (!caCertSelection.equals(mUnspecifiedCertString)
-+                    && mEapDomainView != null
-                     && mView.findViewById(R.id.l_domain).getVisibility() != View.GONE
-                     && TextUtils.isEmpty(mEapDomainView.getText().toString())) {
-                 // Display warning if user chooses to use a certificate without restricting the
-@@ -723,7 +734,8 @@ public class WifiConfigController2 implements TextWatcher,
-                 config.enterpriseConfig.setCaCertificateAliases(null);
-                 config.enterpriseConfig.setCaPath(null);
-                 config.enterpriseConfig.setDomainSuffixMatch(mEapDomainView.getText().toString());
--                if (caCert.equals(mUnspecifiedCertString)) {
-+                if (caCert.equals(mUnspecifiedCertString)
-+                        || caCert.equals(mDoNotValidateEapServerString)) {
-                     // ca_cert already set to null, so do nothing.
-                 } else if (mIsTrustOnFirstUseSupported && caCert.equals(mTrustOnFirstUse)) {
-                     config.enterpriseConfig.enableTrustOnFirstUse(true);
-@@ -758,7 +770,8 @@ public class WifiConfigController2 implements TextWatcher,
-                 }
- 
-                 // Only set certificate option if there is a valid CA certificate.
--                if (caCert.equals(mUnspecifiedCertString)) {
-+                if (caCert.equals(mUnspecifiedCertString)
-+                        || caCert.equals(mDoNotValidateEapServerString)) {
-                     config.enterpriseConfig.setOcsp(WifiEnterpriseConfig.OCSP_NONE);
-                     config.enterpriseConfig.setMinimumTlsVersion(WifiEnterpriseConfig.TLS_V1_0);
-                 } else {
-@@ -1067,7 +1080,7 @@ public class WifiConfigController2 implements TextWatcher,
-             loadCertificates(
-                     mEapCaCertSpinner,
-                     androidKeystoreAliasLoader.getCaCertAliases(),
--                    null /* noCertificateString */,
-+                    mDoNotValidateEapServerString /* noCertificateString */,
-                     false /* showMultipleCerts */,
-                     true /* showUsePreinstalledCertOption */);
-             loadCertificates(
-@@ -1153,7 +1166,7 @@ public class WifiConfigController2 implements TextWatcher,
-                             && enterpriseConfig.isTrustOnFirstUseEnabled()) {
-                         setSelection(mEapCaCertSpinner, mTrustOnFirstUse);
-                     } else {
--                        setSelection(mEapCaCertSpinner, mUnspecifiedCertString);
-+                        setSelection(mEapCaCertSpinner, mDoNotValidateEapServerString);
-                     }
-                 } else if (caCerts.length == 1) {
-                     setSelection(mEapCaCertSpinner, caCerts[0]);
-@@ -1164,7 +1177,7 @@ public class WifiConfigController2 implements TextWatcher,
-                     loadCertificates(
-                             mEapCaCertSpinner,
-                             androidKeystoreAliasLoader.getCaCertAliases(),
--                            null /* noCertificateString */,
-+                            mDoNotValidateEapServerString /* noCertificateString */,
-                             true /* showMultipleCerts */,
-                             true /* showUsePreinstalledCertOption */);
-                     setSelection(mEapCaCertSpinner, mMultipleCertSetString);
-@@ -1306,7 +1319,8 @@ public class WifiConfigController2 implements TextWatcher,
-             String eapCertSelection = (String) mEapCaCertSpinner.getSelectedItem();
-             if (eapCertSelection.equals(mUnspecifiedCertString)
-                     || (mIsTrustOnFirstUseSupported
--                            && eapCertSelection.equals(mTrustOnFirstUse))) {
-+                            && eapCertSelection.equals(mTrustOnFirstUse))
-+                    || eapCertSelection.equals(mUnspecifiedCertString)) {
-                 setMinTlsVerInvisible();
-                 // Domain suffix matching is not relevant if the user hasn't chosen a CA
-                 // certificate yet, or chooses not to validate the EAP server.
-@@ -1590,8 +1604,7 @@ public class WifiConfigController2 implements TextWatcher,
-                     }).collect(Collectors.toList()));
-         }
- 
--        if (!TextUtils.isEmpty(noCertificateString)
--                && mWifiEntrySecurity != WifiEntry.SECURITY_EAP_SUITE_B) {
-+        if (mWifiEntrySecurity != WifiEntry.SECURITY_EAP_SUITE_B) {
-             certs.add(noCertificateString);
-         }
- 
--- 
-2.25.1
-
diff --git a/patches/trebledroid/platform_packages_modules_Bluetooth/0002-audio_hal_interface-Optionally-use-sysbta-HAL.patch b/patches/trebledroid/platform_packages_modules_Bluetooth/0002-audio_hal_interface-Optionally-use-sysbta-HAL.patch
deleted file mode 100644
index f75812b..0000000
--- a/patches/trebledroid/platform_packages_modules_Bluetooth/0002-audio_hal_interface-Optionally-use-sysbta-HAL.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From bc8917908978089970dd2c0c0b0dd425f68d5e03 Mon Sep 17 00:00:00 2001
-From: Peter Cai <peter@typeblog.net>
-Date: Wed, 24 Aug 2022 15:45:18 -0400
-Subject: [PATCH] audio_hal_interface: Optionally use sysbta HAL
-
-Required to support sysbta, our system-side bt audio implementation.
-
-Change-Id: I59973e6ec84c5923be8a7c67b36b2e237f000860
----
- system/audio_hal_interface/aidl/client_interface_aidl.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/system/audio_hal_interface/aidl/client_interface_aidl.cc b/system/audio_hal_interface/aidl/client_interface_aidl.cc
-index 660a141..ed41627 100644
---- a/system/audio_hal_interface/aidl/client_interface_aidl.cc
-+++ b/system/audio_hal_interface/aidl/client_interface_aidl.cc
-@@ -266,7 +266,7 @@ int BluetoothAudioClientInterface::GetAidlInterfaceVersion() {
- 
-   auto provider_factory = IBluetoothAudioProviderFactory::fromBinder(
-       ::ndk::SpAIBinder(AServiceManager_waitForService(
--          kDefaultAudioProviderFactoryInterface.c_str())));
-+          audioProviderFactoryInterface().c_str())));
- 
-   if (provider_factory == nullptr) {
-     LOG(ERROR) << __func__ << ", can't get aidl version from unknown factory";
--- 
-2.42.0
-
diff --git a/patches/trebledroid/platform_packages_modules_Bluetooth/0003-Add-option-to-change-eSCO-Transport-Unit-Size.patch b/patches/trebledroid/platform_packages_modules_Bluetooth/0003-Add-option-to-change-eSCO-Transport-Unit-Size.patch
index cf3b44e..1a0f3f1 100644
--- a/patches/trebledroid/platform_packages_modules_Bluetooth/0003-Add-option-to-change-eSCO-Transport-Unit-Size.patch
+++ b/patches/trebledroid/platform_packages_modules_Bluetooth/0003-Add-option-to-change-eSCO-Transport-Unit-Size.patch
@@ -1,7 +1,7 @@
-From 217d6735a0017f135eb1cb2d920754080e363cc6 Mon Sep 17 00:00:00 2001
+From fac1258f13d9b78beaacafba7ac7a987c42ed529 Mon Sep 17 00:00:00 2001
 From: Alberto Ponces <ponces26@gmail.com>
 Date: Thu, 17 Jun 2021 15:48:53 +0100
-Subject: [PATCH 3/7] Add option to change eSCO Transport Unit Size
+Subject: [PATCH 3/8] Add option to change eSCO Transport Unit Size
 
 Fixes Bluetooth calls on some Samsung devices if set to 16.
 
@@ -41,5 +41,5 @@ index 48607e6d54..3b19d7c3ea 100644
      return default_esco_parameters[codec];
    }
 -- 
-2.34.1
+2.25.1
 
diff --git a/patches/trebledroid/platform_packages_modules_Bluetooth/0004-Don-t-abort-when-failing-to-get-real-time-priority.patch b/patches/trebledroid/platform_packages_modules_Bluetooth/0004-Don-t-abort-when-failing-to-get-real-time-priority.patch
index 1414f87..8987a8b 100644
--- a/patches/trebledroid/platform_packages_modules_Bluetooth/0004-Don-t-abort-when-failing-to-get-real-time-priority.patch
+++ b/patches/trebledroid/platform_packages_modules_Bluetooth/0004-Don-t-abort-when-failing-to-get-real-time-priority.patch
@@ -1,7 +1,7 @@
-From 8a2df2612c29d5a90df5fbe554231746f043f3ae Mon Sep 17 00:00:00 2001
+From 72d6a401e5f84260e8f339c628085397dfe0092c Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 17 Oct 2021 17:17:13 -0400
-Subject: [PATCH 4/7] Don't abort when failing to get real-time priority
+Subject: [PATCH 4/8] Don't abort when failing to get real-time priority
 
 On some devices (like OP6), for unknown reason, trying to go to realtime
 fails with EPERM.
@@ -81,5 +81,5 @@ index 2aa2510c04..e50de320c4 100644
      LOG(ERROR) << __func__ << ": unable to enable real time scheduling";
  #endif
 -- 
-2.34.1
+2.25.1
 
diff --git a/patches/trebledroid/platform_packages_modules_Bluetooth/0005-On-Samsung-devices-we-need-to-tell-Audio-HAL-if-we-r.patch b/patches/trebledroid/platform_packages_modules_Bluetooth/0005-On-Samsung-devices-we-need-to-tell-Audio-HAL-if-we-r.patch
index c49c604..17580b4 100644
--- a/patches/trebledroid/platform_packages_modules_Bluetooth/0005-On-Samsung-devices-we-need-to-tell-Audio-HAL-if-we-r.patch
+++ b/patches/trebledroid/platform_packages_modules_Bluetooth/0005-On-Samsung-devices-we-need-to-tell-Audio-HAL-if-we-r.patch
@@ -1,7 +1,7 @@
-From 48a72e00b21af330793d9c9f3ac2c4f4c3820e71 Mon Sep 17 00:00:00 2001
+From f40194ad86c3e4dc3c3e7c4439905d90585c7245 Mon Sep 17 00:00:00 2001
 From: Andreas Schneider <asn@cryptomilk.org>
 Date: Sat, 12 Nov 2022 00:35:46 +0000
-Subject: [PATCH 5/7] On Samsung devices, we need to tell Audio HAL if we're
+Subject: [PATCH 5/8] On Samsung devices, we need to tell Audio HAL if we're
  running narrow band or wide band
 
 Ported to Android 13.
@@ -63,5 +63,5 @@ index 57eb9aff4c..fbe29415b8 100644
              default:
                  Log.e(TAG, "processWBSEvent: unknown wbsConfig " + wbsConfig);
 -- 
-2.34.1
+2.25.1
 
diff --git a/patches/trebledroid/platform_packages_modules_Bluetooth/0007-Add-a-property-to-cap-declared-le-vendor-version.-Fo.patch b/patches/trebledroid/platform_packages_modules_Bluetooth/0007-Add-a-property-to-cap-declared-le-vendor-version.-Fo.patch
index 664ae6d..ec46e98 100644
--- a/patches/trebledroid/platform_packages_modules_Bluetooth/0007-Add-a-property-to-cap-declared-le-vendor-version.-Fo.patch
+++ b/patches/trebledroid/platform_packages_modules_Bluetooth/0007-Add-a-property-to-cap-declared-le-vendor-version.-Fo.patch
@@ -1,7 +1,7 @@
-From 81206465bb7bb71b9347ba26b74e016cb66a2ba2 Mon Sep 17 00:00:00 2001
+From 3ff08cb17b5fcbc0c1c7cbbc1cf368692db78753 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 30 May 2023 17:34:03 -0400
-Subject: [PATCH 7/7] Add a property to cap declared le vendor version. Found
+Subject: [PATCH 7/8] Add a property to cap declared le vendor version. Found
  needed on unisoc
 
 ---
@@ -52,5 +52,5 @@ index 66b7de6b5e..a51382cd0d 100644
        auto v98 = LeGetVendorCapabilitiesComplete098View::Create(v96);
        if (!v98.IsValid()) {
 -- 
-2.34.1
+2.25.1
 
diff --git a/patches/trebledroid/platform_packages_modules_Connectivity/0001-Allow-failing-to-load-bpf-programs-for-BPF-less-devi.patch b/patches/trebledroid/platform_packages_modules_Connectivity/0001-Allow-failing-to-load-bpf-programs-for-BPF-less-devi.patch
index e64f770..d0ae90c 100644
--- a/patches/trebledroid/platform_packages_modules_Connectivity/0001-Allow-failing-to-load-bpf-programs-for-BPF-less-devi.patch
+++ b/patches/trebledroid/platform_packages_modules_Connectivity/0001-Allow-failing-to-load-bpf-programs-for-BPF-less-devi.patch
@@ -1,4 +1,4 @@
-From b881a3c4f007c5145c3749bfd8c72552e7515ae5 Mon Sep 17 00:00:00 2001
+From 689e761aeae5caea53359fe45742237e6223852e Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 26 Oct 2022 18:10:04 -0400
 Subject: [PATCH 1/4] Allow failing to load bpf programs, for BPF-less devices
diff --git a/patches/trebledroid/platform_packages_modules_Connectivity/0002-Dont-delete-UID-from-BpfMap-on-BPF-less-kernel.patch b/patches/trebledroid/platform_packages_modules_Connectivity/0002-Dont-delete-UID-from-BpfMap-on-BPF-less-kernel.patch
index 38e895a..c69672d 100644
--- a/patches/trebledroid/platform_packages_modules_Connectivity/0002-Dont-delete-UID-from-BpfMap-on-BPF-less-kernel.patch
+++ b/patches/trebledroid/platform_packages_modules_Connectivity/0002-Dont-delete-UID-from-BpfMap-on-BPF-less-kernel.patch
@@ -1,4 +1,4 @@
-From 27de9fd0bb995bda30a603502f1563d24a45297e Mon Sep 17 00:00:00 2001
+From 872277e89874d3abce6ffb940276b3ac04e25584 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 26 Oct 2022 18:11:10 -0400
 Subject: [PATCH 2/4] Dont delete UID from BpfMap on BPF-less kernel
diff --git a/patches/trebledroid/platform_packages_modules_Connectivity/0003-Make-the-use-of-IBpfMaps-optional.patch b/patches/trebledroid/platform_packages_modules_Connectivity/0003-Make-the-use-of-IBpfMaps-optional.patch
index 481d541..d2cf01c 100644
--- a/patches/trebledroid/platform_packages_modules_Connectivity/0003-Make-the-use-of-IBpfMaps-optional.patch
+++ b/patches/trebledroid/platform_packages_modules_Connectivity/0003-Make-the-use-of-IBpfMaps-optional.patch
@@ -1,4 +1,4 @@
-From 4db0a4f57fa8369814156eb5a1c00bf4e73c7f2e Mon Sep 17 00:00:00 2001
+From fe9eef761303dd53c41a277cd9d27e5ecdbb6e81 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 6 Oct 2023 09:27:33 -0400
 Subject: [PATCH 3/4] Make the use of IBpfMaps optional
diff --git a/patches/trebledroid/platform_packages_modules_Connectivity/0004-Bring-back-traffic-indicators-for-legacy-devices.patch b/patches/trebledroid/platform_packages_modules_Connectivity/0004-Bring-back-traffic-indicators-for-legacy-devices.patch
index 756df44..b577b2d 100644
--- a/patches/trebledroid/platform_packages_modules_Connectivity/0004-Bring-back-traffic-indicators-for-legacy-devices.patch
+++ b/patches/trebledroid/platform_packages_modules_Connectivity/0004-Bring-back-traffic-indicators-for-legacy-devices.patch
@@ -1,4 +1,4 @@
-From 9fbf312aeb1522a45ee08c6d002cd821499a3d21 Mon Sep 17 00:00:00 2001
+From 2194cac9002f8c15518ed526b593c8726a8264d6 Mon Sep 17 00:00:00 2001
 From: koron393 <koron393@gmail.com>
 Date: Fri, 20 Jan 2023 05:41:13 +0900
 Subject: [PATCH 4/4] Bring back traffic indicators for legacy devices
diff --git a/patches/trebledroid/platform_packages_modules_DeviceLock/0001-Don-t-crash-when-we-get-no-DeviceLockManager.patch b/patches/trebledroid/platform_packages_modules_DeviceLock/0001-Don-t-crash-when-we-get-no-DeviceLockManager.patch
index 266c08e..62fbe7f 100644
--- a/patches/trebledroid/platform_packages_modules_DeviceLock/0001-Don-t-crash-when-we-get-no-DeviceLockManager.patch
+++ b/patches/trebledroid/platform_packages_modules_DeviceLock/0001-Don-t-crash-when-we-get-no-DeviceLockManager.patch
@@ -1,4 +1,4 @@
-From bf319499c381dd044afc41f68fd1941092bf775b Mon Sep 17 00:00:00 2001
+From dc6088f136fe0e3162a9b36e3be1416594fedc1e Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 18 Oct 2023 17:44:59 -0400
 Subject: [PATCH] Don't crash when we get no DeviceLockManager
diff --git a/patches/trebledroid/platform_packages_modules_vndk/0001-Include-vndk-v28-apex.patch b/patches/trebledroid/platform_packages_modules_vndk/0001-Include-vndk-v28-apex.patch
index 5a5da35..207b05b 100644
--- a/patches/trebledroid/platform_packages_modules_vndk/0001-Include-vndk-v28-apex.patch
+++ b/patches/trebledroid/platform_packages_modules_vndk/0001-Include-vndk-v28-apex.patch
@@ -1,4 +1,4 @@
-From 500f05a09984b110c412f3ae6f51b4e8f68ed6a6 Mon Sep 17 00:00:00 2001
+From 5e4d928f55dda5b8b3f6ba56f8f8e20fd0b514ea Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 6 Oct 2023 05:18:39 -0400
 Subject: [PATCH] Include vndk v28 apex
diff --git a/patches/trebledroid/platform_system_bpf/0001-Support-no-bpf-usecase.patch b/patches/trebledroid/platform_system_bpf/0001-Support-no-bpf-usecase.patch
index 1b2069c..e571f80 100644
--- a/patches/trebledroid/platform_system_bpf/0001-Support-no-bpf-usecase.patch
+++ b/patches/trebledroid/platform_system_bpf/0001-Support-no-bpf-usecase.patch
@@ -1,4 +1,4 @@
-From 4b484de1b55acb758be89fbbdffd25a02b2dde5b Mon Sep 17 00:00:00 2001
+From 8d84f337f5109bc778bc09c39a06f7d3da46491a Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 13 Oct 2021 10:56:52 -0400
 Subject: [PATCH 1/2] Support no-bpf usecase
diff --git a/patches/trebledroid/platform_system_bpf/0002-Revert-detect-inability-to-write-to-index-0-of-bpf-m.patch b/patches/trebledroid/platform_system_bpf/0002-Revert-detect-inability-to-write-to-index-0-of-bpf-m.patch
index 8a23073..599f918 100644
--- a/patches/trebledroid/platform_system_bpf/0002-Revert-detect-inability-to-write-to-index-0-of-bpf-m.patch
+++ b/patches/trebledroid/platform_system_bpf/0002-Revert-detect-inability-to-write-to-index-0-of-bpf-m.patch
@@ -1,4 +1,4 @@
-From 059cfff8796aa45e138c67fc9cd6aa966cb8ef68 Mon Sep 17 00:00:00 2001
+From 9804c2fc6ce2930c1bd372a3493deb60115ae60c Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Wed, 19 Oct 2022 02:20:05 +0000
 Subject: [PATCH 2/2] Revert "detect inability to write to index != 0 of bpf
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 1bfb08a..ba08d37 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 e57e3a99939ea7271226e62ac5b810ef093e11e5 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/24] 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
@@ -13,7 +13,7 @@ So, ignore the override policy for this prop
  1 file changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/init/property_service.cpp b/init/property_service.cpp
-index 8da69822cc..545c25e26f 100644
+index 8da69822c..545c25e26 100644
 --- a/init/property_service.cpp
 +++ b/init/property_service.cpp
 @@ -787,8 +787,12 @@ static void LoadProperties(char* data, const char* filter, const char* filename,
@@ -32,5 +32,5 @@ index 8da69822cc..545c25e26f 100644
                  LOG(ERROR) << "Do not have permissions to set '" << key << "' to '" << value
                             << "' in property file '" << filename << "': " << error;
 -- 
-2.34.1
+2.25.1
 
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 f9c51fd..08d3754 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 ed44be93707af4d63d443e45f5d95810dec7896e 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/24] 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.
@@ -18,7 +18,7 @@ Change-Id: I97a7042fb03f817c41b801d558e438d2c1f6c375
  1 file changed, 9 insertions(+), 2 deletions(-)
 
 diff --git a/init/first_stage_mount.cpp b/init/first_stage_mount.cpp
-index 07ce4588d0..7b16c69139 100644
+index 07ce4588d..7b16c6913 100644
 --- a/init/first_stage_mount.cpp
 +++ b/init/first_stage_mount.cpp
 @@ -820,10 +820,17 @@ bool DoFirstStageMount(bool create_devices) {
@@ -42,5 +42,5 @@ index 07ce4588d0..7b16c69139 100644
  
  void SetInitAvbVersionInRecovery() {
 -- 
-2.34.1
+2.25.1
 
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 a796860..3594922 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 fba22d95b3e1005b94172f5caa95760ef60c8b06 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/24] Revert "Remove support for AVB 1.0."
 
 This reverts commit 21ef2310eb1ef4e61117b8a63741f3a9577a20c9.
 
@@ -20,7 +20,7 @@ This reverts commit ace7d45d0783d465d3dda4fa255e5280ff0c792f.
  create mode 100644 fs_mgr/fs_mgr_verity.cpp
 
 diff --git a/fs_mgr/Android.bp b/fs_mgr/Android.bp
-index dd612720f2..31c458306f 100644
+index dd612720f..31c458306 100644
 --- a/fs_mgr/Android.bp
 +++ b/fs_mgr/Android.bp
 @@ -69,6 +69,7 @@ cc_defaults {
@@ -32,10 +32,10 @@ index dd612720f2..31c458306f 100644
          "fs_mgr_overlayfs.cpp",
          "fs_mgr_roots.cpp",
 diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp
-index 742cdfab01..2038b347f1 100644
+index 8b9bce1db..e5dbaf32c 100644
 --- a/fs_mgr/fs_mgr.cpp
 +++ b/fs_mgr/fs_mgr.cpp
-@@ -1467,6 +1467,14 @@ MountAllResult fs_mgr_mount_all(Fstab* fstab, int mount_mode) {
+@@ -1490,6 +1490,14 @@ MountAllResult fs_mgr_mount_all(Fstab* fstab, int mount_mode) {
                  // Skips mounting the device.
                  continue;
              }
@@ -50,7 +50,7 @@ index 742cdfab01..2038b347f1 100644
          }
  
          int last_idx_inspected;
-@@ -1631,6 +1639,13 @@ int fs_mgr_umount_all(android::fs_mgr::Fstab* fstab) {
+@@ -1654,6 +1662,13 @@ int fs_mgr_umount_all(android::fs_mgr::Fstab* fstab) {
                  ret |= FsMgrUmountStatus::ERROR_VERITY;
                  continue;
              }
@@ -64,7 +64,7 @@ index 742cdfab01..2038b347f1 100644
          }
      }
      return ret;
-@@ -1927,6 +1942,14 @@ static int fs_mgr_do_mount_helper(Fstab* fstab, const std::string& n_name,
+@@ -1950,6 +1965,14 @@ static int fs_mgr_do_mount_helper(Fstab* fstab, const std::string& n_name,
                  // Skips mounting the device.
                  continue;
              }
@@ -79,7 +79,7 @@ index 742cdfab01..2038b347f1 100644
          }
  
          int retry_count = 2;
-@@ -2146,7 +2169,7 @@ bool fs_mgr_swapon_all(const Fstab& fstab) {
+@@ -2169,7 +2192,7 @@ bool fs_mgr_swapon_all(const Fstab& fstab) {
  }
  
  bool fs_mgr_is_verity_enabled(const FstabEntry& entry) {
@@ -88,7 +88,7 @@ index 742cdfab01..2038b347f1 100644
          return false;
      }
  
-@@ -2157,12 +2180,17 @@ bool fs_mgr_is_verity_enabled(const FstabEntry& entry) {
+@@ -2180,12 +2203,17 @@ bool fs_mgr_is_verity_enabled(const FstabEntry& entry) {
          return false;
      }
  
@@ -108,7 +108,7 @@ index 742cdfab01..2038b347f1 100644
      if (*status == 'C' || *status == 'V') {
          return true;
      }
-@@ -2171,7 +2199,7 @@ bool fs_mgr_is_verity_enabled(const FstabEntry& entry) {
+@@ -2194,7 +2222,7 @@ bool fs_mgr_is_verity_enabled(const FstabEntry& entry) {
  }
  
  std::optional<HashtreeInfo> fs_mgr_get_hashtree_info(const android::fs_mgr::FstabEntry& entry) {
@@ -117,7 +117,7 @@ index 742cdfab01..2038b347f1 100644
          return {};
      }
      DeviceMapper& dm = DeviceMapper::Instance();
-@@ -2333,25 +2361,6 @@ bool fs_mgr_mount_overlayfs_fstab_entry(const FstabEntry& entry) {
+@@ -2356,25 +2384,6 @@ bool fs_mgr_mount_overlayfs_fstab_entry(const FstabEntry& entry) {
      return true;
  }
  
@@ -144,7 +144,7 @@ index 742cdfab01..2038b347f1 100644
      std::string filesystems;
      if (!android::base::ReadFileToString("/proc/filesystems", &filesystems)) return false;
 diff --git a/fs_mgr/fs_mgr_fstab.cpp b/fs_mgr/fs_mgr_fstab.cpp
-index 598a3d2ecb..7731545d0f 100644
+index 598a3d2ec..7731545d0 100644
 --- a/fs_mgr/fs_mgr_fstab.cpp
 +++ b/fs_mgr/fs_mgr_fstab.cpp
 @@ -167,10 +167,12 @@ bool ParseFsMgrFlags(const std::string& flags, FstabEntry* entry) {
@@ -162,7 +162,7 @@ index 598a3d2ecb..7731545d0f 100644
          CheckFlag("logical", logical);
 diff --git a/fs_mgr/fs_mgr_verity.cpp b/fs_mgr/fs_mgr_verity.cpp
 new file mode 100644
-index 0000000000..efa2180787
+index 000000000..efa218078
 --- /dev/null
 +++ b/fs_mgr/fs_mgr_verity.cpp
 @@ -0,0 +1,557 @@
@@ -724,7 +724,7 @@ index 0000000000..efa2180787
 +    return true;
 +}
 diff --git a/fs_mgr/include_fstab/fstab/fstab.h b/fs_mgr/include_fstab/fstab/fstab.h
-index a914b53bb3..221d6c41f0 100644
+index a914b53bb..221d6c41f 100644
 --- a/fs_mgr/include_fstab/fstab/fstab.h
 +++ b/fs_mgr/include_fstab/fstab/fstab.h
 @@ -64,6 +64,7 @@ struct FstabEntry {
@@ -744,7 +744,7 @@ index a914b53bb3..221d6c41f0 100644
          bool avb : 1;
          bool logical : 1;
 diff --git a/fs_mgr/tests/fs_mgr_test.cpp b/fs_mgr/tests/fs_mgr_test.cpp
-index e33681c3f6..6aeac9a9e1 100644
+index e33681c3f..6aeac9a9e 100644
 --- a/fs_mgr/tests/fs_mgr_test.cpp
 +++ b/fs_mgr/tests/fs_mgr_test.cpp
 @@ -192,6 +192,7 @@ bool CompareFlags(FstabEntry::FsMgrFlags& lhs, FstabEntry::FsMgrFlags& rhs) {
@@ -782,7 +782,7 @@ index e33681c3f6..6aeac9a9e1 100644
      }
  
 diff --git a/init/first_stage_mount.cpp b/init/first_stage_mount.cpp
-index 7b16c69139..1fc981719c 100644
+index 7b16c6913..1fc981719 100644
 --- a/init/first_stage_mount.cpp
 +++ b/init/first_stage_mount.cpp
 @@ -81,7 +81,8 @@ class FirstStageMount {
@@ -892,5 +892,5 @@ index 7b16c69139..1fc981719c 100644
  // for any further vbmeta partitions.
  FirstStageMountVBootV2::FirstStageMountVBootV2(Fstab fstab)
 -- 
-2.34.1
+2.25.1
 
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 dc82a49..3194719 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 3906ace6972975d208547d61862b11d72bcd745f 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/24] Don't abandon creating property tree if there is a
  conflict, and hope for the best
 
 Change-Id: I194c815fdd58bfb84aaf7db02b8f0d00b4db21e8
@@ -10,7 +10,7 @@ Change-Id: I194c815fdd58bfb84aaf7db02b8f0d00b4db21e8
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/property_service/libpropertyinfoserializer/property_info_serializer.cpp b/property_service/libpropertyinfoserializer/property_info_serializer.cpp
-index 803657ab8e..ecdd0be201 100644
+index 803657ab8..ecdd0be20 100644
 --- a/property_service/libpropertyinfoserializer/property_info_serializer.cpp
 +++ b/property_service/libpropertyinfoserializer/property_info_serializer.cpp
 @@ -19,6 +19,7 @@
@@ -31,5 +31,5 @@ index 803657ab8e..ecdd0be201 100644
    }
  
 -- 
-2.34.1
+2.25.1
 
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 169af2a..58c43fa 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 e1098c0c5a7df486271a7a772c3ec8b36c42686d 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/24] Detect allowed sdcard options based on vndk
 
 Some kernel crashes when using too recent sdcardfs options
 
@@ -11,7 +11,7 @@ Change-Id: I632e485f9b2a09a46d4a1fde2ea15217f8d92eff
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/sdcard/sdcard.cpp b/sdcard/sdcard.cpp
-index 622de5b7a1..e580190e9d 100644
+index 622de5b7a..e580190e9 100644
 --- a/sdcard/sdcard.cpp
 +++ b/sdcard/sdcard.cpp
 @@ -32,6 +32,7 @@
@@ -39,5 +39,5 @@ index 622de5b7a1..e580190e9d 100644
      // handle older kernels that aren't updated yet.
      for (int i = 0; i <= new_opts_list.size(); ++i) {
 -- 
-2.34.1
+2.25.1
 
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 904ffd2..91f6a4f 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 0c91ef369620b4ef4ff7ccbd1a8eec5623b3ce55 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/24] 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
@@ -15,7 +15,7 @@ Change-Id: Id374e781957927d5604cb96c7a39b3fb28b3a6c5
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/rootdir/ueventd.rc b/rootdir/ueventd.rc
-index 0b7ffb8ea6..e06e453b11 100644
+index 0b7ffb8ea..e06e453b1 100644
 --- a/rootdir/ueventd.rc
 +++ b/rootdir/ueventd.rc
 @@ -54,7 +54,7 @@ subsystem dma_heap
@@ -28,5 +28,5 @@ index 0b7ffb8ea6..e06e453b11 100644
  /dev/tty0                 0660   root       system
  /dev/graphics/*           0660   root       graphics
 -- 
-2.34.1
+2.25.1
 
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 9dd24fa..98dd327 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 10ec5d0bd8dea2dbe53e51bca4259201a0ffcb50 Mon Sep 17 00:00:00 2001
+From d9c75784ad1e14a6f8eb42c5d8fa15cc5c28a82d Mon Sep 17 00:00:00 2001
 From: Alberto Ponces <ponces26@gmail.com>
 Date: Tue, 1 Feb 2022 13:48:35 +0000
-Subject: [PATCH] Revert "Set /system/xbin permissions to 750."
+Subject: [PATCH 09/24] Revert "Set /system/xbin permissions to 750."
 
 This reverts commit 42a1a126e554a8bca31d0afc832848b7b0fa1f4e.
 
@@ -11,7 +11,7 @@ Change-Id: I277def5153616d6f00bc877e6170b7fed7cd799d
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp
-index f90a1bc..8aadc3b 100644
+index f90a1bc3c..8aadc3bb7 100644
 --- a/libcutils/fs_config.cpp
 +++ b/libcutils/fs_config.cpp
 @@ -87,7 +87,7 @@ static const struct fs_path_config android_dirs[] = {
@@ -24,5 +24,5 @@ index f90a1bc..8aadc3b 100644
      { 00750, AID_ROOT,         AID_SYSTEM,       0, "system_ext/apex/com.android.tethering/bin/for-system" },
      { 00751, AID_ROOT,         AID_SHELL,        0, "system_ext/bin" },
 -- 
-2.40.1
+2.25.1
 
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 33854ec..043e105 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 d26ab2d93cd0b46e74e4681f48489e7d1122d2a7 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/24] Add my own OTA mechanism going over /data
 
 Change-Id: I9cacff2d761affa0376b4bb8ca63353a9d95b5de
 ---
@@ -10,7 +10,7 @@ Change-Id: I9cacff2d761affa0376b4bb8ca63353a9d95b5de
  2 files changed, 65 insertions(+), 1 deletion(-)
 
 diff --git a/fs_mgr/libfiemap/image_manager.cpp b/fs_mgr/libfiemap/image_manager.cpp
-index c416f4df44..b8eba80aac 100644
+index c416f4df4..b8eba80aa 100644
 --- a/fs_mgr/libfiemap/image_manager.cpp
 +++ b/fs_mgr/libfiemap/image_manager.cpp
 @@ -156,7 +156,7 @@ bool ImageManager::MetadataDirIsTest() const {
@@ -23,7 +23,7 @@ index c416f4df44..b8eba80aac 100644
  
  FiemapStatus ImageManager::CreateBackingImage(
 diff --git a/init/selinux.cpp b/init/selinux.cpp
-index 907eb80e31..636c16bb6f 100644
+index 907eb80e3..636c16bb6 100644
 --- a/init/selinux.cpp
 +++ b/init/selinux.cpp
 @@ -62,6 +62,9 @@
@@ -132,5 +132,5 @@ index 907eb80e31..636c16bb6f 100644
      boot_clock::time_point start_time = boot_clock::now();
  
 -- 
-2.34.1
+2.25.1
 
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 5e3d8c9..d02aea8 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 ad32c6911247c4b4e0200d51eb8217e4ce1f1f4b 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/24] fs_mgr: Keep allowing encryptable fstab flag
 
 Some users still use "encryptable" flag while being unencrypted. Let them still boot their devices.
 
@@ -11,7 +11,7 @@ Change-Id: Id2554d6563a869bb5bcf39c67b0322484bdab0c9
  1 file changed, 11 deletions(-)
 
 diff --git a/fs_mgr/fs_mgr_fstab.cpp b/fs_mgr/fs_mgr_fstab.cpp
-index 7731545d0f..fad84c653b 100644
+index 7731545d0..fad84c653 100644
 --- a/fs_mgr/fs_mgr_fstab.cpp
 +++ b/fs_mgr/fs_mgr_fstab.cpp
 @@ -322,17 +322,6 @@ bool ParseFsMgrFlags(const std::string& flags, FstabEntry* entry) {
@@ -33,5 +33,5 @@ index 7731545d0f..fad84c653b 100644
  }
  
 -- 
-2.34.1
+2.25.1
 
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 27c9939..4db54c0 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 8c02037a112c62d0d10a62566a431c5e2d1c01cb 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/24] FDE is dead. Fallback FDE to no encryption, and FDE+FBE
  to FBE
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH 12/21] FDE is dead. Fallback FDE to no encryption, and FDE+FBE
  1 file changed, 3 insertions(+), 4 deletions(-)
 
 diff --git a/fs_mgr/fs_mgr_fstab.cpp b/fs_mgr/fs_mgr_fstab.cpp
-index fad84c653b..f31d21ddd3 100644
+index fad84c653..f31d21ddd 100644
 --- a/fs_mgr/fs_mgr_fstab.cpp
 +++ b/fs_mgr/fs_mgr_fstab.cpp
 @@ -188,7 +188,7 @@ bool ParseFsMgrFlags(const std::string& flags, FstabEntry* entry) {
@@ -34,5 +34,5 @@ index fad84c653b..f31d21ddd3 100644
              // The voldmanaged flag is followed by an = and the label, a colon and the partition
              // number or the word "auto", e.g. voldmanaged=sdcard:3
 -- 
-2.34.1
+2.25.1
 
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 4fcd782..966e0c4 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 8f6312e63faa7fecbfbd1e8d3c3776ed387a9f95 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/24] Let system override adb/secure props, so we dont get
  stuck in ro.adb.secure=1 vendors
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH 13/21] Let system override adb/secure props, so we dont get
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/init/property_service.cpp b/init/property_service.cpp
-index 545c25e26f..da69dbe69e 100644
+index 545c25e26..da69dbe69 100644
 --- a/init/property_service.cpp
 +++ b/init/property_service.cpp
 @@ -787,7 +787,7 @@ static void LoadProperties(char* data, const char* filter, const char* filename,
@@ -22,5 +22,5 @@ index 545c25e26f..da69dbe69e 100644
                      } else {
                          it->second = value;
 -- 
-2.34.1
+2.25.1
 
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 eb0ce77..fd3a9bc 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 72acbfc3e8ff4e5af985232f8c7338ac0bb31fb5 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/24] Allow apex on > 5.0 kernels. This is needed because on
  Pixels, camera HAL are exclusively in vendor apex
 
 Change-Id: I334cde4c5557b0ff70d550205c5bb727d4b5dbf5
@@ -10,7 +10,7 @@ Change-Id: I334cde4c5557b0ff70d550205c5bb727d4b5dbf5
  1 file changed, 14 insertions(+), 1 deletion(-)
 
 diff --git a/init/property_service.cpp b/init/property_service.cpp
-index da69dbe69e..a1993c8224 100644
+index da69dbe69..a1993c822 100644
 --- a/init/property_service.cpp
 +++ b/init/property_service.cpp
 @@ -62,6 +62,7 @@
@@ -50,5 +50,5 @@ index da69dbe69e..a1993c8224 100644
                      } else {
                          it->second = value;
 -- 
-2.34.1
+2.25.1
 
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 6d7972d..c1ffff1 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,14 +1,14 @@
-From c2dc1a137d727236440151841575334196f17dcb Mon Sep 17 00:00:00 2001
+From fa46d21b10d5835a17d0d3d8c8bd7e9e29050103 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/24] watchdogd: Support pinging two watchdogs
 
 ---
  watchdogd/watchdogd.cpp | 33 +++++++++++++++++++++++++++++++++
  1 file changed, 33 insertions(+)
 
 diff --git a/watchdogd/watchdogd.cpp b/watchdogd/watchdogd.cpp
-index 5dc41e6b8a..69abb4e2b6 100644
+index 5dc41e6b8..69abb4e2b 100644
 --- a/watchdogd/watchdogd.cpp
 +++ b/watchdogd/watchdogd.cpp
 @@ -20,12 +20,15 @@
@@ -74,5 +74,5 @@ index 5dc41e6b8a..69abb4e2b6 100644
      }
  }
 -- 
-2.34.1
+2.25.1
 
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 5839267..44b108f 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 dcd6a18fd23bf644e9ec7200a59acb0edca766e5 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/24] 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.
 
@@ -20,7 +20,7 @@ allow load sysfs_backlight_attr:file rw_file_perms;
  4 files changed, 108 insertions(+), 7 deletions(-)
 
 diff --git a/healthd/healthd_draw.cpp b/healthd/healthd_draw.cpp
-index 7c79319445..2266233e18 100644
+index 7c7931944..2266233e1 100644
 --- a/healthd/healthd_draw.cpp
 +++ b/healthd/healthd_draw.cpp
 @@ -15,18 +15,28 @@
@@ -142,7 +142,7 @@ index 7c79319445..2266233e18 100644
  
  // support screen rotation for foldable phone
 diff --git a/healthd/healthd_draw.h b/healthd/healthd_draw.h
-index 016db8e071..e8e51748d9 100644
+index 016db8e07..e8e51748d 100644
 --- a/healthd/healthd_draw.h
 +++ b/healthd/healthd_draw.h
 @@ -84,9 +84,15 @@ class HealthdDraw {
@@ -162,7 +162,7 @@ index 016db8e071..e8e51748d9 100644
  
  #endif  // HEALTHD_DRAW_H
 diff --git a/healthd/healthd_mode_charger.cpp b/healthd/healthd_mode_charger.cpp
-index 26af13b314..0d4ba32ff1 100644
+index 26af13b31..0d4ba32ff 100644
 --- a/healthd/healthd_mode_charger.cpp
 +++ b/healthd/healthd_mode_charger.cpp
 @@ -93,9 +93,9 @@ char* locale;
@@ -213,7 +213,7 @@ index 26af13b314..0d4ba32ff1 100644
  
  void Charger::OnHealthInfoChanged(const ChargerHealthInfo& health_info) {
 diff --git a/healthd/include_charger/charger/healthd_mode_charger.h b/healthd/include_charger/charger/healthd_mode_charger.h
-index c463b92aa8..50267ffee8 100644
+index c463b92aa..50267ffee 100644
 --- a/healthd/include_charger/charger/healthd_mode_charger.h
 +++ b/healthd/include_charger/charger/healthd_mode_charger.h
 @@ -103,6 +103,7 @@ class Charger {
@@ -225,5 +225,5 @@ index c463b92aa8..50267ffee8 100644
      void InitHealthdDraw();
      void InitAnimation();
 -- 
-2.34.1
+2.25.1
 
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 a8ac2a2..2548074 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 0f084a20a69ff3b30c1a6d7af02e2ee823ee7144 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/24] Disable quotas on legacy devices with encryption
  disabled
 
 Source: https://t.me/phhtreblebuilders/20521 and https://t.me/phhtreblebuilders/20546
@@ -10,7 +10,7 @@ Source: https://t.me/phhtreblebuilders/20521 and https://t.me/phhtreblebuilders/
  1 file changed, 7 insertions(+)
 
 diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp
-index 2038b347f1..df9372c051 100644
+index e5dbaf32c..2b8dbd46c 100644
 --- a/fs_mgr/fs_mgr.cpp
 +++ b/fs_mgr/fs_mgr.cpp
 @@ -378,6 +378,13 @@ static void tune_quota(const std::string& blk_device, const FstabEntry& entry,
@@ -28,5 +28,5 @@ index 2038b347f1..df9372c051 100644
          LERROR << "Unable to " << (want_quota ? "enable" : "disable") << " quotas on " << blk_device
                 << " because " TUNE2FS_BIN " is missing";
 -- 
-2.34.1
+2.25.1
 
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 a003b6f..54c8c48 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 cf2b10c83b9d1f8d1575a2330b042f6b22cf3a35 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/24] Add /vendor/firmware_mnt. Moto Razr 2019 look for
  firmwares (modem, sensors, ...) there
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH 18/21] Add /vendor/firmware_mnt. Moto Razr 2019 look for
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/rootdir/ueventd.rc b/rootdir/ueventd.rc
-index e06e453b11..0af6948f8d 100644
+index e06e453b1..0af6948f8 100644
 --- a/rootdir/ueventd.rc
 +++ b/rootdir/ueventd.rc
 @@ -1,7 +1,7 @@
@@ -22,5 +22,5 @@ index e06e453b11..0af6948f8d 100644
  
  subsystem graphics
 -- 
-2.34.1
+2.25.1
 
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 d5872e7..4667687 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 b85dfb5ef6ab299fa2b1afc53d69fab6eabbbc6b 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/24] 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
@@ -12,7 +12,7 @@ devices without cgroupv2 simply won't freeze processes at all
  1 file changed, 3 insertions(+)
 
 diff --git a/init/service.cpp b/init/service.cpp
-index 35beaad33d..9642369292 100644
+index 35beaad33..964236929 100644
 --- a/init/service.cpp
 +++ b/init/service.cpp
 @@ -707,6 +707,8 @@ Result<void> Service::Start() {
@@ -33,5 +33,5 @@ index 35beaad33d..9642369292 100644
  
          // When the blkio controller is mounted in the v1 hierarchy, NormalIoPriority is
 -- 
-2.34.1
+2.25.1
 
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 e6b08d7..a43812e 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 5c247a1eabc40fdefa0009cc3001b104e41b669b 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/24] Disable project_quota on old devices but new enough to
  have encryption (they do keep quota support)
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH 21/21] Disable project_quota on old devices but new enough to
  1 file changed, 8 insertions(+)
 
 diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp
-index df9372c051..1bead469de 100644
+index 2b8dbd46c..285ea21fd 100644
 --- a/fs_mgr/fs_mgr.cpp
 +++ b/fs_mgr/fs_mgr.cpp
 @@ -385,6 +385,14 @@ static void tune_quota(const std::string& blk_device, const FstabEntry& entry,
@@ -28,5 +28,5 @@ index df9372c051..1bead469de 100644
          LERROR << "Unable to " << (want_quota ? "enable" : "disable") << " quotas on " << blk_device
                 << " because " TUNE2FS_BIN " is missing";
 -- 
-2.34.1
+2.25.1
 
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
index 362287f..ffa28f9 100644
--- 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
@@ -1,7 +1,7 @@
-From 5a6e774867278feaffe9e0c13dc23ccfb5872b0a Mon Sep 17 00:00:00 2001
+From 843dc1cfa90d542b85bc9da204e4e91af6803476 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
+Subject: [PATCH 22/24] fix: Nubia 6 series custom rc action prop validation
 
 ---
  init/action_parser.cpp | 1 +
diff --git a/patches/trebledroid/platform_system_extras/0001-libfscrypt-Bail-out-if-we-can-t-open-directory.patch b/patches/trebledroid/platform_system_extras/0001-libfscrypt-Bail-out-if-we-can-t-open-directory.patch
index 0e469fe..8609d28 100644
--- a/patches/trebledroid/platform_system_extras/0001-libfscrypt-Bail-out-if-we-can-t-open-directory.patch
+++ b/patches/trebledroid/platform_system_extras/0001-libfscrypt-Bail-out-if-we-can-t-open-directory.patch
@@ -1,4 +1,4 @@
-From 5c3b72e250dd43f0c66fdfe62971d6802ae26fbc Mon Sep 17 00:00:00 2001
+From bc0a573aa58e366d9f34811bb698dffc4de695cb Mon Sep 17 00:00:00 2001
 From: Luca Stefani <luca.stefani.ge1@gmail.com>
 Date: Wed, 9 Sep 2020 12:43:54 +0200
 Subject: [PATCH] libfscrypt: Bail out if we can't open directory
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 d312da3..d08118a 100644
--- a/patches/trebledroid/platform_system_linkerconfig/0001-Disable-vndklite-handling.patch
+++ b/patches/trebledroid/platform_system_linkerconfig/0001-Disable-vndklite-handling.patch
@@ -1,4 +1,4 @@
-From 54d0800923cfdaf7bdcbf9b8379823f600a4f23a Mon Sep 17 00:00:00 2001
+From 20667b3e57d4edef357435b7eecd62edcb81f7de Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 27 Oct 2021 14:40:26 -0400
 Subject: [PATCH] Disable vndklite handling
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 b6b5973..b35031c 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
@@ -1,4 +1,4 @@
-From 5eca866c8d670d959f76935f129c20539241bc79 Mon Sep 17 00:00:00 2001
+From 91ab1ef92af5fcfceddab678c1d2d8d7965f6247 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 2 Jul 2018 22:01:43 +0200
 Subject: [PATCH 1/4] Huawei Kirin 960:: accept broken rpfilter match
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 1fe93cb..a7b5499 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
@@ -1,4 +1,4 @@
-From 8c255147f9ae33b8cd5f726d70edfa9af4ebd363 Mon Sep 17 00:00:00 2001
+From d91817817a1012cc644237496c4b252cea9cbaa5 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 29 Jul 2019 18:09:12 +0200
 Subject: [PATCH 2/4] Don't fail on FTP conntracking failing
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 79397dd..4366f54 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
@@ -1,4 +1,4 @@
-From 87b5e3c463e66b497d2009b1030c0f2513802b11 Mon Sep 17 00:00:00 2001
+From 1bf386d291c7a5ecc00c77dfb89f28c27104d9ec Mon Sep 17 00:00:00 2001
 From: ChonDoit <thphantomblog@gmail.com>
 Date: Fri, 7 Oct 2022 02:43:21 +0000
 Subject: [PATCH 3/4] Support no-bpf usecase
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 2e20bd7..25c4dbd 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
@@ -1,4 +1,4 @@
-From a613dcfa688ce7cb17d79f07bc3a0ad0e48dd3a0 Mon Sep 17 00:00:00 2001
+From 1ff7b31f5766eec7c7f067be7be3f0da99052785 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 26 Oct 2022 18:13:56 -0400
 Subject: [PATCH 4/4] Don't abort in case of cgroup/bpf setup fail, since some
diff --git a/patches/trebledroid/platform_system_nfc/0001-Let-vendor-have-priority-over-NFC-config-file-rather.patch b/patches/trebledroid/platform_system_nfc/0001-Let-vendor-have-priority-over-NFC-config-file-rather.patch
index 00ed76e..d0cf8cc 100644
--- a/patches/trebledroid/platform_system_nfc/0001-Let-vendor-have-priority-over-NFC-config-file-rather.patch
+++ b/patches/trebledroid/platform_system_nfc/0001-Let-vendor-have-priority-over-NFC-config-file-rather.patch
@@ -1,4 +1,4 @@
-From 24bcee2084de6eff1eb707672f2a22f1643c0b85 Mon Sep 17 00:00:00 2001
+From d1ebd2dbb8e521c7dcff2c4ca42c4e4044c28c6a Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 21 Dec 2020 19:36:54 +0100
 Subject: [PATCH] Let vendor have priority over NFC config file, rather than
@@ -25,5 +25,5 @@ index f635fd50..15d42cab 100644
    for (std::string path : search_path) {
      path.append(file_name);
 -- 
-2.34.1
+2.25.1
 
diff --git a/patches/trebledroid/platform_system_sepolicy/0001-Revert-Remove-28.0-compat-support.patch b/patches/trebledroid/platform_system_sepolicy/0001-Revert-Remove-28.0-compat-support.patch
index 77097d0..7905348 100644
--- a/patches/trebledroid/platform_system_sepolicy/0001-Revert-Remove-28.0-compat-support.patch
+++ b/patches/trebledroid/platform_system_sepolicy/0001-Revert-Remove-28.0-compat-support.patch
@@ -1,4 +1,4 @@
-From aa65bb6381fb25d333263a53a304c02fd718521b Mon Sep 17 00:00:00 2001
+From f7e58965725f14a70f15389ac6608f1d6e896484 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 6 Oct 2023 08:25:11 -0400
 Subject: [PATCH] Revert "Remove 28.0 compat support"
diff --git a/patches/trebledroid/platform_system_vold/0001-Allow-deletion-of-symlink.patch b/patches/trebledroid/platform_system_vold/0001-Allow-deletion-of-symlink.patch
index 4c7f47d..c232a88 100644
--- a/patches/trebledroid/platform_system_vold/0001-Allow-deletion-of-symlink.patch
+++ b/patches/trebledroid/platform_system_vold/0001-Allow-deletion-of-symlink.patch
@@ -1,4 +1,4 @@
-From 2dc77366f8d89217547d6bde5f6e324f2342dbc5 Mon Sep 17 00:00:00 2001
+From b00fbfc470c6f91224429178bc24c30f9146af05 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 17 Feb 2018 19:39:38 +0100
 Subject: [PATCH 1/5] Allow deletion of symlink
@@ -21,5 +21,5 @@ index 903d36bf..74e6ad1d 100644
          return false;
      }
 -- 
-2.34.1
+2.25.1
 
diff --git a/patches/trebledroid/platform_system_vold/0002-Failing-to-create-facedata-shouldn-t-be-fatal.patch b/patches/trebledroid/platform_system_vold/0002-Failing-to-create-facedata-shouldn-t-be-fatal.patch
index d16b509..8271f5e 100644
--- a/patches/trebledroid/platform_system_vold/0002-Failing-to-create-facedata-shouldn-t-be-fatal.patch
+++ b/patches/trebledroid/platform_system_vold/0002-Failing-to-create-facedata-shouldn-t-be-fatal.patch
@@ -1,4 +1,4 @@
-From ae11f38991dcfdb1c1b0bda40e73fed37621a720 Mon Sep 17 00:00:00 2001
+From 07a2e0ce1800768320985136d1a73ee95cf3a5b1 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 7 Mar 2020 14:49:09 +0100
 Subject: [PATCH 2/5] Failing to create facedata shouldn't be fatal
@@ -34,5 +34,5 @@ index 60e82f50..c1ded02e 100644
          }
      }
 -- 
-2.34.1
+2.25.1
 
diff --git a/patches/trebledroid/platform_system_vold/0003-Don-t-unmount-rw-system.sh-binds.patch b/patches/trebledroid/platform_system_vold/0003-Don-t-unmount-rw-system.sh-binds.patch
index b1e5d7d..6a29a49 100644
--- a/patches/trebledroid/platform_system_vold/0003-Don-t-unmount-rw-system.sh-binds.patch
+++ b/patches/trebledroid/platform_system_vold/0003-Don-t-unmount-rw-system.sh-binds.patch
@@ -1,4 +1,4 @@
-From e62433081df0f9cae64d2de5a7455552a4df72e8 Mon Sep 17 00:00:00 2001
+From a3a276b58ccd0a3526c4b7fb7c1cee8285fa3685 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 29 Nov 2021 17:49:13 -0500
 Subject: [PATCH 3/5] Don't unmount rw-system.sh binds
@@ -9,10 +9,10 @@ Change-Id: If9132c21defa8b09879b79a70794c5275d6852d0
  1 file changed, 1 insertion(+)
 
 diff --git a/VolumeManager.cpp b/VolumeManager.cpp
-index e29b9206..b87b9bae 100644
+index dc6fae98..47c8cd40 100644
 --- a/VolumeManager.cpp
 +++ b/VolumeManager.cpp
-@@ -983,6 +983,7 @@ int VolumeManager::unmountAll() {
+@@ -985,6 +985,7 @@ int VolumeManager::unmountAll() {
      while ((mentry = getmntent(fp)) != NULL) {
          auto test = std::string(mentry->mnt_dir);
          if ((StartsWith(test, "/mnt/") &&
@@ -21,5 +21,5 @@ index e29b9206..b87b9bae 100644
               !StartsWith(test, "/mnt/scratch") &&
  #endif
 -- 
-2.34.1
+2.25.1