From 79b5b414a751c82b32c67e691bf542f4844216be Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Thu, 6 Aug 2020 12:25:05 +0000
Subject: [PATCH] Regenerate patches

frameworks/base got too messy, time to clean it up
---
 ...-SDK-version-override-from-property.patch} | 12 +--
 ....config-only-on-same-version-vendor.patch} | 10 +-
 ...t-reboot-if-we-couldn-t-get-bootctrl.patch |  4 +-
 ...HALs-needed-because-they-need-to-e-i.patch | 14 +--
 ...IMAGE_AS_SYSTEM-parameter-to-build-S.patch | 12 +--
 ...m-because-if-it-exists-it-includes-f.patch |  4 +-
 ...ecls-by-default.-This-is-needed-beca.patch |  6 +-
 ...-log_level-to-get-actual-selinux-err.patch |  6 +-
 ...-some-conflicting-Kirin-tether-SELin.patch |  8 +-
 ...rtual-block-genfscon-conflict-seen-o.patch |  6 +-
 ...Remove-ramdisk-s-zygote-init-scripts.patch |  6 +-
 ...rcs-accept-conflict.-Seen-on-Moto-E5.patch |  6 +-
 ...-on-Moto-devices-using-unknown-class.patch |  6 +-
 ...8-Allow-mismatches-of-exfat-genfscon.patch |  4 +-
 ...gnoring-vendor-supplied-texture-swiz.patch |  4 +-
 ...IH-devices-Fix-Earpiece-audio-output.patch |  6 +-
 ...i-Display-on-Huawei-devices-EMUI-8.0.patch | 10 +-
 ...rin-Remove-lock-to-prevent-self-lock.patch | 10 +-
 ...e-a-mFlashlight-at-this-state-but-th.patch | 11 ++-
 ...pport-calling-addStates-in-enumerate.patch | 12 +--
 ...t-Set-rlimit-rtprio-for-cameraserver.patch |  6 +-
 ...IH-devices-Fix-Earpiece-audio-output.patch |  6 +-
 ...8-Fix-use-after-free-object-on-stack.patch |  6 +-
 .../0009-Fix-BT-in-call-on-CAF-devices.patch  |  6 +-
 ...-for-unknown-audio-sources-in-Fix-BT.patch |  6 +-
 ...id-is-hardcoded-support-for-Asus-ZF6.patch | 20 ++--
 ...wei-camera-that-s-not-ideal-because-.patch | 10 +-
 ...again-with-trimmed-audio-port-name-i.patch |  6 +-
 ...CO-devices.-Fallback-from-one-to-th.patch} |  8 +-
 ...hh.samsung.camera_ids-property-to-a.patch} |  8 +-
 ...ty-to-force-camera-timestamp-source.patch} |  8 +-
 ...hh.disable_a2dp_offload-property-to.patch} | 12 +--
 ...1-Fix-backlight-control-on-Galaxy-S9.patch | 14 +--
 ...uirement-for-visible-flag-to-sdcards.patch | 10 +-
 .../0003-Also-scan-system-overlay.patch       | 10 +-
 ...h-if-there-is-IR-HAL-is-not-declared.patch | 25 -----
 .../{0005-Fix-62.patch => 0004-Fix-62.patch}  | 10 +-
 ...brightness-override-only-for-screen.patch} | 10 +-
 ...ss.patch => 0006-Fix-OP6-brightness.patch} | 10 +-
 ...tness-more-generic-using-property-s.patch} | 10 +-
 ...-RROs-allow-to-prefix-the-value-wit.patch} |  6 +-
 ...-typo-on-fnmatch-return-value-check.patch} |  6 +-
 ....patch => 0010-Add-Qualcomm-starlte.patch} | 10 +-
 ...onEnroll-is-actually-a-percent-of-p.patch} | 12 +--
 ...Show-APN-Settings-for-CDMA-carriers.patch} | 10 +-
 ...ntly-ignore-RROs-with-same-priority.patch} |  6 +-
 ...e-IR-HAL-to-the-infinity-and-beyond.patch} |  6 +-
 ...ght-fingerprint-match-to-regexp-to-.patch} | 10 +-
 ...ggle-to-enable-high-brightness-rang.patch} | 10 +-
 ...-to-override-pre-o-max-aspect-ratio.patch} | 12 +--
 ...se-S9.patch => 0018-Add-japanese-S9.patch} | 10 +-
 ...-so-that-it-works-even-without-qtag.patch} | 12 +--
 ...or-astarqlte.-Probably-more-devices.patch} | 10 +-
 ... 0021-Support-new-samsung-light-hal.patch} |  6 +-
 ...S10-.-Add-an-additional-property-to.patch} | 10 +-
 ...-samsung-light-HAL-more-overridable.patch} | 10 +-
 ...-fingerprint-broken-HAL-overridable.patch} | 10 +-
 ...rty-to-use-linear-brightness-slider.patch} |  6 +-
 ...amsung-touch-proximity-sensor-as-fa.patch} | 12 +--
 ...patch => 0027-Use-Samsung-power-HAL.patch} | 10 +-
 ...ung.sensor.physical_proximity-if-av.patch} | 10 +-
 .../{0033-wip.patch => 0029-wip.patch}        |  8 +-
 ...entd-arent-known-to-init-8.0.-disab.patch} |  6 +-
 ...for-samsung-light-service-everytime.patch} | 10 +-
 ...msung-fod-support-for-ultrasound-fp.patch} |  6 +-
 ...ay-and-fix-support-for-properties-i.patch} | 18 ++--
 ...w-life-cycle-though-it-is-still-mis.patch} | 12 +--
 ...bbase-because-of-updated-skia-depen.patch} |  6 +-
 ...-devices-by-checking-for-null-clien.patch} | 10 +-
 ...=> 0037-Support-Samsung-Q-Light-HAL.patch} |  6 +-
 ...Add-a-nodim-property-for-FacolaView.patch} |  6 +-
 ...amsung-s-Q-power-HAL-to-fix-suspend.patch} |  6 +-
 ...t-goodix-ext-and-fix-wrong-forced-b.patch} | 10 +-
 ...Fix-big-goodix-integration-mistakes.patch} |  6 +-
 ...evices-with-higher-aspect-ratio-dow.patch} |  8 +-
 ...system-side-properties-vendor-side-.patch} |  6 +-
 ...s-events-to-oppo-fingerprint-sensor.patch} |  6 +-
 ...amsung-optical-under-display-finger.patch} | 10 +-
 ...046-Fix-persist.sys.fp.fod-override.patch} |  6 +-
 ...f-fingerprint-cleanups-needed-on-so.patch} | 12 +--
 ...OD.patch => 0048-Support-Realme-FOD.patch} | 10 +-
 ...nd-GL-texture-if-AHB-content-has-cha.patch | 96 -------------------
 ...ch => 0049-Support-Huawei-light-HAL.patch} | 16 ++--
 ...rriding-the-number-of-work-profiles.patch} | 10 +-
 ...mmand-for-non-optical-samsung-devic.patch} |  6 +-
 ...istener-to-be-used-by-FOD-to-proper.patch} | 12 +--
 ...facola-on-preenroll-wait-for-enroll.patch} |  6 +-
 ...-for-new-Goodix-Samsung-Xiaomi-FODs.patch} | 10 +-
 ...vendor-we-don-t-want-our-own-diming.patch} |  6 +-
 ...ch-is-guarded-by-Handler.-This-is-n.patch} |  6 +-
 ...-FOD-HALs-because-we-check-samsung-.patch} |  6 +-
 ...wake-up-devices-just-as-well-as-bac.patch} |  8 +-
 ...n-t-use-presentOrValidate-so-it-s-br.patch |  6 +-
 .../0002-Ignore-usage-bits-verification.patch | 10 +-
 ...ack-to-old-ro.sf.hwrotation-property.patch | 10 +-
 ...ng-devices-requires-lying-colorspace.patch | 10 +-
 ...ed-to-send-a-hack-message-to-HAL-to-.patch |  6 +-
 ...etain-the-sideband-layer-information.patch |  8 +-
 ...oser-hacks-to-properly-display-FOD-l.patch |  6 +-
 ...-Samsung-Xiaomi-new-FOD-HBM-controls.patch |  4 +-
 ...tManager-Remove-ensure_config_file_e.patch |  4 +-
 ...02-Support-hostap-on-O-O-MR1-vendors.patch | 12 +--
 ...behaviour-of-initing-ifaces-before-s.patch | 10 +-
 ...cant-both-with-lazy-hal-style-and-in.patch |  8 +-
 ...Add-route-to-gateway-on-null-netmask.patch | 10 +-
 ...ot-call-onUssdRelease-for-Huawei-RIL.patch | 10 +-
 ...NNECTIONS_GSM-settable-from-property.patch |  6 +-
 .../0004-Choose-a-more-generic-prop.patch     | 10 +-
 ...-MTK-IRadio-interfaces-to-approve-in.patch | 18 ++--
 ...adioIndication-RadioResponse-to-get-.patch | 16 ++--
 ...ward-port-support-for-forceCognitive.patch | 14 +--
 ...tModemStatus-calls-when-enabling-CA.patch} | 11 +--
 ...ILs.-It-might-get-blacklisted-for-b.patch} | 12 +--
 ...e-when-there-is-no-hal-but-we-believ.patch |  8 +-
 ...ric-parsing-in-CellInfoUtil-support-.patch |  4 +-
 ...ephony-Support-muting-by-RIL-command.patch |  8 +-
 ...2-Fixes-crash-when-selecting-network.patch |  6 +-
 ...3-Fail-gracefully-in-mobile-settings.patch |  6 +-
 ...ric-parsing-in-CellInfoUtil-support-.patch |  4 +-
 ...n-bpfloader-because-it-will-crash-8..patch |  4 +-
 ...e-BTM_BYPASS_EXTRA_ACL_SETUP-dynamic.patch | 16 ++--
 ...trol-supported-features-and-states-1.patch | 18 ++--
 ...phh.disable_a2dp_offload-property-to.patch | 10 +-
 ...t-logd-add-passcred-for-logdw-socket.patch |  6 +-
 ...hes-when-using-too-recent-sdcardfs-o.patch |  6 +-
 ...-which-may-fail-and-only-run-thread-.patch |  6 +-
 ...-proc-kmsg-if-reading-from-it-faults.patch |  6 +-
 ...into-recovery-rather-than-bootloader.patch | 10 +-
 ...If-Vboot2-fails-fall-back-to-Vboot1.patch} |  6 +-
 .../{0008-wip.patch => 0007-wip.patch}        |  6 +-
 ...isk-group-not-very-useful-and-break.patch} |  6 +-
 ...ion-into-account-to-know-what-to-te.patch} |  6 +-
 ...-Use-a-vndk-lite-friendly-ld-config.patch} |  6 +-
 ...k.version-into-account-to-know-what.patch} |  6 +-
 ...capability-to-bypass-hidepid-AOSP-u.patch} |  6 +-
 ...et-dev-uinput-as-0666-to-fix-finger.patch} |  6 +-
 ...-our-vndk-to-access-libnativeloader.patch} |  6 +-
 ...in-960-accept-broken-rpfilter-match.patch} |  9 +-
 ...n-t-fail-on-FTP-conntracking-failing.patch |  4 +-
 ...s-or-exfat-genfscon.-Assume-OEM-does.patch | 71 --------------
 ...-esdfs-or-exfat-genfscon.-Assume-OEM.patch | 73 --------------
 .../0001-Allow-deletion-of-symlink.patch      | 10 +-
 ...erved_disk-group-it-panics-old-inits.patch |  6 +-
 ....-This-is-done-by-init.rc-on-system-.patch | 10 +-
 ...s-implementation-of-exfat-called-sdf.patch |  6 +-
 ...e-vendor_ce-same-reason-as-vendor_de.patch | 10 +-
 ...point-only-if-checkpoint-is-supporte.patch |  6 +-
 .../0007-Sony-has-texfat-exfat-fs.patch       |  6 +-
 ...o-create-facedata-shouldn-t-be-fatal.patch |  4 +-
 ...ery-voldmanaged-storage-is-adoptable.patch |  6 +-
 150 files changed, 615 insertions(+), 881 deletions(-)
 rename patches/platform_bionic/{0004-Read-SDK-version-override-from-property.patch => 0001-Read-SDK-version-override-from-property.patch} (78%)
 rename patches/platform_bionic/{0005-Use-vndk_lite-ld.config-only-on-same-version-vendor.patch => 0002-Use-vndk_lite-ld.config-only-on-same-version-vendor.patch} (83%)
 rename patches/platform_frameworks_av/{0015-There-are-three-SCO-devices.-Fallback-from-one-to-th.patch => 0014-There-are-three-SCO-devices.-Fallback-from-one-to-th.patch} (91%)
 rename patches/platform_frameworks_av/{0022-Add-persist.sys.phh.samsung.camera_ids-property-to-a.patch => 0015-Add-persist.sys.phh.samsung.camera_ids-property-to-a.patch} (94%)
 rename patches/platform_frameworks_av/{0023-Add-a-property-to-force-camera-timestamp-source.patch => 0016-Add-a-property-to-force-camera-timestamp-source.patch} (91%)
 rename patches/platform_frameworks_av/{0024-Add-persist.sys.phh.disable_a2dp_offload-property-to.patch => 0017-Add-persist.sys.phh.disable_a2dp_offload-property-to.patch} (98%)
 delete mode 100644 patches/platform_frameworks_base/0004-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch
 rename patches/platform_frameworks_base/{0005-Fix-62.patch => 0004-Fix-62.patch} (82%)
 rename patches/platform_frameworks_base/{0006-S9-brightness-override-only-for-screen.patch => 0005-S9-brightness-override-only-for-screen.patch} (85%)
 rename patches/platform_frameworks_base/{0007-WIP-Fix-OP6-brightness.patch => 0006-Fix-OP6-brightness.patch} (85%)
 rename patches/platform_frameworks_base/{0008-Try-to-make-brightness-more-generic-using-property-s.patch => 0007-Try-to-make-brightness-more-generic-using-property-s.patch} (83%)
 rename patches/platform_frameworks_base/{0009-property-matching-RROs-allow-to-prefix-the-value-wit.patch => 0008-property-matching-RROs-allow-to-prefix-the-value-wit.patch} (84%)
 rename patches/platform_frameworks_base/{0010-Fix-typo-on-fnmatch-return-value-check.patch => 0009-Fix-typo-on-fnmatch-return-value-check.patch} (81%)
 rename patches/platform_frameworks_base/{0011-Add-Qualcomm-starlte.patch => 0010-Add-Qualcomm-starlte.patch} (82%)
 rename patches/platform_frameworks_base/{0012-Galaxy-S9-remaining-of-HAL-onEnroll-is-actually-a-pe.patch => 0011-remaining-of-HAL-onEnroll-is-actually-a-percent-of-p.patch} (83%)
 rename patches/platform_frameworks_base/{0013-Show-APN-Settings-for-CDMA-carriers.patch => 0012-Show-APN-Settings-for-CDMA-carriers.patch} (82%)
 rename patches/platform_frameworks_base/{0014-idmap-Don-t-silently-ignore-RROs-with-same-priority.patch => 0013-idmap-Don-t-silently-ignore-RROs-with-same-priority.patch} (81%)
 rename patches/platform_frameworks_base/{0017-Don-t-wake-IR-HAL-to-the-infinity-and-beyond.patch => 0014-Don-t-wake-IR-HAL-to-the-infinity-and-beyond.patch} (92%)
 rename patches/platform_frameworks_base/{0018-Switch-samsung-light-fingerprint-match-to-regexp-to-.patch => 0015-Switch-samsung-light-fingerprint-match-to-regexp-to-.patch} (81%)
 rename patches/platform_frameworks_base/{0019-Add-a-property-toggle-to-enable-high-brightness-rang.patch => 0016-Add-a-property-toggle-to-enable-high-brightness-rang.patch} (84%)
 rename patches/platform_frameworks_base/{0020-Add-a-property-to-override-pre-o-max-aspect-ratio.patch => 0017-Add-a-property-to-override-pre-o-max-aspect-ratio.patch} (85%)
 rename patches/platform_frameworks_base/{0021-Add-japanese-S9.patch => 0018-Add-japanese-S9.patch} (83%)
 rename patches/platform_frameworks_base/{0022-Re-order-services-so-that-it-works-even-without-qtag.patch => 0019-Re-order-services-so-that-it-works-even-without-qtag.patch} (83%)
 rename patches/platform_frameworks_base/{0023-Different-value-for-astarqlte.-Probably-more-devices.patch => 0020-Different-value-for-astarqlte.-Probably-more-devices.patch} (84%)
 rename patches/platform_frameworks_base/{0024-Support-new-samsung-light-hal.patch => 0021-Support-new-samsung-light-hal.patch} (95%)
 rename patches/platform_frameworks_base/{0025-Fix-backlight-on-S10-.-Add-an-additional-property-to.patch => 0022-Fix-backlight-on-S10-.-Add-an-additional-property-to.patch} (82%)
 rename patches/platform_frameworks_base/{0026-Make-samsung-light-HAL-more-overridable.patch => 0023-Make-samsung-light-HAL-more-overridable.patch} (91%)
 rename patches/platform_frameworks_base/{0027-Make-Samsung-fingerprint-broken-HAL-overridable.patch => 0024-Make-Samsung-fingerprint-broken-HAL-overridable.patch} (85%)
 rename patches/platform_frameworks_base/{0029-Add-property-to-use-linear-brightness-slider.patch => 0025-Add-property-to-use-linear-brightness-slider.patch} (92%)
 rename patches/platform_frameworks_base/{0030-Add-support-for-samsung-touch-proximity-sensor-as-fa.patch => 0026-Add-support-for-samsung-touch-proximity-sensor-as-fa.patch} (87%)
 rename patches/platform_frameworks_base/{0031-Use-Samsung-power-HAL.patch => 0027-Use-Samsung-power-HAL.patch} (84%)
 rename patches/platform_frameworks_base/{0032-Also-add-com.samsung.sensor.physical_proximity-if-av.patch => 0028-Also-add-com.samsung.sensor.physical_proximity-if-av.patch} (84%)
 rename patches/platform_frameworks_base/{0033-wip.patch => 0029-wip.patch} (99%)
 rename patches/platform_frameworks_base/{0034-User-statsd-incidentd-arent-known-to-init-8.0.-disab.patch => 0030-User-statsd-incidentd-arent-known-to-init-8.0.-disab.patch} (93%)
 rename patches/platform_frameworks_base/{0035-Check-for-samsung-light-service-everytime.patch => 0031-Check-for-samsung-light-service-everytime.patch} (79%)
 rename patches/platform_frameworks_base/{0036-Forawrdport-Samsung-fod-support-for-ultrasound-fp.patch => 0032-Forawrdport-Samsung-fod-support-for-ultrasound-fp.patch} (97%)
 rename patches/platform_frameworks_base/{0037-Scan-system-overlay-and-fix-support-for-properties-i.patch => 0033-Scan-system-overlay-and-fix-support-for-properties-i.patch} (94%)
 rename patches/platform_frameworks_base/{0038-Improve-FacolaView-life-cycle-though-it-is-still-mis.patch => 0034-Improve-FacolaView-life-cycle-though-it-is-still-mis.patch} (93%)
 rename patches/platform_frameworks_base/{0039-Link-hwui-with-libbase-because-of-updated-skia-depen.patch => 0035-Link-hwui-with-libbase-because-of-updated-skia-depen.patch} (80%)
 rename patches/platform_frameworks_base/{0040-Fix-crash-on-some-devices-by-checking-for-null-clien.patch => 0036-Fix-crash-on-some-devices-by-checking-for-null-clien.patch} (88%)
 rename patches/platform_frameworks_base/{0041-Support-Samsung-Q-Light-HAL.patch => 0037-Support-Samsung-Q-Light-HAL.patch} (99%)
 rename patches/platform_frameworks_base/{0042-Add-a-nodim-property-for-FacolaView.patch => 0038-Add-a-nodim-property-for-FacolaView.patch} (93%)
 rename patches/platform_frameworks_base/{0043-Add-Samsung-s-Q-power-HAL-to-fix-suspend.patch => 0039-Add-Samsung-s-Q-power-HAL-to-fix-suspend.patch} (96%)
 rename patches/platform_frameworks_base/{0044-FacolaView-Support-goodix-ext-and-fix-wrong-forced-b.patch => 0040-FacolaView-Support-goodix-ext-and-fix-wrong-forced-b.patch} (95%)
 rename patches/platform_frameworks_base/{0045-Fix-big-goodix-integration-mistakes.patch => 0041-Fix-big-goodix-integration-mistakes.patch} (95%)
 rename patches/platform_frameworks_base/{0046-fix-crashing-on-devices-with-higher-aspect-ratio-dow.patch => 0042-fix-crashing-on-devices-with-higher-aspect-ratio-dow.patch} (92%)
 rename patches/platform_frameworks_base/{0049-FacolaView-Allow-system-side-properties-vendor-side-.patch => 0043-FacolaView-Allow-system-side-properties-vendor-side-.patch} (91%)
 rename patches/platform_frameworks_base/{0050-WIP-report-press-events-to-oppo-fingerprint-sensor.patch => 0044-report-press-events-to-oppo-fingerprint-sensor.patch} (92%)
 rename patches/platform_frameworks_base/{0052-Add-support-for-samsung-optical-under-display-finger.patch => 0045-Add-support-for-samsung-optical-under-display-finger.patch} (94%)
 rename patches/platform_frameworks_base/{0053-Fix-persist.sys.fp.fod-override.patch => 0046-Fix-persist.sys.fp.fod-override.patch} (92%)
 rename patches/platform_frameworks_base/{0054-Allow-disabling-of-fingerprint-cleanups-needed-on-so.patch => 0047-Allow-disabling-of-fingerprint-cleanups-needed-on-so.patch} (87%)
 rename patches/platform_frameworks_base/{0055-Support-Realme-FOD.patch => 0048-Support-Realme-FOD.patch} (98%)
 delete mode 100644 patches/platform_frameworks_base/0048-TextureVuew-rebind-GL-texture-if-AHB-content-has-cha.patch
 rename patches/platform_frameworks_base/{0056-Support-Huawei-light-HAL.patch => 0049-Support-Huawei-light-HAL.patch} (90%)
 rename patches/platform_frameworks_base/{0057-Always-allow-overriding-the-number-of-work-profiles.patch => 0050-Always-allow-overriding-the-number-of-work-profiles.patch} (81%)
 rename patches/platform_frameworks_base/{0058-Additional-fod-command-for-non-optical-samsung-devic.patch => 0051-Additional-fod-command-for-non-optical-samsung-devic.patch} (87%)
 rename patches/platform_frameworks_base/{0059-Add-a-backlight-listener-to-be-used-by-FOD-to-proper.patch => 0052-Add-a-backlight-listener-to-be-used-by-FOD-to-proper.patch} (82%)
 rename patches/platform_frameworks_base/{0060-Don-t-show-facola-on-preenroll-wait-for-enroll.patch => 0053-Don-t-show-facola-on-preenroll-wait-for-enroll.patch} (93%)
 rename patches/platform_frameworks_base/{0061-Add-support-for-new-Goodix-Samsung-Xiaomi-FODs.patch => 0054-Add-support-for-new-Goodix-Samsung-Xiaomi-FODs.patch} (99%)
 rename patches/platform_frameworks_base/{0062-On-MIUI12-vendor-we-don-t-want-our-own-diming.patch => 0055-On-MIUI12-vendor-we-don-t-want-our-own-diming.patch} (91%)
 rename patches/platform_frameworks_base/{0063-Add-mUiHidden-which-is-guarded-by-Handler.-This-is-n.patch => 0056-Add-mUiHidden-which-is-guarded-by-Handler.-This-is-n.patch} (95%)
 rename patches/platform_frameworks_base/{0064-Always-try-to-get-FOD-HALs-because-we-check-samsung-.patch => 0057-Always-try-to-get-FOD-HALs-because-we-check-samsung-.patch} (96%)
 rename patches/platform_frameworks_base/{0067-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch => 0058-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch} (80%)
 rename patches/platform_frameworks_opt_telephony/{0008-Hack-Catch-spurious-getModemStatus-calls-when-enabli.patch => 0008-Catch-spurious-getModemStatus-calls-when-enabling-CA.patch} (75%)
 rename patches/platform_frameworks_opt_telephony/{0009-HACK-Never-blacklist-RILs.-It-might-get-blacklisted-.patch => 0009-Never-blacklist-RILs.-It-might-get-blacklisted-for-b.patch} (77%)
 rename patches/platform_system_core/{0007-first-stage-If-Vboot2-fails-fall-back-to-Vboot1.patch => 0006-If-Vboot2-fails-fall-back-to-Vboot1.patch} (89%)
 rename patches/platform_system_core/{0008-wip.patch => 0007-wip.patch} (97%)
 rename patches/platform_system_core/{0009-Remove-reserved_disk-group-not-very-useful-and-break.patch => 0008-Remove-reserved_disk-group-not-very-useful-and-break.patch} (95%)
 rename patches/platform_system_core/{0010-Take-ro.vndk.version-into-account-to-know-what-to-te.patch => 0009-Take-ro.vndk.version-into-account-to-know-what-to-te.patch} (93%)
 rename patches/platform_system_core/{0011-Use-a-vndk-lite-friendly-ld-config.patch => 0010-Use-a-vndk-lite-friendly-ld-config.patch} (90%)
 rename patches/platform_system_core/{0012-fixup-Take-ro.vndk.version-into-account-to-know-what.patch => 0011-fixup-Take-ro.vndk.version-into-account-to-know-what.patch} (92%)
 rename patches/platform_system_core/{0013-Give-lmkd-ptrace-capability-to-bypass-hidepid-AOSP-u.patch => 0012-Give-lmkd-ptrace-capability-to-bypass-hidepid-AOSP-u.patch} (84%)
 rename patches/platform_system_core/{0014-Ugly-but-secure-Set-dev-uinput-as-0666-to-fix-finger.patch => 0013-Ugly-but-secure-Set-dev-uinput-as-0666-to-fix-finger.patch} (88%)
 rename patches/platform_system_core/{0015-Allow-our-vndk-to-access-libnativeloader.patch => 0014-Allow-our-vndk-to-access-libnativeloader.patch} (83%)
 rename patches/platform_system_netd/{0001-device-Huawei-Kirin-960-accept-broken-rpfilter-match.patch => 0001-Huawei-Kirin-960-accept-broken-rpfilter-match.patch} (83%)
 delete mode 100644 patches/platform_system_sepolicy/0001-Don-t-set-esdfs-or-exfat-genfscon.-Assume-OEM-does.patch
 delete mode 100644 patches/platform_system_sepolicy/0003-Revert-Don-t-set-esdfs-or-exfat-genfscon.-Assume-OEM.patch

diff --git a/patches/platform_bionic/0004-Read-SDK-version-override-from-property.patch b/patches/platform_bionic/0001-Read-SDK-version-override-from-property.patch
similarity index 78%
rename from patches/platform_bionic/0004-Read-SDK-version-override-from-property.patch
rename to patches/platform_bionic/0001-Read-SDK-version-override-from-property.patch
index edfdc89..d1c7a5a 100644
--- a/patches/platform_bionic/0004-Read-SDK-version-override-from-property.patch
+++ b/patches/platform_bionic/0001-Read-SDK-version-override-from-property.patch
@@ -1,7 +1,7 @@
-From e77d8ff8326def1d6b457bfd4c8b232dc58dd7cb Mon Sep 17 00:00:00 2001
+From 3e18df7a3462d3b81ac4cbc23b1e8721f2f3722c Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 3 Jan 2019 17:50:03 +0100
-Subject: [PATCH 4/6] Read SDK version override from property
+Subject: [PATCH 1/2] Read SDK version override from property
 
 Change-Id: I88ca5d0bde15ee4f2b2bd1255e98f9592973dbf9
 ---
@@ -9,10 +9,10 @@ Change-Id: I88ca5d0bde15ee4f2b2bd1255e98f9592973dbf9
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/linker/linker.cpp b/linker/linker.cpp
-index ccdb131ca..f45a40b9d 100644
+index 6941fde20..c4730ec20 100644
 --- a/linker/linker.cpp
 +++ b/linker/linker.cpp
-@@ -4218,7 +4218,9 @@ std::vector<android_namespace_t*> init_default_namespaces(const char* executable
+@@ -4296,7 +4296,9 @@ std::vector<android_namespace_t*> init_default_namespaces(const char* executable
    }
  
    uint32_t target_sdk = config->target_sdk_version();
@@ -23,7 +23,7 @@ index ccdb131ca..f45a40b9d 100644
    for (const auto& entry : android::base::Split(SDK_VERSION_OVERRIDES, " ")) {
      auto splitted = android::base::Split(entry, "=");
      if (splitted.size() == 2 && splitted[0] == executable_path) {
-@@ -4227,7 +4229,7 @@ std::vector<android_namespace_t*> init_default_namespaces(const char* executable
+@@ -4305,7 +4307,7 @@ std::vector<android_namespace_t*> init_default_namespaces(const char* executable
      }
    }
    DEBUG("Target SDK for %s = %d", executable_path, target_sdk);
@@ -33,5 +33,5 @@ index ccdb131ca..f45a40b9d 100644
  
    std::vector<android_namespace_t*> created_namespaces;
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_bionic/0005-Use-vndk_lite-ld.config-only-on-same-version-vendor.patch b/patches/platform_bionic/0002-Use-vndk_lite-ld.config-only-on-same-version-vendor.patch
similarity index 83%
rename from patches/platform_bionic/0005-Use-vndk_lite-ld.config-only-on-same-version-vendor.patch
rename to patches/platform_bionic/0002-Use-vndk_lite-ld.config-only-on-same-version-vendor.patch
index 6f51fe6..ca5c7a7 100644
--- a/patches/platform_bionic/0005-Use-vndk_lite-ld.config-only-on-same-version-vendor.patch
+++ b/patches/platform_bionic/0002-Use-vndk_lite-ld.config-only-on-same-version-vendor.patch
@@ -1,7 +1,7 @@
-From f32750cc994642f6ba792051f20c3f930f3007d2 Mon Sep 17 00:00:00 2001
+From 1823be14501a6c116f6d5e87570dea1af2c68413 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 12 Sep 2019 12:54:23 +0200
-Subject: [PATCH 5/6] Use vndk_lite ld.config only on same-version vendor
+Subject: [PATCH 2/2] Use vndk_lite ld.config only on same-version vendor
 
 When running Q over P lite, there is currently absolutely no chance the
 device boots, because it will be using Q vndk.
@@ -16,10 +16,10 @@ Change-Id: I55257cd7c738b1d20582e198e1d5621e1c87a03e
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/linker/linker.cpp b/linker/linker.cpp
-index f45a40b9d..9082fde53 100644
+index c4730ec20..337811951 100644
 --- a/linker/linker.cpp
 +++ b/linker/linker.cpp
-@@ -4069,7 +4069,10 @@ static std::string get_ld_config_file_apex_path(const char* executable_path) {
+@@ -4147,7 +4147,10 @@ static std::string get_ld_config_file_apex_path(const char* executable_path) {
  }
  
  static std::string get_ld_config_file_vndk_path() {
@@ -32,5 +32,5 @@ index f45a40b9d..9082fde53 100644
    }
  
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_bootable_recovery/0001-Don-t-reboot-if-we-couldn-t-get-bootctrl.patch b/patches/platform_bootable_recovery/0001-Don-t-reboot-if-we-couldn-t-get-bootctrl.patch
index cab3146..c910ee8 100644
--- a/patches/platform_bootable_recovery/0001-Don-t-reboot-if-we-couldn-t-get-bootctrl.patch
+++ b/patches/platform_bootable_recovery/0001-Don-t-reboot-if-we-couldn-t-get-bootctrl.patch
@@ -1,4 +1,4 @@
-From 58a98bd24e41cdacdbd472aaed2ab994400fe68c Mon Sep 17 00:00:00 2001
+From a1b739f4631bfaa8a15cdc70081819b1d9360332 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
@@ -22,5 +22,5 @@ index d04c455d..27e9f616 100644
  
    uint32_t current_slot = module->getCurrentSlot();
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_build/0001-Whitelist-radio-HALs-needed-because-they-need-to-e-i.patch b/patches/platform_build/0001-Whitelist-radio-HALs-needed-because-they-need-to-e-i.patch
index a6e7cd9..68ea65d 100644
--- a/patches/platform_build/0001-Whitelist-radio-HALs-needed-because-they-need-to-e-i.patch
+++ b/patches/platform_build/0001-Whitelist-radio-HALs-needed-because-they-need-to-e-i.patch
@@ -1,4 +1,4 @@
-From effea609cca3fbf28c4d58b32008053ffc69971a Mon Sep 17 00:00:00 2001
+From 5b235ab7e686c58433d623fe5355125d9c9fdd35 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 6 Sep 2019 15:10:28 +0200
 Subject: [PATCH] Whitelist radio HALs (needed because they need to e in
@@ -10,16 +10,16 @@ Change-Id: If1ccbedde92955bb86f4c6db6d68502784de1d8d
  1 file changed, 3 insertions(+)
 
 diff --git a/core/tasks/check_boot_jars/package_whitelist.txt b/core/tasks/check_boot_jars/package_whitelist.txt
-index 610301841..45266c5f1 100644
+index a2ebd491d..3545bbd88 100644
 --- a/core/tasks/check_boot_jars/package_whitelist.txt
 +++ b/core/tasks/check_boot_jars/package_whitelist.txt
-@@ -258,3 +258,6 @@ org\.codeaurora\.internal.*
- ###################################################
- # IFAA Manager used for Alipay and/or WeChat payment
- org\.ifaa\.android\.manager.*
+@@ -264,3 +264,6 @@ org\.ifaa\.android\.manager.*
+ com\.nvidia\.*
+ com\.nvidia\.profilemanager\.*
+ com\.nvidia\.NvCPLSvc\.*
 +
 +vendor\.samsung\.hardware\.radio\.V1_2
 +vendor\.mediatek\.hardware\.radio\.V2_0
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_build/0002-Add-BOARD_SYSTEMIMAGE_AS_SYSTEM-parameter-to-build-S.patch b/patches/platform_build/0002-Add-BOARD_SYSTEMIMAGE_AS_SYSTEM-parameter-to-build-S.patch
index 54b981e..75f3ac8 100644
--- a/patches/platform_build/0002-Add-BOARD_SYSTEMIMAGE_AS_SYSTEM-parameter-to-build-S.patch
+++ b/patches/platform_build/0002-Add-BOARD_SYSTEMIMAGE_AS_SYSTEM-parameter-to-build-S.patch
@@ -1,7 +1,7 @@
-From 1c3ecb1fd46c76111d44f600532068f307ccacbc Mon Sep 17 00:00:00 2001
+From 8387b818fb3d921f718d7088a78db0842f8e5d41 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 14 Sep 2019 21:25:07 +0200
-Subject: [PATCH 2/2] Add BOARD_SYSTEMIMAGE_AS_SYSTEM parameter to build SaS
+Subject: [PATCH 2/3] Add BOARD_SYSTEMIMAGE_AS_SYSTEM parameter to build SaS
  GSI
 
 Change-Id: I764f0ef4e3be9a338fbe93944445cedc29d2bb81
@@ -11,10 +11,10 @@ Change-Id: I764f0ef4e3be9a338fbe93944445cedc29d2bb81
  2 files changed, 5 insertions(+)
 
 diff --git a/core/Makefile b/core/Makefile
-index 4611fb388..9ab207c6d 100644
+index a5eef489f..1d0c63e23 100644
 --- a/core/Makefile
 +++ b/core/Makefile
-@@ -1345,6 +1345,7 @@ endif # PRODUCT_USE_DYNAMIC_PARTITIONS
+@@ -1378,6 +1378,7 @@ endif # PRODUCT_USE_DYNAMIC_PARTITIONS
  # $(3): additional "key=value" pairs to append to the dictionary file.
  define generate-image-prop-dictionary
  $(if $(filter $(2),system),\
@@ -23,7 +23,7 @@ index 4611fb388..9ab207c6d 100644
      $(if $(INTERNAL_SYSTEM_OTHER_PARTITION_SIZE),$(hide) echo "system_other_size=$(INTERNAL_SYSTEM_OTHER_PARTITION_SIZE)" >> $(1))
      $(if $(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "system_fs_type=$(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE)" >> $(1))
 diff --git a/tools/releasetools/build_image.py b/tools/releasetools/build_image.py
-index 4136ed432..96f7ddcb0 100755
+index 641a6e19f..7d4f1c328 100755
 --- a/tools/releasetools/build_image.py
 +++ b/tools/releasetools/build_image.py
 @@ -157,6 +157,8 @@ def SetUpInDirAndFsConfig(origin_in, prop_dict):
@@ -45,5 +45,5 @@ index 4136ed432..96f7ddcb0 100755
      # We inherit the selinux policies of /system since we contain some of its
      # files.
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_build/0003-Skip-mounting-oem-because-if-it-exists-it-includes-f.patch b/patches/platform_build/0003-Skip-mounting-oem-because-if-it-exists-it-includes-f.patch
index d723d5a..704f762 100644
--- a/patches/platform_build/0003-Skip-mounting-oem-because-if-it-exists-it-includes-f.patch
+++ b/patches/platform_build/0003-Skip-mounting-oem-because-if-it-exists-it-includes-f.patch
@@ -1,4 +1,4 @@
-From 68aa9652663f132ec9e36e8963a1fe5de0bb9485 Mon Sep 17 00:00:00 2001
+From 9434797f88d439d3dff8c7af733dcea2cdfed7ab Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 22 Mar 2020 18:09:04 +0100
 Subject: [PATCH 3/3] Skip mounting /oem, because if it exists, it includes
@@ -17,5 +17,5 @@ index 549767edf..327676384 100644
  /product_services
 +/oem
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_external_selinux/0001-Enable-multipl_decls-by-default.-This-is-needed-beca.patch b/patches/platform_external_selinux/0001-Enable-multipl_decls-by-default.-This-is-needed-beca.patch
index 2756065..91ecc6a 100644
--- a/patches/platform_external_selinux/0001-Enable-multipl_decls-by-default.-This-is-needed-beca.patch
+++ b/patches/platform_external_selinux/0001-Enable-multipl_decls-by-default.-This-is-needed-beca.patch
@@ -1,7 +1,7 @@
-From 2357a8f50b6ec8e1ed4d863c4b18aaed8af6a3db Mon Sep 17 00:00:00 2001
+From 0fcb4cf13bf9b59218267fa54f4334c397da96f4 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 2 Mar 2018 22:49:55 +0100
-Subject: [PATCH 1/6] Enable multipl_decls by default. This is needed because
+Subject: [PATCH 1/8] Enable multipl_decls by default. This is needed because
  8.0 init doesn't add -m
 
 Change-Id: I43dc661d519f7b8576d72a828d8cbd444592bf5e
@@ -23,5 +23,5 @@ index ad6862ba..8799e99a 100644
  	int preserve_tunables = 0;
  	int handle_unknown = -1;
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_external_selinux/0002-Increase-default-log_level-to-get-actual-selinux-err.patch b/patches/platform_external_selinux/0002-Increase-default-log_level-to-get-actual-selinux-err.patch
index 448a7e9..3376369 100644
--- a/patches/platform_external_selinux/0002-Increase-default-log_level-to-get-actual-selinux-err.patch
+++ b/patches/platform_external_selinux/0002-Increase-default-log_level-to-get-actual-selinux-err.patch
@@ -1,7 +1,7 @@
-From 04ac55163d403dba2d986cb41805663ea5fa465a Mon Sep 17 00:00:00 2001
+From 59e09675460e91cb989bc04886edb9aed738c63a 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 2/6] Increase default log_level to get actual selinux error in
+Subject: [PATCH 2/8] Increase default log_level to get actual selinux error in
  kmsg
 
 ---
@@ -22,5 +22,5 @@ index 8799e99a..631b4b0a 100644
  		{"help", no_argument, 0, 'h'},
  		{"verbose", no_argument, 0, 'v'},
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_external_selinux/0003-Kirin-Workaround-some-conflicting-Kirin-tether-SELin.patch b/patches/platform_external_selinux/0003-Kirin-Workaround-some-conflicting-Kirin-tether-SELin.patch
index 71801d7..ad304db 100644
--- a/patches/platform_external_selinux/0003-Kirin-Workaround-some-conflicting-Kirin-tether-SELin.patch
+++ b/patches/platform_external_selinux/0003-Kirin-Workaround-some-conflicting-Kirin-tether-SELin.patch
@@ -1,8 +1,8 @@
-From 0883dddcc377f9c8c271b4ee1b5796cca6b9938c Mon Sep 17 00:00:00 2001
+From bb0fa90347c9acd0a4b215b9f2244d2761667bdc Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 3 Dec 2018 20:54:54 +0100
-Subject: [PATCH 3/6] ::Kirin:: Workaround some conflicting Kirin tether
- SELinux context
+Subject: [PATCH 3/8] Kirin:: Workaround some conflicting Kirin tether SELinux
+ context
 
 Some Kirin devices declared some android.hardware.tetheroffload HALs,
 but they didn't use AOSP contexts.
@@ -36,5 +36,5 @@ index eaca5947..ab92985b 100644
  					errno = EINVAL;
  					selinux_log
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_external_selinux/0004-Allow-devices-virtual-block-genfscon-conflict-seen-o.patch b/patches/platform_external_selinux/0004-Allow-devices-virtual-block-genfscon-conflict-seen-o.patch
index 7fd76a9..dc860e9 100644
--- a/patches/platform_external_selinux/0004-Allow-devices-virtual-block-genfscon-conflict-seen-o.patch
+++ b/patches/platform_external_selinux/0004-Allow-devices-virtual-block-genfscon-conflict-seen-o.patch
@@ -1,7 +1,7 @@
-From fac785e80fa91a71c29c95817110154e4c60464d Mon Sep 17 00:00:00 2001
+From 8d23d9c14cc95edd2f3fc31433357e6249af1a11 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 6 Sep 2019 15:07:25 +0200
-Subject: [PATCH 4/6] Allow /devices/virtual/block/ genfscon conflict (seen on
+Subject: [PATCH 4/8] Allow /devices/virtual/block/ genfscon conflict (seen on
  Xiaomi Mi 9)
 
 Change-Id: I06e4e9d5b82d61a8aeab595b47e2589249675895
@@ -39,5 +39,5 @@ index 0b09cecc..255c9e12 100644
  
  int cil_post_netifcon_context_compare(const void *a, const void *b)
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_external_selinux/0005-Most-horrific-Remove-ramdisk-s-zygote-init-scripts.patch b/patches/platform_external_selinux/0005-Most-horrific-Remove-ramdisk-s-zygote-init-scripts.patch
index 514bc55..8318f32 100644
--- a/patches/platform_external_selinux/0005-Most-horrific-Remove-ramdisk-s-zygote-init-scripts.patch
+++ b/patches/platform_external_selinux/0005-Most-horrific-Remove-ramdisk-s-zygote-init-scripts.patch
@@ -1,7 +1,7 @@
-From c741063fdd7cbb01dda51737db457e4043af0d04 Mon Sep 17 00:00:00 2001
+From 2613e4dd6fe7b351581799e11980104b25e443f1 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 12 Sep 2019 20:34:28 +0200
-Subject: [PATCH 5/6] Most horrific: Remove ramdisk's zygote init scripts
+Subject: [PATCH 5/8] Most horrific: Remove ramdisk's zygote init scripts
 
 This is needed because:
 - only secilc is run soon enough in /system to
@@ -40,5 +40,5 @@ index 631b4b0a..3dd6e7ce 100644
  		opt_char = getopt_long(argc, argv, "o:f:U:hvt:M:PDmNc:GX:", long_opts, &opt_index);
  		if (opt_char == -1) {
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_external_selinux/0006-if-service-is-rcs-accept-conflict.-Seen-on-Moto-E5.patch b/patches/platform_external_selinux/0006-if-service-is-rcs-accept-conflict.-Seen-on-Moto-E5.patch
index 7588803..bdb9de2 100644
--- a/patches/platform_external_selinux/0006-if-service-is-rcs-accept-conflict.-Seen-on-Moto-E5.patch
+++ b/patches/platform_external_selinux/0006-if-service-is-rcs-accept-conflict.-Seen-on-Moto-E5.patch
@@ -1,7 +1,7 @@
-From 80f7a20f831e6d2028678899c39fe779024433f1 Mon Sep 17 00:00:00 2001
+From 0646089ab1c663e04dd7ba364c6e06db3fb67695 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 6/6] if service is "rcs", accept conflict. Seen on Moto E5
+Subject: [PATCH 6/8] if service is "rcs", accept conflict. Seen on Moto E5
 
 Change-Id: I0cc2d0fad83f403f2b5d7458039b1564ce5ed9dd
 ---
@@ -40,5 +40,5 @@ index ab92985b..ca16327c 100644
  					selinux_log
  						(SELINUX_WARNING,
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_external_selinux/0007-Fix-boot-on-Moto-devices-using-unknown-class.patch b/patches/platform_external_selinux/0007-Fix-boot-on-Moto-devices-using-unknown-class.patch
index d2ce917..985befb 100644
--- a/patches/platform_external_selinux/0007-Fix-boot-on-Moto-devices-using-unknown-class.patch
+++ b/patches/platform_external_selinux/0007-Fix-boot-on-Moto-devices-using-unknown-class.patch
@@ -1,7 +1,7 @@
-From 477ef41ac3a639f4c34c8ecf323d25ed2d3e8e8e Mon Sep 17 00:00:00 2001
+From 619185d4d8d3af1b86a2aba200659ad6ae09b44a 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 7/7] Fix boot on Moto devices using unknown class
+Subject: [PATCH 7/8] Fix boot on Moto devices using unknown class
 
 vendor sepolicy never contains new class or classorder, and are not
 allowed to.
@@ -80,5 +80,5 @@ index b90b0f60..6f391940 100644
  	if (rc != SEPOL_OK) {
  		goto exit;
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_external_selinux/0008-Allow-mismatches-of-exfat-genfscon.patch b/patches/platform_external_selinux/0008-Allow-mismatches-of-exfat-genfscon.patch
index 65e8981..a316031 100644
--- a/patches/platform_external_selinux/0008-Allow-mismatches-of-exfat-genfscon.patch
+++ b/patches/platform_external_selinux/0008-Allow-mismatches-of-exfat-genfscon.patch
@@ -1,4 +1,4 @@
-From b54a7a80c84c693549a77c57e2dc5a023928f524 Mon Sep 17 00:00:00 2001
+From 6e9400a75c7193ba7e4d5050e3a0e71627d38ce8 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 8/8] Allow mismatches of exfat genfscon
@@ -23,5 +23,5 @@ index 255c9e12..f97c65c1 100644
  			fprintf(stderr, "Received conflicting %s vs %s but ignore\n", a_genfscon->path_str, b_genfscon->path_str);
  			return 0;
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_external_skia/0001-GrGLCaps-allow-ignoring-vendor-supplied-texture-swiz.patch b/patches/platform_external_skia/0001-GrGLCaps-allow-ignoring-vendor-supplied-texture-swiz.patch
index 3aa5bb4..eb3470a 100644
--- a/patches/platform_external_skia/0001-GrGLCaps-allow-ignoring-vendor-supplied-texture-swiz.patch
+++ b/patches/platform_external_skia/0001-GrGLCaps-allow-ignoring-vendor-supplied-texture-swiz.patch
@@ -1,4 +1,4 @@
-From ba695ca22d256bb8a27f699c0759162a48999cf7 Mon Sep 17 00:00:00 2001
+From fd42c051ba56676ce593d5313ae2d72d85133a6a Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Tue, 22 Oct 2019 20:54:25 +0800
 Subject: [PATCH] GrGLCaps: allow ignoring vendor-supplied texture swizzle flag
@@ -55,5 +55,5 @@ index 4a97e84cf8..aee7a5509e 100644
      bool mipMapLevelAndLodControlSupport() const { return fMipMapLevelAndLodControlSupport; }
  
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_av/0001-FIH-devices-Fix-Earpiece-audio-output.patch b/patches/platform_frameworks_av/0001-FIH-devices-Fix-Earpiece-audio-output.patch
index 2daaaa3..0ecb2d3 100644
--- a/patches/platform_frameworks_av/0001-FIH-devices-Fix-Earpiece-audio-output.patch
+++ b/patches/platform_frameworks_av/0001-FIH-devices-Fix-Earpiece-audio-output.patch
@@ -1,7 +1,7 @@
-From 5286da2b7f598de0566d1ad1a5e070bdb5d698d1 Mon Sep 17 00:00:00 2001
+From 9873f460d3a40ca739e4c069068b32990dc2fff8 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 01/11] FIH devices: Fix "Earpiece" audio output
+Subject: [PATCH 01/17] 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
@@ -77,5 +77,5 @@ index 5f820c214..0b561320b 100644
  }
  
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_av/0002-Fix-WiFi-Display-on-Huawei-devices-EMUI-8.0.patch b/patches/platform_frameworks_av/0002-Fix-WiFi-Display-on-Huawei-devices-EMUI-8.0.patch
index fa086e3..37d8994 100644
--- a/patches/platform_frameworks_av/0002-Fix-WiFi-Display-on-Huawei-devices-EMUI-8.0.patch
+++ b/patches/platform_frameworks_av/0002-Fix-WiFi-Display-on-Huawei-devices-EMUI-8.0.patch
@@ -1,7 +1,7 @@
-From ddf773c1e301c5bc37fe156676ad6deb55fb7e8e Mon Sep 17 00:00:00 2001
+From 09e90d056e41e8ef6d0527e7e34a54053c607b3a Mon Sep 17 00:00:00 2001
 From: Alexander Pohl <pohl199885@gmail.com>
 Date: Fri, 15 Jun 2018 19:58:07 +0200
-Subject: [PATCH 02/11] Fix WiFi-Display on Huawei devices (EMUI 8.0)
+Subject: [PATCH 02/17] Fix WiFi-Display on Huawei devices (EMUI 8.0)
 
 Huaweis media stack doesn't handle intra-refresh-mode, so skip the error instead.
 
@@ -11,10 +11,10 @@ Thanks to Chris Vandomelen for pointing that out.
  1 file changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
-index 3d67c911a..007b84cea 100644
+index 55e8130e4..e8b493183 100644
 --- a/media/libstagefright/ACodec.cpp
 +++ b/media/libstagefright/ACodec.cpp
-@@ -4358,9 +4358,8 @@ status_t ACodec::setupAVCEncoderParameters(const sp<AMessage> &msg) {
+@@ -4366,9 +4366,8 @@ status_t ACodec::setupAVCEncoderParameters(const sp<AMessage> &msg) {
      if (msg->findInt32("intra-refresh-mode", &intraRefreshMode)) {
          err = setCyclicIntraMacroblockRefresh(msg, intraRefreshMode);
          if (err != OK) {
@@ -27,5 +27,5 @@ index 3d67c911a..007b84cea 100644
      }
  
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_av/0003-Kirin-Remove-lock-to-prevent-self-lock.patch b/patches/platform_frameworks_av/0003-Kirin-Remove-lock-to-prevent-self-lock.patch
index e467d97..d1610db 100644
--- a/patches/platform_frameworks_av/0003-Kirin-Remove-lock-to-prevent-self-lock.patch
+++ b/patches/platform_frameworks_av/0003-Kirin-Remove-lock-to-prevent-self-lock.patch
@@ -1,7 +1,7 @@
-From 6e5e5dbc804ef1aa686731d588bdb959919de29e Mon Sep 17 00:00:00 2001
+From 90390678c846d34aae136aa1557643619c524830 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 19 Aug 2018 22:59:06 +0200
-Subject: [PATCH 03/11] ::Kirin:: Remove lock to prevent self-lock
+Subject: [PATCH 03/17] Kirin:: Remove lock to prevent self-lock
 
 With Huawei Camera HAL, we get the following call order:
 cameraserver CameraService::enumerateProviders (*)
@@ -17,10 +17,10 @@ Hence the safe-lock
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
-index 3e6210294..3736a9e24 100644
+index 95e4e6eb7..077e3b238 100644
 --- a/services/camera/libcameraservice/CameraService.cpp
 +++ b/services/camera/libcameraservice/CameraService.cpp
-@@ -254,7 +254,7 @@ void CameraService::onNewProviderRegistered() {
+@@ -271,7 +271,7 @@ bool CameraService::isPublicallyHiddenSecureCamera(const String8& cameraId) {
  }
  
  void CameraService::updateCameraNumAndIds() {
@@ -30,5 +30,5 @@ index 3e6210294..3736a9e24 100644
      mNormalDeviceIds =
              mCameraProviderManager->getAPI1CompatibleCameraDeviceIds();
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_av/0004-We-might-not-have-a-mFlashlight-at-this-state-but-th.patch b/patches/platform_frameworks_av/0004-We-might-not-have-a-mFlashlight-at-this-state-but-th.patch
index ded5a4c..9a994ef 100644
--- a/patches/platform_frameworks_av/0004-We-might-not-have-a-mFlashlight-at-this-state-but-th.patch
+++ b/patches/platform_frameworks_av/0004-We-might-not-have-a-mFlashlight-at-this-state-but-th.patch
@@ -1,7 +1,8 @@
-From accaf1aedd6520cc92dd33f6fb96c75e44fbd1a8 Mon Sep 17 00:00:00 2001
+From 1fe92753746f4410f5ac97abcef083276940cfee Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 19 Aug 2018 23:05:26 +0200
-Subject: [PATCH] We might not have a mFlashlight at this state, but that's ok
+Subject: [PATCH 04/17] We might not have a mFlashlight at this state, but
+ that's ok
 
 Change-Id: I0ae65c0be4931b4e3cbda2d0cc64acc4f5018a73
 ---
@@ -9,10 +10,10 @@ Change-Id: I0ae65c0be4931b4e3cbda2d0cc64acc4f5018a73
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
-index a380b49e0..2c7c5208b 100644
+index 077e3b238..bbfd90a28 100644
 --- a/services/camera/libcameraservice/CameraService.cpp
 +++ b/services/camera/libcameraservice/CameraService.cpp
-@@ -297,7 +297,7 @@ void CameraService::addStates(const String8 id) {
+@@ -299,7 +299,7 @@ void CameraService::addStates(const String8 id) {
                                                                  isPublicallyHiddenSecureCamera));
      }
  
@@ -22,5 +23,5 @@ index a380b49e0..2c7c5208b 100644
          mTorchStatusMap.add(id, TorchModeStatus::AVAILABLE_OFF);
  
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_av/0005-CameraService-Support-calling-addStates-in-enumerate.patch b/patches/platform_frameworks_av/0005-CameraService-Support-calling-addStates-in-enumerate.patch
index 9ffe11f..f4047a0 100644
--- a/patches/platform_frameworks_av/0005-CameraService-Support-calling-addStates-in-enumerate.patch
+++ b/patches/platform_frameworks_av/0005-CameraService-Support-calling-addStates-in-enumerate.patch
@@ -1,7 +1,7 @@
-From a5bc47c2602ae78b0471e8f55538a4cca083decf Mon Sep 17 00:00:00 2001
+From 669ad001302e6e6d749ae0f66026c8ce00d259fe Mon Sep 17 00:00:00 2001
 From: Artem Borisov <dedsa2002@gmail.com>
 Date: Tue, 25 Sep 2018 12:39:22 +0300
-Subject: [PATCH 05/11] CameraService: Support calling addStates in
+Subject: [PATCH 05/17] CameraService: Support calling addStates in
  enumerateProviders
 
 Some pre-P camera HALs trigger onDeviceStatusChange callback during HAL init.
@@ -22,10 +22,10 @@ Change-Id: Ife25b9753fdb679ab0c77f385e1b8527551a4711
  1 file changed, 16 insertions(+)
 
 diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
-index 12ab2f47e..d208a36a9 100644
+index bbfd90a28..7046384b3 100644
 --- a/services/camera/libcameraservice/CameraService.cpp
 +++ b/services/camera/libcameraservice/CameraService.cpp
-@@ -204,6 +204,20 @@ status_t CameraService::enumerateProviders() {
+@@ -212,6 +212,20 @@ status_t CameraService::enumerateProviders() {
  
      for (auto& cameraId : deviceIds) {
          String8 id8 = String8(cameraId.c_str());
@@ -46,7 +46,7 @@ index 12ab2f47e..d208a36a9 100644
          if (getCameraState(id8) == nullptr) {
              onDeviceStatusChanged(id8, CameraDeviceStatus::PRESENT);
          }
-@@ -317,8 +331,10 @@ void CameraService::onDeviceStatusChanged(const String8& id,
+@@ -337,8 +351,10 @@ void CameraService::onDeviceStatusChanged(const String8& id,
              ALOGI("%s: Unknown camera ID %s, a new camera is added",
                      __FUNCTION__, id.string());
  
@@ -58,5 +58,5 @@ index 12ab2f47e..d208a36a9 100644
              updateStatus(newStatus, id);
          } else {
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_av/0006-Revert-Set-rlimit-rtprio-for-cameraserver.patch b/patches/platform_frameworks_av/0006-Revert-Set-rlimit-rtprio-for-cameraserver.patch
index 59881fa..521491d 100644
--- a/patches/platform_frameworks_av/0006-Revert-Set-rlimit-rtprio-for-cameraserver.patch
+++ b/patches/platform_frameworks_av/0006-Revert-Set-rlimit-rtprio-for-cameraserver.patch
@@ -1,7 +1,7 @@
-From 04e7317ef801f4124f4a074519d7a077dac14702 Mon Sep 17 00:00:00 2001
+From 8ad118d1fcfba6e9911aa099f354594787ad264b Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 9 Dec 2018 15:56:59 +0100
-Subject: [PATCH 06/11] Revert "Set rlimit rtprio for cameraserver"
+Subject: [PATCH 06/17] Revert "Set rlimit rtprio for cameraserver"
 
 This reverts commit 4ae244cab4fe715fc2729e906b7dda3075fbbac3.
 
@@ -21,5 +21,5 @@ index a9aae0b15..fea5a1d5c 100644
      writepid /dev/cpuset/camera-daemon/tasks /dev/stune/top-app/tasks
 -    rlimit rtprio 10 10
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_av/0007-fixup-FIH-devices-Fix-Earpiece-audio-output.patch b/patches/platform_frameworks_av/0007-fixup-FIH-devices-Fix-Earpiece-audio-output.patch
index 2056085..4f358da 100644
--- a/patches/platform_frameworks_av/0007-fixup-FIH-devices-Fix-Earpiece-audio-output.patch
+++ b/patches/platform_frameworks_av/0007-fixup-FIH-devices-Fix-Earpiece-audio-output.patch
@@ -1,7 +1,7 @@
-From bb6f508a514d09fdab79583886f7953dd42bfa0c Mon Sep 17 00:00:00 2001
+From 293b2fb176c081a4e3db518009864c1a4c4053fd Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 4 Sep 2019 22:28:56 +0200
-Subject: [PATCH 07/11] fixup! FIH devices: Fix "Earpiece" audio output
+Subject: [PATCH 07/17] fixup! FIH devices: Fix "Earpiece" audio output
 
 ---
  .../audiopolicy/common/managerdefinitions/src/Serializer.cpp   | 3 ++-
@@ -29,5 +29,5 @@ index 0b561320b..c8cb54b5f 100644
          status = deserializeCollection<AudioProfileTraits>(cur, &profiles, NULL);
      if (status != NO_ERROR) {
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_av/0008-Fix-use-after-free-object-on-stack.patch b/patches/platform_frameworks_av/0008-Fix-use-after-free-object-on-stack.patch
index a5fb036..4dd945a 100644
--- a/patches/platform_frameworks_av/0008-Fix-use-after-free-object-on-stack.patch
+++ b/patches/platform_frameworks_av/0008-Fix-use-after-free-object-on-stack.patch
@@ -1,7 +1,7 @@
-From 582695245e6ce2bafaf3b11b9d3b69dcf88d0037 Mon Sep 17 00:00:00 2001
+From 6f4e7e032ca73db15cb01737c24de543780718da Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 5 Aug 2019 17:27:47 +0200
-Subject: [PATCH 08/11] Fix use-after-free (object on stack)
+Subject: [PATCH 08/17] Fix use-after-free (object on stack)
 
 Change-Id: I9ae666b10873eac4e7a55032071e7b15b0de058a
 ---
@@ -22,5 +22,5 @@ index c8cb54b5f..9f2bdc4b3 100644
      std::string address = getXmlAttribute(cur, Attributes::address);
      if (!address.empty()) {
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_av/0009-Fix-BT-in-call-on-CAF-devices.patch b/patches/platform_frameworks_av/0009-Fix-BT-in-call-on-CAF-devices.patch
index 9b7e6e3..1484482 100644
--- a/patches/platform_frameworks_av/0009-Fix-BT-in-call-on-CAF-devices.patch
+++ b/patches/platform_frameworks_av/0009-Fix-BT-in-call-on-CAF-devices.patch
@@ -1,7 +1,7 @@
-From c02350cbd42543fdfac9bd61b630182a0da1ecf9 Mon Sep 17 00:00:00 2001
+From f303633bdac9176d45ca8a9073f2f9850406ebf8 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 09/11] Fix BT in-call on CAF devices
+Subject: [PATCH 09/17] Fix BT in-call on CAF devices
 
 See https://github.com/phhusson/treble_experimentations/issues/374
 
@@ -125,5 +125,5 @@ index 9f2bdc4b3..9c7e5c49d 100644
  
      for (const xmlNode *children = cur->xmlChildrenNode; children != NULL;
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_av/0010-Fix-null-pointer-for-unknown-audio-sources-in-Fix-BT.patch b/patches/platform_frameworks_av/0010-Fix-null-pointer-for-unknown-audio-sources-in-Fix-BT.patch
index ddc5c2e..04ba7ba 100644
--- a/patches/platform_frameworks_av/0010-Fix-null-pointer-for-unknown-audio-sources-in-Fix-BT.patch
+++ b/patches/platform_frameworks_av/0010-Fix-null-pointer-for-unknown-audio-sources-in-Fix-BT.patch
@@ -1,7 +1,7 @@
-From a71fbad371842877a92190204450b5c6753b3509 Mon Sep 17 00:00:00 2001
+From 7125c20e64937da5ee8134baae39e2136629b307 Mon Sep 17 00:00:00 2001
 From: Vincent Vidal <vincent.vidal@onera.fr>
 Date: Thu, 12 Sep 2019 14:17:14 +0200
-Subject: [PATCH 10/11] Fix null pointer for unknown audio sources in "Fix BT
+Subject: [PATCH 10/17] Fix null pointer for unknown audio sources in "Fix BT
  in-call on CAF devices"
 
 Some audio sources may not exist on some devices (e.g. Axon 7), leading to a segmentation fault.
@@ -27,5 +27,5 @@ index 9c7e5c49d..8bfdb5b0a 100644
  
      newRoute->setSources(sources);
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_av/0011-Add-partial-cam-id-is-hardcoded-support-for-Asus-ZF6.patch b/patches/platform_frameworks_av/0011-Add-partial-cam-id-is-hardcoded-support-for-Asus-ZF6.patch
index f0c13f4..fd351aa 100644
--- a/patches/platform_frameworks_av/0011-Add-partial-cam-id-is-hardcoded-support-for-Asus-ZF6.patch
+++ b/patches/platform_frameworks_av/0011-Add-partial-cam-id-is-hardcoded-support-for-Asus-ZF6.patch
@@ -1,8 +1,8 @@
-From 7ad31b03ab941886ac1e930a1f1dd1232461cd18 Mon Sep 17 00:00:00 2001
+From 53e025a518a6a662f533e2e08b50ebaed223957c 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] Add (partial, cam id is hardcoded) support for Asus ZF6 motor
- camera
+Subject: [PATCH 11/17] 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 62cbc7ddb..ddddfda97 100644
+index 7046384b3..100db9e3c 100644
 --- a/services/camera/libcameraservice/CameraService.cpp
 +++ b/services/camera/libcameraservice/CameraService.cpp
 @@ -25,6 +25,7 @@
@@ -22,7 +22,7 @@ index 62cbc7ddb..ddddfda97 100644
  #include <inttypes.h>
  #include <pthread.h>
  
-@@ -131,6 +132,7 @@ Mutex CameraService::sProxyMutex;
+@@ -133,6 +134,7 @@ Mutex CameraService::sProxyMutex;
  sp<hardware::ICameraServiceProxy> CameraService::sCameraServiceProxy;
  
  CameraService::CameraService() :
@@ -30,7 +30,7 @@ index 62cbc7ddb..ddddfda97 100644
          mEventLog(DEFAULT_EVENT_LOG_LENGTH),
          mNumberOfCameras(0),
          mSoundRef(0), mInitialized(false) {
-@@ -1549,6 +1551,7 @@ Status CameraService::connectHelper(const sp<CALLBACK>& cameraCb, const String8&
+@@ -1579,6 +1581,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 62cbc7ddb..ddddfda97 100644
              finishConnectLocked(client, partial);
  
              sp<ICameraMotor> cameraMotor = ICameraMotor::getService();
-@@ -1564,6 +1567,27 @@ Status CameraService::connectHelper(const sp<CALLBACK>& cameraCb, const String8&
+@@ -1594,6 +1597,27 @@ Status CameraService::connectHelper(const sp<CALLBACK>& cameraCb, const String8&
      return ret;
  }
  
@@ -66,7 +66,7 @@ index 62cbc7ddb..ddddfda97 100644
  Status CameraService::setTorchMode(const String16& cameraId, bool enabled,
          const sp<IBinder>& clientBinder) {
      Mutex::Autolock lock(mServiceLock);
-@@ -2427,6 +2451,8 @@ binder::Status CameraService::BasicClient::disconnect() {
+@@ -2466,6 +2490,8 @@ binder::Status CameraService::BasicClient::disconnect() {
          cameraMotor->onDisconnect(mCameraIdStr.string());
      }
  
@@ -76,7 +76,7 @@ index 62cbc7ddb..ddddfda97 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 065157dad..6d22da619 100644
+index bcaca9ffc..2607bc257 100644
 --- a/services/camera/libcameraservice/CameraService.h
 +++ b/services/camera/libcameraservice/CameraService.h
 @@ -182,6 +182,9 @@ public:
@@ -90,5 +90,5 @@ index 065157dad..6d22da619 100644
      // Client functionality
  
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_av/0012-Fix-for-some-Huawei-camera-that-s-not-ideal-because-.patch b/patches/platform_frameworks_av/0012-Fix-for-some-Huawei-camera-that-s-not-ideal-because-.patch
index 0a1be51..9091e09 100644
--- a/patches/platform_frameworks_av/0012-Fix-for-some-Huawei-camera-that-s-not-ideal-because-.patch
+++ b/patches/platform_frameworks_av/0012-Fix-for-some-Huawei-camera-that-s-not-ideal-because-.patch
@@ -1,7 +1,7 @@
-From d3828e0c23e79717b3b47ae29980be0b4726dc89 Mon Sep 17 00:00:00 2001
+From 922e144d1ceba361f0a92372e3fda5161249fc74 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 3 Dec 2019 14:04:17 +0100
-Subject: [PATCH 12/12] Fix for some Huawei camera (that's not ideal because it
+Subject: [PATCH 12/17] Fix for some Huawei camera (that's not ideal because it
  is a revert, it needs to be further investigated and cleaned)
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH 12/12] Fix for some Huawei camera (that's not ideal because it
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
-index ca0231c9e..9bb5db067 100644
+index 100db9e3c..6a68a40b9 100644
 --- a/services/camera/libcameraservice/CameraService.cpp
 +++ b/services/camera/libcameraservice/CameraService.cpp
 @@ -16,7 +16,7 @@
@@ -21,7 +21,7 @@ index ca0231c9e..9bb5db067 100644
  
  #include <algorithm>
  #include <climits>
-@@ -223,9 +223,9 @@ status_t CameraService::enumerateProviders() {
+@@ -228,9 +228,9 @@ status_t CameraService::enumerateProviders() {
              }
          }
  
@@ -34,5 +34,5 @@ index ca0231c9e..9bb5db067 100644
  
      return OK;
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_av/0013-audiopolicy-try-again-with-trimmed-audio-port-name-i.patch b/patches/platform_frameworks_av/0013-audiopolicy-try-again-with-trimmed-audio-port-name-i.patch
index 7e5a1f5..a03a20e 100644
--- a/patches/platform_frameworks_av/0013-audiopolicy-try-again-with-trimmed-audio-port-name-i.patch
+++ b/patches/platform_frameworks_av/0013-audiopolicy-try-again-with-trimmed-audio-port-name-i.patch
@@ -1,7 +1,7 @@
-From 283eb4c984c6e0d878599c9a6fcc4e891cbb24f4 Mon Sep 17 00:00:00 2001
+From 00a797e23bf88d6cd28f32155a02c40b4f9b91cb Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Thu, 23 Jan 2020 11:13:43 +0800
-Subject: [PATCH 13/13] audiopolicy: try again with trimmed audio port name if
+Subject: [PATCH 13/17] audiopolicy: try again with trimmed audio port name if
  not found
 
 * In Spreadtrum BSP, some audio routes may contain ports with extra
@@ -53,5 +53,5 @@ index 8bfdb5b0a..4bdb082ba 100644
              sources.add(source);
          }
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_av/0015-There-are-three-SCO-devices.-Fallback-from-one-to-th.patch b/patches/platform_frameworks_av/0014-There-are-three-SCO-devices.-Fallback-from-one-to-th.patch
similarity index 91%
rename from patches/platform_frameworks_av/0015-There-are-three-SCO-devices.-Fallback-from-one-to-th.patch
rename to patches/platform_frameworks_av/0014-There-are-three-SCO-devices.-Fallback-from-one-to-th.patch
index 838fb89..f4b0239 100644
--- a/patches/platform_frameworks_av/0015-There-are-three-SCO-devices.-Fallback-from-one-to-th.patch
+++ b/patches/platform_frameworks_av/0014-There-are-three-SCO-devices.-Fallback-from-one-to-th.patch
@@ -1,7 +1,7 @@
-From b37ac3beb32e99e1517f3baf7efd98b0b8c80b8a Mon Sep 17 00:00:00 2001
+From e17862fc2b519ccddf7d578968a89f35ceaacfb1 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 15/21] There are three SCO devices. Fallback from one to the
+Subject: [PATCH 14/17] There are three SCO devices. Fallback from one to the
  others if needed
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH 15/21] There are three SCO devices. Fallback from one to the
  1 file changed, 21 insertions(+)
 
 diff --git a/services/audiopolicy/common/managerdefinitions/src/HwModule.cpp b/services/audiopolicy/common/managerdefinitions/src/HwModule.cpp
-index 1f9b725a24..ecba6023dd 100644
+index 1f9b725a2..ecba6023d 100644
 --- a/services/audiopolicy/common/managerdefinitions/src/HwModule.cpp
 +++ b/services/audiopolicy/common/managerdefinitions/src/HwModule.cpp
 @@ -294,6 +294,27 @@ sp <HwModule> HwModuleCollection::getModuleForDeviceTypes(audio_devices_t type,
@@ -41,5 +41,5 @@ index 1f9b725a24..ecba6023dd 100644
  }
  
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_av/0022-Add-persist.sys.phh.samsung.camera_ids-property-to-a.patch b/patches/platform_frameworks_av/0015-Add-persist.sys.phh.samsung.camera_ids-property-to-a.patch
similarity index 94%
rename from patches/platform_frameworks_av/0022-Add-persist.sys.phh.samsung.camera_ids-property-to-a.patch
rename to patches/platform_frameworks_av/0015-Add-persist.sys.phh.samsung.camera_ids-property-to-a.patch
index 30bb9c6..f718bd9 100644
--- a/patches/platform_frameworks_av/0022-Add-persist.sys.phh.samsung.camera_ids-property-to-a.patch
+++ b/patches/platform_frameworks_av/0015-Add-persist.sys.phh.samsung.camera_ids-property-to-a.patch
@@ -1,8 +1,8 @@
-From a280506c41623f2c2e0f96651189ec4b5e19bad1 Mon Sep 17 00:00:00 2001
+From 9fef86bc540a7fa95432d5bc8da3fc18b07ae843 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] Add persist.sys.phh.samsung.camera_ids property to access
- hidden Samsung cameras
+Subject: [PATCH 15/17] Add persist.sys.phh.samsung.camera_ids property to
+ access hidden Samsung cameras
 
 ---
  services/camera/libcameraservice/Android.bp         |  1 +
@@ -67,5 +67,5 @@ index fdb565750..9c1c70c84 100644
          ALOGE("%s: Transaction error in getting camera ID list from provider '%s': %s",
                  __FUNCTION__, mProviderName.c_str(), linked.description().c_str());
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_av/0023-Add-a-property-to-force-camera-timestamp-source.patch b/patches/platform_frameworks_av/0016-Add-a-property-to-force-camera-timestamp-source.patch
similarity index 91%
rename from patches/platform_frameworks_av/0023-Add-a-property-to-force-camera-timestamp-source.patch
rename to patches/platform_frameworks_av/0016-Add-a-property-to-force-camera-timestamp-source.patch
index cd96f17..87f6a7b 100644
--- a/patches/platform_frameworks_av/0023-Add-a-property-to-force-camera-timestamp-source.patch
+++ b/patches/platform_frameworks_av/0016-Add-a-property-to-force-camera-timestamp-source.patch
@@ -1,7 +1,7 @@
-From 51622b87d04e709067335e38ae2257c21dde00a5 Mon Sep 17 00:00:00 2001
+From b629b586c808f6e8e3415b578f10fe02b63b1631 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 23/24] Add a property to force camera timestamp source
+Subject: [PATCH 16/17] 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,7 +18,7 @@ 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 93e18cfee3..9cc44f1ec9 100644
+index 93e18cfee..9cc44f1ec 100644
 --- a/services/camera/libcameraservice/device3/Camera3Device.cpp
 +++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
 @@ -299,8 +299,16 @@ status_t Camera3Device::initializeCommonLocked() {
@@ -41,5 +41,5 @@ index 93e18cfee3..9cc44f1ec9 100644
      }
  
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_av/0024-Add-persist.sys.phh.disable_a2dp_offload-property-to.patch b/patches/platform_frameworks_av/0017-Add-persist.sys.phh.disable_a2dp_offload-property-to.patch
similarity index 98%
rename from patches/platform_frameworks_av/0024-Add-persist.sys.phh.disable_a2dp_offload-property-to.patch
rename to patches/platform_frameworks_av/0017-Add-persist.sys.phh.disable_a2dp_offload-property-to.patch
index a40bc70..b70a41d 100644
--- a/patches/platform_frameworks_av/0024-Add-persist.sys.phh.disable_a2dp_offload-property-to.patch
+++ b/patches/platform_frameworks_av/0017-Add-persist.sys.phh.disable_a2dp_offload-property-to.patch
@@ -1,7 +1,7 @@
-From 637819ddb60b3a5c16e21b68e448f21e621699b1 Mon Sep 17 00:00:00 2001
+From 95e61a23a96f0274d222e4ef84ee8583fc36baab Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 25 May 2020 21:26:54 +0200
-Subject: [PATCH 24/24] Add persist.sys.phh.disable_a2dp_offload property to
+Subject: [PATCH 17/17] Add persist.sys.phh.disable_a2dp_offload property to
  force a2dp offload
 
 ---
@@ -11,7 +11,7 @@ Subject: [PATCH 24/24] Add persist.sys.phh.disable_a2dp_offload property to
  3 files changed, 197 insertions(+), 6 deletions(-)
 
 diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
-index 0271ecef34..7824b590a6 100644
+index e8b493183..310740ab5 100644
 --- a/media/libstagefright/ACodec.cpp
 +++ b/media/libstagefright/ACodec.cpp
 @@ -1166,6 +1166,9 @@ status_t ACodec::configureOutputBuffersFromNativeWindow(
@@ -60,7 +60,7 @@ index 0271ecef34..7824b590a6 100644
          }
      }
 diff --git a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
-index 4bdb082ba1..d144f8991d 100644
+index 4bdb082ba..d144f8991 100644
 --- a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
 +++ b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
 @@ -29,6 +29,7 @@
@@ -300,7 +300,7 @@ index 4bdb082ba1..d144f8991d 100644
  }
  
 diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
-index a984b10c03..5b7750b437 100644
+index 642559089..c5fad0d6c 100644
 --- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
 +++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
 @@ -76,6 +76,8 @@ static const std::vector<audio_channel_mask_t> surroundChannelMasksOrder = {{
@@ -321,5 +321,5 @@ index a984b10c03..5b7750b437 100644
  
      for (const char* fileName : fileNames) {
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0001-Fix-backlight-control-on-Galaxy-S9.patch b/patches/platform_frameworks_base/0001-Fix-backlight-control-on-Galaxy-S9.patch
index 3b2473f..d33454a 100644
--- a/patches/platform_frameworks_base/0001-Fix-backlight-control-on-Galaxy-S9.patch
+++ b/patches/platform_frameworks_base/0001-Fix-backlight-control-on-Galaxy-S9.patch
@@ -1,7 +1,7 @@
-From 9f8c77fea17968dd20e76b83b28f2fce2630a087 Mon Sep 17 00:00:00 2001
+From 005da321c7023c10bb9eb637b9bde2c9bff065d1 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 01/36] Fix backlight control on Galaxy S9(+)
+Subject: [PATCH 01/58] Fix backlight control on Galaxy S9(+)
 
 Change-Id: I1fbbb47939c377597ef8ad6b88b2acea5f4acaa6
 ---
@@ -9,10 +9,10 @@ Change-Id: I1fbbb47939c377597ef8ad6b88b2acea5f4acaa6
  1 file changed, 13 insertions(+), 4 deletions(-)
 
 diff --git a/services/core/java/com/android/server/lights/LightsService.java b/services/core/java/com/android/server/lights/LightsService.java
-index ac906bb23d3..e23e2cd3c4d 100644
+index 0a308846181..347543584e4 100644
 --- a/services/core/java/com/android/server/lights/LightsService.java
 +++ b/services/core/java/com/android/server/lights/LightsService.java
-@@ -21,6 +21,7 @@ import android.os.Handler;
+@@ -22,6 +22,7 @@ import android.os.Handler;
  import android.os.IBinder;
  import android.os.Message;
  import android.os.PowerManager;
@@ -20,7 +20,7 @@ index ac906bb23d3..e23e2cd3c4d 100644
  import android.os.Trace;
  import android.provider.Settings;
  import android.util.Slog;
-@@ -71,6 +72,7 @@ public class LightsService extends SystemService {
+@@ -72,6 +73,7 @@ public class LightsService extends SystemService {
                              ": brightness=0x" + Integer.toHexString(brightness));
                      return;
                  }
@@ -28,7 +28,7 @@ index ac906bb23d3..e23e2cd3c4d 100644
                  // Ideally, we'd like to set the brightness mode through the SF/HWC as well, but
                  // right now we just fall back to the old path through Lights brightessMode is
                  // anything but USER or the device shouldBeInLowPersistenceMode().
-@@ -86,11 +88,18 @@ public class LightsService extends SystemService {
+@@ -88,11 +90,18 @@ public class LightsService extends SystemService {
                      }
                      SurfaceControl.setDisplayBrightness(mDisplayToken,
                              (float) brightness / mSurfaceControlMaximumBrightness);
@@ -52,5 +52,5 @@ index ac906bb23d3..e23e2cd3c4d 100644
          }
  
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0002-Relax-requirement-for-visible-flag-to-sdcards.patch b/patches/platform_frameworks_base/0002-Relax-requirement-for-visible-flag-to-sdcards.patch
index d9846d1..829a7f8 100644
--- a/patches/platform_frameworks_base/0002-Relax-requirement-for-visible-flag-to-sdcards.patch
+++ b/patches/platform_frameworks_base/0002-Relax-requirement-for-visible-flag-to-sdcards.patch
@@ -1,7 +1,7 @@
-From ae073ba9abbd86e82d06261ad260ea27fbc04f14 Mon Sep 17 00:00:00 2001
+From 318cda922fc2b2ed25519fc92bb58da4dc349db6 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 28 Nov 2017 18:28:04 +0100
-Subject: [PATCH] Relax requirement for visible flag to sdcards
+Subject: [PATCH 02/58] Relax requirement for visible flag to sdcards
 
 The vast majority of sdcard readers are stable enough to be declared by
 the API. (I see no counter-example)
@@ -13,10 +13,10 @@ Change-Id: Ia616671c03562d1eadaff5531a5c708a62d7ad3a
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
-index 72f40cc0351..20ffd687e89 100644
+index 263efacb097..39a60e1778f 100644
 --- a/services/core/java/com/android/server/StorageManagerService.java
 +++ b/services/core/java/com/android/server/StorageManagerService.java
-@@ -1282,7 +1282,8 @@ class StorageManagerService extends IStorageManager.Stub
+@@ -1283,7 +1283,8 @@ class StorageManagerService extends IStorageManager.Stub
  
              // Adoptable public disks are visible to apps, since they meet
              // public API requirement of being in a stable location.
@@ -27,5 +27,5 @@ index 72f40cc0351..20ffd687e89 100644
              } else if (vol.disk.isSd()) {
                  vol.mountFlags |= VolumeInfo.MOUNT_FLAG_VISIBLE;
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0003-Also-scan-system-overlay.patch b/patches/platform_frameworks_base/0003-Also-scan-system-overlay.patch
index 3aecffb..acb5c0d 100644
--- a/patches/platform_frameworks_base/0003-Also-scan-system-overlay.patch
+++ b/patches/platform_frameworks_base/0003-Also-scan-system-overlay.patch
@@ -1,7 +1,7 @@
-From 78dcdf304f0baa325fe8d39e2e7cb64b46b9a089 Mon Sep 17 00:00:00 2001
+From cc8745759acea40bb31f384b4fb70d33c4dd6a00 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 1 May 2018 17:47:36 +0200
-Subject: [PATCH 03/36] Also scan /system/overlay
+Subject: [PATCH 03/58] Also scan /system/overlay
 
 Change-Id: Ib0223560606b80cdaaa986b159b34b4db0154589
 ---
@@ -34,10 +34,10 @@ index 2b471fec9c8..4518c7e66a5 100644
        if (argc > 5) {
          execv(AssetManager::IDMAP_BIN, (char* const*)argv);
 diff --git a/core/jni/fd_utils.cpp b/core/jni/fd_utils.cpp
-index fa5f931470b..488c2f8e9e8 100644
+index 8ba2559ec2e..45b3c6a909d 100644
 --- a/core/jni/fd_utils.cpp
 +++ b/core/jni/fd_utils.cpp
-@@ -118,7 +118,8 @@ bool FileDescriptorWhitelist::IsAllowed(const std::string& path) const {
+@@ -119,7 +119,8 @@ bool FileDescriptorWhitelist::IsAllowed(const std::string& path) const {
         || android::base::StartsWith(path, kSystemOdmOverlayDir)
         || android::base::StartsWith(path, kOdmOverlayDir)
         || android::base::StartsWith(path, kSystemOemOverlayDir)
@@ -48,5 +48,5 @@ index fa5f931470b..488c2f8e9e8 100644
        && path.find("/../") == std::string::npos) {
      return true;
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0004-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch b/patches/platform_frameworks_base/0004-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch
deleted file mode 100644
index 45c9157..0000000
--- a/patches/platform_frameworks_base/0004-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e1a57d1f38bb45e69c9a2178ab34fd08adafe810 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Thu, 17 May 2018 20:28:35 +0200
-Subject: [PATCH 04/36] Don't crash if there is IR HAL is not declared
-
----
- services/core/java/com/android/server/ConsumerIrService.java | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/services/core/java/com/android/server/ConsumerIrService.java b/services/core/java/com/android/server/ConsumerIrService.java
-index 2ed6c77baa0..c574a03c9a3 100644
---- a/services/core/java/com/android/server/ConsumerIrService.java
-+++ b/services/core/java/com/android/server/ConsumerIrService.java
-@@ -50,8 +50,6 @@ public class ConsumerIrService extends IConsumerIrService.Stub {
-             if (!mHasNativeHal) {
-                 throw new RuntimeException("FEATURE_CONSUMER_IR present, but no IR HAL loaded!");
-             }
--        } else if (mHasNativeHal) {
--            throw new RuntimeException("IR HAL present, but FEATURE_CONSUMER_IR is not set!");
-         }
-     }
- 
--- 
-2.17.1
-
diff --git a/patches/platform_frameworks_base/0005-Fix-62.patch b/patches/platform_frameworks_base/0004-Fix-62.patch
similarity index 82%
rename from patches/platform_frameworks_base/0005-Fix-62.patch
rename to patches/platform_frameworks_base/0004-Fix-62.patch
index 9cd8ba3..db4ed64 100644
--- a/patches/platform_frameworks_base/0005-Fix-62.patch
+++ b/patches/platform_frameworks_base/0004-Fix-62.patch
@@ -1,17 +1,17 @@
-From c318f6086d6c12bb92de652440ee985256fd60c2 Mon Sep 17 00:00:00 2001
+From cd2464e7cfe3b9effe431e66a06fd1a8f42fe04d Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 30 May 2018 14:05:30 +0200
-Subject: [PATCH 05/36] Fix(?) #62
+Subject: [PATCH 04/58] Fix(?) #62
 
 ---
  .../src/com/android/keyguard/KeyguardUpdateMonitor.java      | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
-index 6a4dbc8d722..39535c32860 100644
+index 98323908c8d..5b69c434f46 100644
 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
 +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
-@@ -1117,7 +1117,10 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
+@@ -1214,7 +1214,10 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
  
          @Override
          public void onAuthenticationError(int errMsgId, CharSequence errString) {
@@ -24,5 +24,5 @@ index 6a4dbc8d722..39535c32860 100644
  
          @Override
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0006-S9-brightness-override-only-for-screen.patch b/patches/platform_frameworks_base/0005-S9-brightness-override-only-for-screen.patch
similarity index 85%
rename from patches/platform_frameworks_base/0006-S9-brightness-override-only-for-screen.patch
rename to patches/platform_frameworks_base/0005-S9-brightness-override-only-for-screen.patch
index 3604cfc..b834ffc 100644
--- a/patches/platform_frameworks_base/0006-S9-brightness-override-only-for-screen.patch
+++ b/patches/platform_frameworks_base/0005-S9-brightness-override-only-for-screen.patch
@@ -1,7 +1,7 @@
-From 6556ccbc704c6cb4a3bae5e9411082f6e1e1ff71 Mon Sep 17 00:00:00 2001
+From 21dbb7af9d7f40b7f28a763a7498326e18d1f6d1 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <pierre-hugues.husson@softathome.com>
 Date: Thu, 7 Jun 2018 13:36:51 +0200
-Subject: [PATCH 06/36] S9 brightness override only for screen
+Subject: [PATCH 05/58] S9 brightness override only for screen
 
 Change-Id: Ie16a46336fa64850014b962429f7a20ff569222f
 ---
@@ -9,10 +9,10 @@ Change-Id: Ie16a46336fa64850014b962429f7a20ff569222f
  1 file changed, 7 insertions(+), 5 deletions(-)
 
 diff --git a/services/core/java/com/android/server/lights/LightsService.java b/services/core/java/com/android/server/lights/LightsService.java
-index e23e2cd3c4d..327979166c2 100644
+index 347543584e4..bc424682a86 100644
 --- a/services/core/java/com/android/server/lights/LightsService.java
 +++ b/services/core/java/com/android/server/lights/LightsService.java
-@@ -91,11 +91,13 @@ public class LightsService extends SystemService {
+@@ -93,11 +93,13 @@ public class LightsService extends SystemService {
  		    return;
                  }
  
@@ -32,5 +32,5 @@ index e23e2cd3c4d..327979166c2 100644
                  int color = brightness & 0x000000ff;
                  color = 0xff000000 | (color << 16) | (color << 8) | color;
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0007-WIP-Fix-OP6-brightness.patch b/patches/platform_frameworks_base/0006-Fix-OP6-brightness.patch
similarity index 85%
rename from patches/platform_frameworks_base/0007-WIP-Fix-OP6-brightness.patch
rename to patches/platform_frameworks_base/0006-Fix-OP6-brightness.patch
index bab66ca..5c146f4 100644
--- a/patches/platform_frameworks_base/0007-WIP-Fix-OP6-brightness.patch
+++ b/patches/platform_frameworks_base/0006-Fix-OP6-brightness.patch
@@ -1,17 +1,17 @@
-From 21d4fc3b58aa737f78378c0df4987604bf4e32e0 Mon Sep 17 00:00:00 2001
+From 464f2398bb33b5d9e3e9ea0ec150e8c180e2a808 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <pierre-hugues.husson@softathome.com>
 Date: Thu, 7 Jun 2018 13:42:02 +0200
-Subject: [PATCH 07/36] [WIP] Fix OP6 brightness
+Subject: [PATCH 06/58] Fix OP6 brightness
 
 ---
  .../com/android/server/lights/LightsService.java     | 12 ++++++++++++
  1 file changed, 12 insertions(+)
 
 diff --git a/services/core/java/com/android/server/lights/LightsService.java b/services/core/java/com/android/server/lights/LightsService.java
-index 327979166c2..f0035c67f4a 100644
+index bc424682a86..c33a9c6cb1b 100644
 --- a/services/core/java/com/android/server/lights/LightsService.java
 +++ b/services/core/java/com/android/server/lights/LightsService.java
-@@ -97,6 +97,18 @@ public class LightsService extends SystemService {
+@@ -99,6 +99,18 @@ public class LightsService extends SystemService {
                          setLightLocked(brightness*100, LIGHT_FLASH_HARDWARE, 0, 0, brightnessMode);
                          return;
                      }
@@ -31,5 +31,5 @@ index 327979166c2..f0035c67f4a 100644
  
                  int color = brightness & 0x000000ff;
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0008-Try-to-make-brightness-more-generic-using-property-s.patch b/patches/platform_frameworks_base/0007-Try-to-make-brightness-more-generic-using-property-s.patch
similarity index 83%
rename from patches/platform_frameworks_base/0008-Try-to-make-brightness-more-generic-using-property-s.patch
rename to patches/platform_frameworks_base/0007-Try-to-make-brightness-more-generic-using-property-s.patch
index 0a0c6fd..ee6b016 100644
--- a/patches/platform_frameworks_base/0008-Try-to-make-brightness-more-generic-using-property-s.patch
+++ b/patches/platform_frameworks_base/0007-Try-to-make-brightness-more-generic-using-property-s.patch
@@ -1,7 +1,7 @@
-From 7235d15f8ba322a1806a8736751cac88cecb9b53 Mon Sep 17 00:00:00 2001
+From f61186905bf0425fe8a56c966fb87adbefea61f4 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 10 Jun 2018 22:54:55 +0200
-Subject: [PATCH 08/36] Try to make brightness more generic using property set
+Subject: [PATCH 07/58] Try to make brightness more generic using property set
  by rw-system
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 08/36] Try to make brightness more generic using property set
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/services/core/java/com/android/server/lights/LightsService.java b/services/core/java/com/android/server/lights/LightsService.java
-index f0035c67f4a..529026a1e7c 100644
+index c33a9c6cb1b..b2f444f00e1 100644
 --- a/services/core/java/com/android/server/lights/LightsService.java
 +++ b/services/core/java/com/android/server/lights/LightsService.java
-@@ -100,9 +100,11 @@ public class LightsService extends SystemService {
+@@ -102,9 +102,11 @@ public class LightsService extends SystemService {
  
                      boolean qcomExtendBrightness = SystemProperties.getBoolean("persist.extend.brightness", false);
                      int scale = SystemProperties.getInt("persist.display.max_brightness", 1023);
@@ -27,5 +27,5 @@ index f0035c67f4a..529026a1e7c 100644
  
                      if(qcomExtendBrightness) {
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0009-property-matching-RROs-allow-to-prefix-the-value-wit.patch b/patches/platform_frameworks_base/0008-property-matching-RROs-allow-to-prefix-the-value-wit.patch
similarity index 84%
rename from patches/platform_frameworks_base/0009-property-matching-RROs-allow-to-prefix-the-value-wit.patch
rename to patches/platform_frameworks_base/0008-property-matching-RROs-allow-to-prefix-the-value-wit.patch
index f8b9fde..dcfa433 100644
--- a/patches/platform_frameworks_base/0009-property-matching-RROs-allow-to-prefix-the-value-wit.patch
+++ b/patches/platform_frameworks_base/0008-property-matching-RROs-allow-to-prefix-the-value-wit.patch
@@ -1,7 +1,7 @@
-From 5d557f64f712c73d97669f10532b5a2867c6f1d3 Mon Sep 17 00:00:00 2001
+From 397240e75f8a5e80280f9f0cd8fb0133a509ef94 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 12 Jun 2018 22:55:32 +0200
-Subject: [PATCH 09/36] property-matching RROs: allow to prefix the value with
+Subject: [PATCH 08/58] property-matching RROs: allow to prefix the value with
  + to do glob match instead of exact match
 
 ---
@@ -31,5 +31,5 @@ index d69dd79555a..2be6d23ac78 100644
      }
  
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0010-Fix-typo-on-fnmatch-return-value-check.patch b/patches/platform_frameworks_base/0009-Fix-typo-on-fnmatch-return-value-check.patch
similarity index 81%
rename from patches/platform_frameworks_base/0010-Fix-typo-on-fnmatch-return-value-check.patch
rename to patches/platform_frameworks_base/0009-Fix-typo-on-fnmatch-return-value-check.patch
index 2fbe452..77d0ebf 100644
--- a/patches/platform_frameworks_base/0010-Fix-typo-on-fnmatch-return-value-check.patch
+++ b/patches/platform_frameworks_base/0009-Fix-typo-on-fnmatch-return-value-check.patch
@@ -1,7 +1,7 @@
-From a95da9d8c3508280233a42dcbfc6440fbc95c563 Mon Sep 17 00:00:00 2001
+From 2d5671a1241bcb8cdee11180de11a04c4f184a2d Mon Sep 17 00:00:00 2001
 From: Song Fuchang <song.fc@gmail.com>
 Date: Sun, 17 Jun 2018 22:39:37 +0800
-Subject: [PATCH 10/36] Fix typo on fnmatch return value check
+Subject: [PATCH 09/58] Fix typo on fnmatch return value check
 
 ---
  cmds/idmap/scan.cpp | 2 +-
@@ -21,5 +21,5 @@ index 2be6d23ac78..0acff23d031 100644
  
          return (strcmp(propBuf, val) == 0);
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0011-Add-Qualcomm-starlte.patch b/patches/platform_frameworks_base/0010-Add-Qualcomm-starlte.patch
similarity index 82%
rename from patches/platform_frameworks_base/0011-Add-Qualcomm-starlte.patch
rename to patches/platform_frameworks_base/0010-Add-Qualcomm-starlte.patch
index 8e27616..8689b4f 100644
--- a/patches/platform_frameworks_base/0011-Add-Qualcomm-starlte.patch
+++ b/patches/platform_frameworks_base/0010-Add-Qualcomm-starlte.patch
@@ -1,17 +1,17 @@
-From 695e8613f1bcee3f03269eb7f28ed9a91b41e2ad Mon Sep 17 00:00:00 2001
+From 506721861c7d8844885e03d0115272d643eb148d Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 25 Jun 2018 22:43:32 +0200
-Subject: [PATCH 11/36] Add Qualcomm starlte
+Subject: [PATCH 10/58] Add Qualcomm starlte
 
 ---
  .../core/java/com/android/server/lights/LightsService.java    | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/services/core/java/com/android/server/lights/LightsService.java b/services/core/java/com/android/server/lights/LightsService.java
-index 529026a1e7c..65f9ea87ae5 100644
+index b2f444f00e1..939437f82a4 100644
 --- a/services/core/java/com/android/server/lights/LightsService.java
 +++ b/services/core/java/com/android/server/lights/LightsService.java
-@@ -93,7 +93,9 @@ public class LightsService extends SystemService {
+@@ -95,7 +95,9 @@ public class LightsService extends SystemService {
  
                  if(mId == 0) {
                      String fp = SystemProperties.get("ro.vendor.build.fingerprint", "hello");
@@ -23,5 +23,5 @@ index 529026a1e7c..65f9ea87ae5 100644
                          return;
                      }
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0012-Galaxy-S9-remaining-of-HAL-onEnroll-is-actually-a-pe.patch b/patches/platform_frameworks_base/0011-remaining-of-HAL-onEnroll-is-actually-a-percent-of-p.patch
similarity index 83%
rename from patches/platform_frameworks_base/0012-Galaxy-S9-remaining-of-HAL-onEnroll-is-actually-a-pe.patch
rename to patches/platform_frameworks_base/0011-remaining-of-HAL-onEnroll-is-actually-a-percent-of-p.patch
index c734480..981e73c 100644
--- a/patches/platform_frameworks_base/0012-Galaxy-S9-remaining-of-HAL-onEnroll-is-actually-a-pe.patch
+++ b/patches/platform_frameworks_base/0011-remaining-of-HAL-onEnroll-is-actually-a-percent-of-p.patch
@@ -1,8 +1,8 @@
-From f1176c850abc148002e5986db5ccecac116b91c9 Mon Sep 17 00:00:00 2001
+From df349c13c31ac523ac0e054338f9270049a428bd Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 2 Jul 2018 23:36:39 +0200
-Subject: [PATCH 12/36] [Galaxy S9] "remaining" of HAL onEnroll is actually a
- percent of progress
+Subject: [PATCH 11/58] "remaining" of HAL onEnroll is actually a percent of
+ progress
 
 Change-Id: I8a586163eca93ae3c5bd968d1e7ddbf994ddcc91
 ---
@@ -10,10 +10,10 @@ Change-Id: I8a586163eca93ae3c5bd968d1e7ddbf994ddcc91
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java b/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java
-index 24fd1b7a6da..dc56a95217c 100644
+index 320e1022873..9789c49f069 100644
 --- a/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java
 +++ b/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java
-@@ -588,7 +588,13 @@ public class FingerprintService extends BiometricServiceBase {
+@@ -590,7 +590,13 @@ public class FingerprintService extends BiometricServiceBase {
                  final Fingerprint fingerprint =
                          new Fingerprint(getBiometricUtils().getUniqueName(getContext(), groupId),
                                  groupId, fingerId, deviceId);
@@ -29,5 +29,5 @@ index 24fd1b7a6da..dc56a95217c 100644
          }
  
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0013-Show-APN-Settings-for-CDMA-carriers.patch b/patches/platform_frameworks_base/0012-Show-APN-Settings-for-CDMA-carriers.patch
similarity index 82%
rename from patches/platform_frameworks_base/0013-Show-APN-Settings-for-CDMA-carriers.patch
rename to patches/platform_frameworks_base/0012-Show-APN-Settings-for-CDMA-carriers.patch
index 61d0201..c829521 100644
--- a/patches/platform_frameworks_base/0013-Show-APN-Settings-for-CDMA-carriers.patch
+++ b/patches/platform_frameworks_base/0012-Show-APN-Settings-for-CDMA-carriers.patch
@@ -1,17 +1,17 @@
-From ca9cc0e485753ac43ea8fba76638b00495669f39 Mon Sep 17 00:00:00 2001
+From 5727db8ca1ca71a847443b2d37a2ab4ed45b01ed 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 13/36] Show APN Settings for CDMA carriers
+Subject: [PATCH 12/58] 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 19f8203f750..4e0fcbb7358 100644
+index e209a42c4ba..7f19121d78c 100644
 --- a/telephony/java/android/telephony/CarrierConfigManager.java
 +++ b/telephony/java/android/telephony/CarrierConfigManager.java
-@@ -3073,7 +3073,7 @@ public class CarrierConfigManager {
+@@ -3333,7 +3333,7 @@ public class CarrierConfigManager {
          sDefaults.putBoolean(KEY_MDN_IS_ADDITIONAL_VOICEMAIL_NUMBER_BOOL, false);
          sDefaults.putBoolean(KEY_OPERATOR_SELECTION_EXPAND_BOOL, true);
          sDefaults.putBoolean(KEY_PREFER_2G_BOOL, true);
@@ -21,5 +21,5 @@ index 19f8203f750..4e0fcbb7358 100644
          sDefaults.putBoolean(KEY_SMS_REQUIRES_DESTINATION_NUMBER_CONVERSION_BOOL, false);
          sDefaults.putBoolean(KEY_SUPPORT_EMERGENCY_SMS_OVER_IMS_BOOL, false);
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0014-idmap-Don-t-silently-ignore-RROs-with-same-priority.patch b/patches/platform_frameworks_base/0013-idmap-Don-t-silently-ignore-RROs-with-same-priority.patch
similarity index 81%
rename from patches/platform_frameworks_base/0014-idmap-Don-t-silently-ignore-RROs-with-same-priority.patch
rename to patches/platform_frameworks_base/0013-idmap-Don-t-silently-ignore-RROs-with-same-priority.patch
index 1bf2337..390f2c6 100644
--- a/patches/platform_frameworks_base/0014-idmap-Don-t-silently-ignore-RROs-with-same-priority.patch
+++ b/patches/platform_frameworks_base/0013-idmap-Don-t-silently-ignore-RROs-with-same-priority.patch
@@ -1,7 +1,7 @@
-From 1597769b8c2d3faabd76ba20368409293709a2d5 Mon Sep 17 00:00:00 2001
+From 8ad9065fbaa02e368be5ba5576fe98ff1f4be856 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 19 Aug 2018 10:51:06 +0200
-Subject: [PATCH 14/36] idmap: Don't silently ignore RROs with same priority
+Subject: [PATCH 13/58] idmap: Don't silently ignore RROs with same priority
 
 Change-Id: I64a6899f1b30e0cd9e9a872b7ca83d831f038cbe
 ---
@@ -22,5 +22,5 @@ index 0acff23d031..d1dde52732f 100644
          }
  
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0017-Don-t-wake-IR-HAL-to-the-infinity-and-beyond.patch b/patches/platform_frameworks_base/0014-Don-t-wake-IR-HAL-to-the-infinity-and-beyond.patch
similarity index 92%
rename from patches/platform_frameworks_base/0017-Don-t-wake-IR-HAL-to-the-infinity-and-beyond.patch
rename to patches/platform_frameworks_base/0014-Don-t-wake-IR-HAL-to-the-infinity-and-beyond.patch
index 6eeca5c..721580e 100644
--- a/patches/platform_frameworks_base/0017-Don-t-wake-IR-HAL-to-the-infinity-and-beyond.patch
+++ b/patches/platform_frameworks_base/0014-Don-t-wake-IR-HAL-to-the-infinity-and-beyond.patch
@@ -1,7 +1,7 @@
-From d7a6847541ff67793487d581067ca724b3144c60 Mon Sep 17 00:00:00 2001
+From 238fc8c9b0297df0205b988a4fcccc4dc8b620bc Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 21 Aug 2018 22:24:02 +0200
-Subject: [PATCH] Don't wake IR HAL to the infinity and beyond
+Subject: [PATCH 14/58] Don't wake IR HAL to the infinity and beyond
 
 ---
  .../core/java/com/android/server/ConsumerIrService.java    | 7 -------
@@ -40,5 +40,5 @@ index 2ca348b3ae4..148fba9a688 100644
  }
  
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0018-Switch-samsung-light-fingerprint-match-to-regexp-to-.patch b/patches/platform_frameworks_base/0015-Switch-samsung-light-fingerprint-match-to-regexp-to-.patch
similarity index 81%
rename from patches/platform_frameworks_base/0018-Switch-samsung-light-fingerprint-match-to-regexp-to-.patch
rename to patches/platform_frameworks_base/0015-Switch-samsung-light-fingerprint-match-to-regexp-to-.patch
index 9ff20e6..7d5b064 100644
--- a/patches/platform_frameworks_base/0018-Switch-samsung-light-fingerprint-match-to-regexp-to-.patch
+++ b/patches/platform_frameworks_base/0015-Switch-samsung-light-fingerprint-match-to-regexp-to-.patch
@@ -1,7 +1,7 @@
-From 410c6135bef8bc83e49b182f7d3408c46ca47584 Mon Sep 17 00:00:00 2001
+From eb32a6fa5aebe2e021ba998ddf3970275b4da9a9 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 23 Aug 2018 23:39:16 +0200
-Subject: [PATCH 18/36] Switch samsung light fingerprint match to regexp, to
+Subject: [PATCH 15/58] Switch samsung light fingerprint match to regexp, to
  include Note9
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 18/36] Switch samsung light fingerprint match to regexp, to
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/services/core/java/com/android/server/lights/LightsService.java b/services/core/java/com/android/server/lights/LightsService.java
-index 65f9ea87ae5..aa014bf9ff4 100644
+index 939437f82a4..f7c07044d66 100644
 --- a/services/core/java/com/android/server/lights/LightsService.java
 +++ b/services/core/java/com/android/server/lights/LightsService.java
-@@ -93,9 +93,7 @@ public class LightsService extends SystemService {
+@@ -95,9 +95,7 @@ public class LightsService extends SystemService {
  
                  if(mId == 0) {
                      String fp = SystemProperties.get("ro.vendor.build.fingerprint", "hello");
@@ -24,5 +24,5 @@ index 65f9ea87ae5..aa014bf9ff4 100644
                          return;
                      }
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0019-Add-a-property-toggle-to-enable-high-brightness-rang.patch b/patches/platform_frameworks_base/0016-Add-a-property-toggle-to-enable-high-brightness-rang.patch
similarity index 84%
rename from patches/platform_frameworks_base/0019-Add-a-property-toggle-to-enable-high-brightness-rang.patch
rename to patches/platform_frameworks_base/0016-Add-a-property-toggle-to-enable-high-brightness-rang.patch
index 03d6436..c432a7b 100644
--- a/patches/platform_frameworks_base/0019-Add-a-property-toggle-to-enable-high-brightness-rang.patch
+++ b/patches/platform_frameworks_base/0016-Add-a-property-toggle-to-enable-high-brightness-rang.patch
@@ -1,7 +1,7 @@
-From 378df1aac9a2b439e20dcc60d216f8c15974fdca Mon Sep 17 00:00:00 2001
+From 2b4b81841941cad4f0b0a3cccbf023a9c819b30e Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 27 Aug 2018 00:47:13 +0200
-Subject: [PATCH 19/36] Add a property toggle to enable high brightness range
+Subject: [PATCH 16/58] Add a property toggle to enable high brightness range
  on samsung device
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 19/36] Add a property toggle to enable high brightness range
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/services/core/java/com/android/server/lights/LightsService.java b/services/core/java/com/android/server/lights/LightsService.java
-index aa014bf9ff4..a18ae0d6159 100644
+index f7c07044d66..f1a22ee2dc4 100644
 --- a/services/core/java/com/android/server/lights/LightsService.java
 +++ b/services/core/java/com/android/server/lights/LightsService.java
-@@ -94,7 +94,11 @@ public class LightsService extends SystemService {
+@@ -96,7 +96,11 @@ public class LightsService extends SystemService {
                  if(mId == 0) {
                      String fp = SystemProperties.get("ro.vendor.build.fingerprint", "hello");
                      if(fp.matches(".*(crown|star)[q2]*lte.*")) {
@@ -26,5 +26,5 @@ index aa014bf9ff4..a18ae0d6159 100644
                      }
  
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0020-Add-a-property-to-override-pre-o-max-aspect-ratio.patch b/patches/platform_frameworks_base/0017-Add-a-property-to-override-pre-o-max-aspect-ratio.patch
similarity index 85%
rename from patches/platform_frameworks_base/0020-Add-a-property-to-override-pre-o-max-aspect-ratio.patch
rename to patches/platform_frameworks_base/0017-Add-a-property-to-override-pre-o-max-aspect-ratio.patch
index f1f4535..169269d 100644
--- a/patches/platform_frameworks_base/0020-Add-a-property-to-override-pre-o-max-aspect-ratio.patch
+++ b/patches/platform_frameworks_base/0017-Add-a-property-to-override-pre-o-max-aspect-ratio.patch
@@ -1,7 +1,7 @@
-From 6c3996a1e42192a481ac029932fc1c4eade50488 Mon Sep 17 00:00:00 2001
+From d4633552f1162cdacd769291a1ee08493a3b8816 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 29 Aug 2018 11:05:54 +0200
-Subject: [PATCH 20/36] Add a property to override pre-o max aspect ratio
+Subject: [PATCH 17/58] Add a property to override pre-o max aspect ratio
 
 Change-Id: Id001a19fab7680feda841202b6e91c490d0d5ffa
 ---
@@ -9,10 +9,10 @@ Change-Id: Id001a19fab7680feda841202b6e91c490d0d5ffa
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
-index 371a9435643..5b61f215f3f 100644
+index 55e8e19fd27..7107bba3292 100644
 --- a/services/core/java/com/android/server/wm/ActivityRecord.java
 +++ b/services/core/java/com/android/server/wm/ActivityRecord.java
-@@ -2837,6 +2837,12 @@ final class ActivityRecord extends ConfigurationContainer {
+@@ -2835,6 +2835,12 @@ final class ActivityRecord extends ConfigurationContainer {
      // TODO(b/36505427): Consider moving this method and similar ones to ConfigurationContainer.
      private void updateOverrideConfiguration() {
          final Configuration overrideConfig = mTmpConfig;
@@ -25,7 +25,7 @@ index 371a9435643..5b61f215f3f 100644
          if (shouldUseSizeCompatMode()) {
              if (mCompatDisplayInsets != null) {
                  // The override configuration is set only once in size compatibility mode.
-@@ -3070,7 +3076,7 @@ final class ActivityRecord extends ConfigurationContainer {
+@@ -3068,7 +3074,7 @@ final class ActivityRecord extends ConfigurationContainer {
      // TODO(b/36505427): Consider moving this method and similar ones to ConfigurationContainer.
      private void computeBounds(Rect outBounds, Rect containingAppBounds) {
          outBounds.setEmpty();
@@ -35,5 +35,5 @@ index 371a9435643..5b61f215f3f 100644
          final float minAspectRatio = info.minAspectRatio;
  
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0021-Add-japanese-S9.patch b/patches/platform_frameworks_base/0018-Add-japanese-S9.patch
similarity index 83%
rename from patches/platform_frameworks_base/0021-Add-japanese-S9.patch
rename to patches/platform_frameworks_base/0018-Add-japanese-S9.patch
index 399a12d..58db7b3 100644
--- a/patches/platform_frameworks_base/0021-Add-japanese-S9.patch
+++ b/patches/platform_frameworks_base/0018-Add-japanese-S9.patch
@@ -1,17 +1,17 @@
-From 05ed3ef7fba2ae7fc012ca296c60af4238c91550 Mon Sep 17 00:00:00 2001
+From 7cf02f6a837cbba31bc214a8716be7e0d1055762 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 28 Aug 2018 20:39:26 +0200
-Subject: [PATCH 21/36] Add japanese S9
+Subject: [PATCH 18/58] Add japanese S9
 
 ---
  .../core/java/com/android/server/lights/LightsService.java     | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/services/core/java/com/android/server/lights/LightsService.java b/services/core/java/com/android/server/lights/LightsService.java
-index a18ae0d6159..37e03880f1e 100644
+index f1a22ee2dc4..15ab8cecfb5 100644
 --- a/services/core/java/com/android/server/lights/LightsService.java
 +++ b/services/core/java/com/android/server/lights/LightsService.java
-@@ -93,7 +93,8 @@ public class LightsService extends SystemService {
+@@ -95,7 +95,8 @@ public class LightsService extends SystemService {
  
                  if(mId == 0) {
                      String fp = SystemProperties.get("ro.vendor.build.fingerprint", "hello");
@@ -22,5 +22,5 @@ index a18ae0d6159..37e03880f1e 100644
                          if(SystemProperties.getBoolean("persist.sys.samsung.full_brightness", false)) {
                              newBrightness = (int) (brightness * 40960.0 / 255.0);
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0022-Re-order-services-so-that-it-works-even-without-qtag.patch b/patches/platform_frameworks_base/0019-Re-order-services-so-that-it-works-even-without-qtag.patch
similarity index 83%
rename from patches/platform_frameworks_base/0022-Re-order-services-so-that-it-works-even-without-qtag.patch
rename to patches/platform_frameworks_base/0019-Re-order-services-so-that-it-works-even-without-qtag.patch
index 22ca70c..38afa81 100644
--- a/patches/platform_frameworks_base/0022-Re-order-services-so-that-it-works-even-without-qtag.patch
+++ b/patches/platform_frameworks_base/0019-Re-order-services-so-that-it-works-even-without-qtag.patch
@@ -1,17 +1,17 @@
-From 089eae49049ea602363949e8593acfd5447530c6 Mon Sep 17 00:00:00 2001
+From d2029feef32f7e15327013c7c58db5616ed8235c 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 22/36] Re-order services so that it works even without qtaguid
+Subject: [PATCH 19/58] Re-order services so that it works even without qtaguid
 
 ---
  .../com/android/server/net/NetworkPolicyManagerService.java | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
-index 6c34e1313f7..337b22c3587 100644
+index 11c1632b00f..3c8bee02ca1 100644
 --- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
 +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
-@@ -725,6 +725,9 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
+@@ -734,6 +734,9 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
          Trace.traceBegin(Trace.TRACE_TAG_NETWORK, "systemReady");
          final int oldPriority = Process.getThreadPriority(Process.myTid());
          try {
@@ -21,7 +21,7 @@ index 6c34e1313f7..337b22c3587 100644
              // Boost thread's priority during system server init
              Process.setThreadPriority(Process.THREAD_PRIORITY_FOREGROUND);
              if (!isBandwidthControlEnabled()) {
-@@ -732,9 +735,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
+@@ -741,9 +744,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
                  return;
              }
  
@@ -32,5 +32,5 @@ index 6c34e1313f7..337b22c3587 100644
                  synchronized (mNetworkPoliciesSecondLock) {
                      updatePowerSaveWhitelistUL();
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0023-Different-value-for-astarqlte.-Probably-more-devices.patch b/patches/platform_frameworks_base/0020-Different-value-for-astarqlte.-Probably-more-devices.patch
similarity index 84%
rename from patches/platform_frameworks_base/0023-Different-value-for-astarqlte.-Probably-more-devices.patch
rename to patches/platform_frameworks_base/0020-Different-value-for-astarqlte.-Probably-more-devices.patch
index defcd42..20bb5e6 100644
--- a/patches/platform_frameworks_base/0023-Different-value-for-astarqlte.-Probably-more-devices.patch
+++ b/patches/platform_frameworks_base/0020-Different-value-for-astarqlte.-Probably-more-devices.patch
@@ -1,7 +1,7 @@
-From 1fa1945234225aa9d6201a7da2990fd17b544dc7 Mon Sep 17 00:00:00 2001
+From e29eb86fe7f515b84816c824fc9e342e03f67df8 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 10 Mar 2019 19:35:06 +0100
-Subject: [PATCH 23/36] Different value for astarqlte. Probably more devices to
+Subject: [PATCH 20/58] Different value for astarqlte. Probably more devices to
  add later
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 23/36] Different value for astarqlte. Probably more devices to
  1 file changed, 9 insertions(+)
 
 diff --git a/services/core/java/com/android/server/lights/LightsService.java b/services/core/java/com/android/server/lights/LightsService.java
-index 37e03880f1e..993483c342b 100644
+index 15ab8cecfb5..31033d57616 100644
 --- a/services/core/java/com/android/server/lights/LightsService.java
 +++ b/services/core/java/com/android/server/lights/LightsService.java
-@@ -93,6 +93,15 @@ public class LightsService extends SystemService {
+@@ -95,6 +95,15 @@ public class LightsService extends SystemService {
  
                  if(mId == 0) {
                      String fp = SystemProperties.get("ro.vendor.build.fingerprint", "hello");
@@ -29,5 +29,5 @@ index 37e03880f1e..993483c342b 100644
  				    fp.matches(".*(SC-0[23]K|SCV3[89]).*")) {
                          int newBrightness = brightness * 100;
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0024-Support-new-samsung-light-hal.patch b/patches/platform_frameworks_base/0021-Support-new-samsung-light-hal.patch
similarity index 95%
rename from patches/platform_frameworks_base/0024-Support-new-samsung-light-hal.patch
rename to patches/platform_frameworks_base/0021-Support-new-samsung-light-hal.patch
index 7957aa3..01257ac 100644
--- a/patches/platform_frameworks_base/0024-Support-new-samsung-light-hal.patch
+++ b/patches/platform_frameworks_base/0021-Support-new-samsung-light-hal.patch
@@ -1,7 +1,7 @@
-From 66452f7948361f504cb2d41249c04d53f56ca7d6 Mon Sep 17 00:00:00 2001
+From 587b2c2d290643b0280f139141e9dd774c8edbca 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] Support new samsung light hal
+Subject: [PATCH 21/58] Support new samsung light hal
 
 Change-Id: I88ca834894320129737b4e31fa8f7e5ee918889a
 ---
@@ -66,5 +66,5 @@ index 35d8219651d..2f77726d5bd 100644
      LightState state = constructState(
          colorARGB, flashMode, onMS, offMS, brightnessMode);
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0025-Fix-backlight-on-S10-.-Add-an-additional-property-to.patch b/patches/platform_frameworks_base/0022-Fix-backlight-on-S10-.-Add-an-additional-property-to.patch
similarity index 82%
rename from patches/platform_frameworks_base/0025-Fix-backlight-on-S10-.-Add-an-additional-property-to.patch
rename to patches/platform_frameworks_base/0022-Fix-backlight-on-S10-.-Add-an-additional-property-to.patch
index 64c22ab..e60363e 100644
--- a/patches/platform_frameworks_base/0025-Fix-backlight-on-S10-.-Add-an-additional-property-to.patch
+++ b/patches/platform_frameworks_base/0022-Fix-backlight-on-S10-.-Add-an-additional-property-to.patch
@@ -1,7 +1,7 @@
-From 454a0898504d1af98f687ebdbc8bc7b13a3d3ff5 Mon Sep 17 00:00:00 2001
+From f7297b9796d2d01dabf58256af529999977e74f5 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 24 Apr 2019 20:09:53 +0200
-Subject: [PATCH 25/36] Fix backlight on S10*. Add an additional property to
+Subject: [PATCH 22/58] Fix backlight on S10*. Add an additional property to
  check, so testers can try it more easily
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 25/36] Fix backlight on S10*. Add an additional property to
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/services/core/java/com/android/server/lights/LightsService.java b/services/core/java/com/android/server/lights/LightsService.java
-index 993483c342b..a578ed894c4 100644
+index 31033d57616..feba6bf8205 100644
 --- a/services/core/java/com/android/server/lights/LightsService.java
 +++ b/services/core/java/com/android/server/lights/LightsService.java
-@@ -102,7 +102,9 @@ public class LightsService extends SystemService {
+@@ -104,7 +104,9 @@ public class LightsService extends SystemService {
                          return;
                      }
  
@@ -24,5 +24,5 @@ index 993483c342b..a578ed894c4 100644
                          int newBrightness = brightness * 100;
                          if(SystemProperties.getBoolean("persist.sys.samsung.full_brightness", false)) {
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0026-Make-samsung-light-HAL-more-overridable.patch b/patches/platform_frameworks_base/0023-Make-samsung-light-HAL-more-overridable.patch
similarity index 91%
rename from patches/platform_frameworks_base/0026-Make-samsung-light-HAL-more-overridable.patch
rename to patches/platform_frameworks_base/0023-Make-samsung-light-HAL-more-overridable.patch
index 693a17e..34060df 100644
--- a/patches/platform_frameworks_base/0026-Make-samsung-light-HAL-more-overridable.patch
+++ b/patches/platform_frameworks_base/0023-Make-samsung-light-HAL-more-overridable.patch
@@ -1,17 +1,17 @@
-From 571bf63da97814631982b28b41f96781a13848a8 Mon Sep 17 00:00:00 2001
+From 63685ef6795e3b47f227ae5770c063969072644b Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 2 Jul 2019 21:15:07 +0200
-Subject: [PATCH 26/36] Make samsung light HAL more overridable
+Subject: [PATCH 23/58] Make samsung light HAL more overridable
 
 ---
  .../android/server/lights/LightsService.java  | 24 ++++++++++++-------
  1 file changed, 15 insertions(+), 9 deletions(-)
 
 diff --git a/services/core/java/com/android/server/lights/LightsService.java b/services/core/java/com/android/server/lights/LightsService.java
-index a578ed894c4..ac102c94770 100644
+index feba6bf8205..f9ac8db09ea 100644
 --- a/services/core/java/com/android/server/lights/LightsService.java
 +++ b/services/core/java/com/android/server/lights/LightsService.java
-@@ -102,16 +102,22 @@ public class LightsService extends SystemService {
+@@ -104,16 +104,22 @@ public class LightsService extends SystemService {
                          return;
                      }
  
@@ -44,5 +44,5 @@ index a578ed894c4..ac102c94770 100644
  
                      boolean qcomExtendBrightness = SystemProperties.getBoolean("persist.extend.brightness", false);
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0027-Make-Samsung-fingerprint-broken-HAL-overridable.patch b/patches/platform_frameworks_base/0024-Make-Samsung-fingerprint-broken-HAL-overridable.patch
similarity index 85%
rename from patches/platform_frameworks_base/0027-Make-Samsung-fingerprint-broken-HAL-overridable.patch
rename to patches/platform_frameworks_base/0024-Make-Samsung-fingerprint-broken-HAL-overridable.patch
index 05fb154..41af8dd 100644
--- a/patches/platform_frameworks_base/0027-Make-Samsung-fingerprint-broken-HAL-overridable.patch
+++ b/patches/platform_frameworks_base/0024-Make-Samsung-fingerprint-broken-HAL-overridable.patch
@@ -1,7 +1,7 @@
-From d02ed45de2a9ad381a735ae0649f61dbca1f1d41 Mon Sep 17 00:00:00 2001
+From 350739eec1738cebf50a64d4ae19fb61c3db769c Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 2 Jul 2019 21:19:29 +0200
-Subject: [PATCH 27/36] Make Samsung fingerprint broken HAL overridable
+Subject: [PATCH 24/58] Make Samsung fingerprint broken HAL overridable
 
 Change-Id: I8be38daa7c80fdb61e9209f12215e6daea171d03
 ---
@@ -9,10 +9,10 @@ Change-Id: I8be38daa7c80fdb61e9209f12215e6daea171d03
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java b/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java
-index dc56a95217c..19593e7e047 100644
+index 9789c49f069..f6e0742aa67 100644
 --- a/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java
 +++ b/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java
-@@ -590,8 +590,10 @@ public class FingerprintService extends BiometricServiceBase {
+@@ -592,8 +592,10 @@ public class FingerprintService extends BiometricServiceBase {
                                  groupId, fingerId, deviceId);
  
                  int remaining2 = remaining;
@@ -25,5 +25,5 @@ index dc56a95217c..19593e7e047 100644
  
                  FingerprintService.super.handleEnrollResult(fingerprint, remaining2);
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0029-Add-property-to-use-linear-brightness-slider.patch b/patches/platform_frameworks_base/0025-Add-property-to-use-linear-brightness-slider.patch
similarity index 92%
rename from patches/platform_frameworks_base/0029-Add-property-to-use-linear-brightness-slider.patch
rename to patches/platform_frameworks_base/0025-Add-property-to-use-linear-brightness-slider.patch
index 2ef720c..fa09d35 100644
--- a/patches/platform_frameworks_base/0029-Add-property-to-use-linear-brightness-slider.patch
+++ b/patches/platform_frameworks_base/0025-Add-property-to-use-linear-brightness-slider.patch
@@ -1,7 +1,7 @@
-From 677389d4f112ca9368d55e1eb661727e5974eeb1 Mon Sep 17 00:00:00 2001
+From 376f6e380451b51ded4e34403016a528ed62157b Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 11 Aug 2019 10:30:37 +0200
-Subject: [PATCH 29/36] Add property to use linear brightness slider
+Subject: [PATCH 25/58] Add property to use linear brightness slider
 
 ---
  .../com/android/settingslib/display/BrightnessUtils.java    | 6 ++++++
@@ -33,5 +33,5 @@ index 55723f9d8ed..da8ce4a67e9 100644
          final float normalizedVal = MathUtils.norm(min, max, val) * 12;
          final float ret;
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0030-Add-support-for-samsung-touch-proximity-sensor-as-fa.patch b/patches/platform_frameworks_base/0026-Add-support-for-samsung-touch-proximity-sensor-as-fa.patch
similarity index 87%
rename from patches/platform_frameworks_base/0030-Add-support-for-samsung-touch-proximity-sensor-as-fa.patch
rename to patches/platform_frameworks_base/0026-Add-support-for-samsung-touch-proximity-sensor-as-fa.patch
index 833cb5a..f670079 100644
--- a/patches/platform_frameworks_base/0030-Add-support-for-samsung-touch-proximity-sensor-as-fa.patch
+++ b/patches/platform_frameworks_base/0026-Add-support-for-samsung-touch-proximity-sensor-as-fa.patch
@@ -1,7 +1,7 @@
-From f93124e38386cc549fa02126c776098923f73ed7 Mon Sep 17 00:00:00 2001
+From 4d1a24a3ea96184572bc741647b5cd43d4eae032 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 30/36] Add support for samsung touch proximity sensor as
+Subject: [PATCH 26/58] Add support for samsung touch proximity sensor as
  fallback to real proximity sensor
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 30/36] Add support for samsung touch proximity sensor as
  1 file changed, 14 insertions(+)
 
 diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
-index fb381c33cbc..a262c86b7c7 100644
+index e546534eb4c..6ac1589aab0 100644
 --- a/services/core/java/com/android/server/display/DisplayPowerController.java
 +++ b/services/core/java/com/android/server/display/DisplayPowerController.java
-@@ -529,6 +529,13 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+@@ -522,6 +522,13 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
  
          if (!DEBUG_PRETEND_PROXIMITY_SENSOR_ABSENT) {
              mProximitySensor = mSensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY);
@@ -26,7 +26,7 @@ index fb381c33cbc..a262c86b7c7 100644
              if (mProximitySensor != null) {
                  mProximityThreshold = Math.min(mProximitySensor.getMaximumRange(),
                          TYPICAL_PROXIMITY_THRESHOLD);
-@@ -1944,6 +1951,13 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+@@ -1936,6 +1943,13 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
          public void onSensorChanged(SensorEvent event) {
              if (mProximitySensorEnabled) {
                  final long time = SystemClock.uptimeMillis();
@@ -41,5 +41,5 @@ index fb381c33cbc..a262c86b7c7 100644
                  boolean positive = distance >= 0.0f && distance < mProximityThreshold;
                  handleProximitySensorEvent(time, positive);
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0031-Use-Samsung-power-HAL.patch b/patches/platform_frameworks_base/0027-Use-Samsung-power-HAL.patch
similarity index 84%
rename from patches/platform_frameworks_base/0031-Use-Samsung-power-HAL.patch
rename to patches/platform_frameworks_base/0027-Use-Samsung-power-HAL.patch
index d9d1d2d..17d8c1f 100644
--- a/patches/platform_frameworks_base/0031-Use-Samsung-power-HAL.patch
+++ b/patches/platform_frameworks_base/0027-Use-Samsung-power-HAL.patch
@@ -1,7 +1,7 @@
-From f852fefd22c754345767a7c3d3024f4f93791a3d Mon Sep 17 00:00:00 2001
+From 231fd535554b81a5ef85aca4783da05bdbd330ec Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 14 Aug 2019 08:50:47 +0200
-Subject: [PATCH 31/36] Use Samsung power HAL
+Subject: [PATCH 27/58] Use Samsung power HAL
 
 Samsung likes to have two android.hardware.power@1.0 implementation
 side-by-side, one that works, one that doesn't.
@@ -11,10 +11,10 @@ Pick the one that works.
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/services/core/jni/com_android_server_power_PowerManagerService.cpp b/services/core/jni/com_android_server_power_PowerManagerService.cpp
-index 73bb579bd27..a211eef3d24 100644
+index 523f802141e..211ea50ddc9 100644
 --- a/services/core/jni/com_android_server_power_PowerManagerService.cpp
 +++ b/services/core/jni/com_android_server_power_PowerManagerService.cpp
-@@ -92,7 +92,9 @@ static bool checkAndClearExceptionFromCallback(JNIEnv* env, const char* methodNa
+@@ -98,7 +98,9 @@ static bool checkAndClearExceptionFromCallback(JNIEnv* env, const char* methodNa
  // The caller must be holding gPowerHalMutex.
  static void connectPowerHalLocked() {
      if (gPowerHalExists && gPowerHalV1_0_ == nullptr) {
@@ -26,5 +26,5 @@ index 73bb579bd27..a211eef3d24 100644
              ALOGI("Loaded power HAL 1.0 service");
              // Try cast to powerHAL V1_1
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0032-Also-add-com.samsung.sensor.physical_proximity-if-av.patch b/patches/platform_frameworks_base/0028-Also-add-com.samsung.sensor.physical_proximity-if-av.patch
similarity index 84%
rename from patches/platform_frameworks_base/0032-Also-add-com.samsung.sensor.physical_proximity-if-av.patch
rename to patches/platform_frameworks_base/0028-Also-add-com.samsung.sensor.physical_proximity-if-av.patch
index 56bb92b..3fa491a 100644
--- a/patches/platform_frameworks_base/0032-Also-add-com.samsung.sensor.physical_proximity-if-av.patch
+++ b/patches/platform_frameworks_base/0028-Also-add-com.samsung.sensor.physical_proximity-if-av.patch
@@ -1,7 +1,7 @@
-From 32ce2b67710daf2e8b81f99a3660210f96d04f3a Mon Sep 17 00:00:00 2001
+From 792cdc6603531eca7a91e3111ca3fd11b3711994 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 14 Aug 2019 23:36:45 +0200
-Subject: [PATCH 32/36] Also add com.samsung.sensor.physical_proximity (if
+Subject: [PATCH 28/58] Also add com.samsung.sensor.physical_proximity (if
  available, it is more a true proximity sensor than touch proximity sensor)
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 32/36] Also add com.samsung.sensor.physical_proximity (if
  1 file changed, 7 insertions(+)
 
 diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
-index a262c86b7c7..7c38f62b256 100644
+index 6ac1589aab0..84f16c4af23 100644
 --- a/services/core/java/com/android/server/display/DisplayPowerController.java
 +++ b/services/core/java/com/android/server/display/DisplayPowerController.java
-@@ -529,6 +529,13 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+@@ -522,6 +522,13 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
  
          if (!DEBUG_PRETEND_PROXIMITY_SENSOR_ABSENT) {
              mProximitySensor = mSensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY);
@@ -27,5 +27,5 @@ index a262c86b7c7..7c38f62b256 100644
                  List<Sensor> sensors = mSensorManager.getSensorList(Sensor.TYPE_ALL);
                  for(Sensor sensor: sensors) {
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0033-wip.patch b/patches/platform_frameworks_base/0029-wip.patch
similarity index 99%
rename from patches/platform_frameworks_base/0033-wip.patch
rename to patches/platform_frameworks_base/0029-wip.patch
index b647291..8764cb1 100644
--- a/patches/platform_frameworks_base/0033-wip.patch
+++ b/patches/platform_frameworks_base/0029-wip.patch
@@ -1,7 +1,7 @@
-From ad26b4fe426344371cd018050025d7ca4d47bec2 Mon Sep 17 00:00:00 2001
+From 67d493c638ff4c901a5ca76f91141b8b6b6a7b57 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 24 Mar 2019 22:48:39 +0100
-Subject: [PATCH] wip
+Subject: [PATCH 29/58] wip
 
 Change-Id: I50fa9a7a670cef5b93fc4a3a027f1587b1214831
 ---
@@ -349,7 +349,7 @@ index fcf87ee2a4b..0aa948417c1 100644
              // There's no data to apply, so leave it as-is.
              return null;
 diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
-index d9c85c0ca50..0740f70bbf4 100644
+index 7107bba3292..8d2badb825a 100644
 --- a/services/core/java/com/android/server/wm/ActivityRecord.java
 +++ b/services/core/java/com/android/server/wm/ActivityRecord.java
 @@ -2835,12 +2835,6 @@ final class ActivityRecord extends ConfigurationContainer {
@@ -407,5 +407,5 @@ index 2f77726d5bd..2b50d04233e 100644
  
      Type type = static_cast<Type>(light);
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0034-User-statsd-incidentd-arent-known-to-init-8.0.-disab.patch b/patches/platform_frameworks_base/0030-User-statsd-incidentd-arent-known-to-init-8.0.-disab.patch
similarity index 93%
rename from patches/platform_frameworks_base/0034-User-statsd-incidentd-arent-known-to-init-8.0.-disab.patch
rename to patches/platform_frameworks_base/0030-User-statsd-incidentd-arent-known-to-init-8.0.-disab.patch
index df3fd6e..3c0df91 100644
--- a/patches/platform_frameworks_base/0034-User-statsd-incidentd-arent-known-to-init-8.0.-disab.patch
+++ b/patches/platform_frameworks_base/0030-User-statsd-incidentd-arent-known-to-init-8.0.-disab.patch
@@ -1,7 +1,7 @@
-From 8167bee50010c872b82a2183e0ac17779b6b565e Mon Sep 17 00:00:00 2001
+From 12eee8e8f124d017db9265d587d3eabdcfe50803 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 12 Aug 2019 23:10:21 +0200
-Subject: [PATCH 34/36] User statsd/incidentd arent known to init 8.0. disable
+Subject: [PATCH 30/58] User statsd/incidentd arent known to init 8.0. disable
  those services
 
 Change-Id: I074654e194f764ffbc6961ff0ae304e36a9b5d1e
@@ -61,5 +61,5 @@ index a98ecd586b4..564cf98d0a9 100644
  on post-fs-data
      # Create directory for statsd
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0035-Check-for-samsung-light-service-everytime.patch b/patches/platform_frameworks_base/0031-Check-for-samsung-light-service-everytime.patch
similarity index 79%
rename from patches/platform_frameworks_base/0035-Check-for-samsung-light-service-everytime.patch
rename to patches/platform_frameworks_base/0031-Check-for-samsung-light-service-everytime.patch
index 0a9a4e8..3ee84ce 100644
--- a/patches/platform_frameworks_base/0035-Check-for-samsung-light-service-everytime.patch
+++ b/patches/platform_frameworks_base/0031-Check-for-samsung-light-service-everytime.patch
@@ -1,7 +1,7 @@
-From e73eb752f04a301bb4195a40ef3d73be5bb705d6 Mon Sep 17 00:00:00 2001
+From 3c029d1d6858aaa232e9706f847c390addf0fd96 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 12 Sep 2019 20:38:08 +0200
-Subject: [PATCH 35/36] Check for samsung light service everytime
+Subject: [PATCH 31/58] Check for samsung light service everytime
 
 This is needed because it is possible sec light service isn't ready at
 that time.
@@ -14,10 +14,10 @@ Change-Id: I30f049f3b06f83c455301b589b3558ff384ec300
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/services/core/jni/com_android_server_lights_LightsService.cpp b/services/core/jni/com_android_server_lights_LightsService.cpp
-index bea321da890..75793a7c0f2 100644
+index 2b50d04233e..a21c6e2c8ef 100644
 --- a/services/core/jni/com_android_server_lights_LightsService.cpp
 +++ b/services/core/jni/com_android_server_lights_LightsService.cpp
-@@ -150,7 +150,7 @@ static void setLight_native(
+@@ -161,7 +161,7 @@ static void setLight_native(
  
      if(!sSecTried) {
          sSecHal = ISecLight::getService();
@@ -27,5 +27,5 @@ index bea321da890..75793a7c0f2 100644
  
      if(sSecHal != nullptr) {
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0036-Forawrdport-Samsung-fod-support-for-ultrasound-fp.patch b/patches/platform_frameworks_base/0032-Forawrdport-Samsung-fod-support-for-ultrasound-fp.patch
similarity index 97%
rename from patches/platform_frameworks_base/0036-Forawrdport-Samsung-fod-support-for-ultrasound-fp.patch
rename to patches/platform_frameworks_base/0032-Forawrdport-Samsung-fod-support-for-ultrasound-fp.patch
index a5927b3..8b0b68d 100644
--- a/patches/platform_frameworks_base/0036-Forawrdport-Samsung-fod-support-for-ultrasound-fp.patch
+++ b/patches/platform_frameworks_base/0032-Forawrdport-Samsung-fod-support-for-ultrasound-fp.patch
@@ -1,7 +1,7 @@
-From f2c2a6a4707dde7f62d29aa5b204d96f9693e0e0 Mon Sep 17 00:00:00 2001
+From 6f450d9a22c3155a1732dbc1bcbcaed2a5a8d052 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 12 Sep 2019 20:39:50 +0200
-Subject: [PATCH 36/36] Forawrdport Samsung "fod" support for ultrasound fp
+Subject: [PATCH 32/58] Forawrdport Samsung "fod" support for ultrasound fp
 
 Change-Id: I9f787a01dab922cd94f9e552a6f3f53a00ca8448
 ---
@@ -117,5 +117,5 @@ index 8829bcb7e48..f61582990cf 100644
 +
  }
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0037-Scan-system-overlay-and-fix-support-for-properties-i.patch b/patches/platform_frameworks_base/0033-Scan-system-overlay-and-fix-support-for-properties-i.patch
similarity index 94%
rename from patches/platform_frameworks_base/0037-Scan-system-overlay-and-fix-support-for-properties-i.patch
rename to patches/platform_frameworks_base/0033-Scan-system-overlay-and-fix-support-for-properties-i.patch
index 77a3792..43ceee8 100644
--- a/patches/platform_frameworks_base/0037-Scan-system-overlay-and-fix-support-for-properties-i.patch
+++ b/patches/platform_frameworks_base/0033-Scan-system-overlay-and-fix-support-for-properties-i.patch
@@ -1,7 +1,7 @@
-From f1e202e71f6ab47a1870aa91e65d8c777770b88d Mon Sep 17 00:00:00 2001
+From c37bc2054b6e8e8d7e5d469e082e423f56d092fc Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 14 Oct 2019 23:50:46 +0200
-Subject: [PATCH 37/38] Scan /system/overlay and fix support for properties in
+Subject: [PATCH 33/58] Scan /system/overlay and fix support for properties in
  idmap2
 
 Change-Id: Ic04b5b1cc7b5d8cee67b1e2fdaa8aa793546b6d6
@@ -97,10 +97,10 @@ index 71ba3f0f1ac..7fda402b80f 100644
    if (iter != tag->end()) {
      info.is_static = std::stoul(iter->second) != 0U;
 diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
-index b3776787cc2..2147cc61728 100644
+index 535a8bc9db7..a164cb186a9 100644
 --- a/core/java/android/content/pm/PackageParser.java
 +++ b/core/java/android/content/pm/PackageParser.java
-@@ -1353,6 +1353,7 @@ public class PackageParser {
+@@ -1355,6 +1355,7 @@ public class PackageParser {
          } catch (PackageParserException e) {
              throw e;
          } catch (Exception e) {
@@ -108,7 +108,7 @@ index b3776787cc2..2147cc61728 100644
              throw new PackageParserException(INSTALL_PARSE_FAILED_UNEXPECTED_EXCEPTION,
                      "Failed to read manifest from " + apkPath, e);
          } finally {
-@@ -1392,6 +1393,7 @@ public class PackageParser {
+@@ -1394,6 +1395,7 @@ public class PackageParser {
          } catch (PackageParserException e) {
              throw e;
          } catch (Exception e) {
@@ -116,7 +116,7 @@ index b3776787cc2..2147cc61728 100644
              throw new PackageParserException(INSTALL_PARSE_FAILED_UNEXPECTED_EXCEPTION,
                      "Failed to read manifest from " + apkPath, e);
          } finally {
-@@ -2556,7 +2558,12 @@ public class PackageParser {
+@@ -2574,7 +2576,12 @@ public class PackageParser {
  
          // check property value - make sure it is both set and equal to expected value
          final String currValue = SystemProperties.get(propName);
@@ -145,10 +145,10 @@ index 4518c7e66a5..9e1b6db9ad9 100644
      input_dirs.push_back(AssetManager::VENDOR_OVERLAY_DIR);
    }
 diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
-index 7469e099421..203eb793610 100644
+index 179abe958b1..264e85d8eca 100644
 --- a/services/core/java/com/android/server/pm/PackageManagerService.java
 +++ b/services/core/java/com/android/server/pm/PackageManagerService.java
-@@ -2608,6 +2608,12 @@ public class PackageManagerService extends IPackageManager.Stub
+@@ -2668,6 +2668,12 @@ public class PackageManagerService extends IPackageManager.Stub
              // any apps.)
              // For security and version matching reason, only consider overlay packages if they
              // reside in the right directory.
@@ -162,5 +162,5 @@ index 7469e099421..203eb793610 100644
                      mDefParseFlags
                      | PackageParser.PARSE_IS_SYSTEM_DIR,
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0038-Improve-FacolaView-life-cycle-though-it-is-still-mis.patch b/patches/platform_frameworks_base/0034-Improve-FacolaView-life-cycle-though-it-is-still-mis.patch
similarity index 93%
rename from patches/platform_frameworks_base/0038-Improve-FacolaView-life-cycle-though-it-is-still-mis.patch
rename to patches/platform_frameworks_base/0034-Improve-FacolaView-life-cycle-though-it-is-still-mis.patch
index 7709698..8add87f 100644
--- a/patches/platform_frameworks_base/0038-Improve-FacolaView-life-cycle-though-it-is-still-mis.patch
+++ b/patches/platform_frameworks_base/0034-Improve-FacolaView-life-cycle-though-it-is-still-mis.patch
@@ -1,7 +1,7 @@
-From 9bba3cbb885f9917c120bfc7f072002f9e8cd4ed Mon Sep 17 00:00:00 2001
+From a950589b497f0e635205591b358aaa18e45e74c3 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 22 Oct 2019 00:33:23 +0200
-Subject: [PATCH 38/38] Improve FacolaView life cycle, though it is still
+Subject: [PATCH 34/58] Improve FacolaView life cycle, though it is still
  missing few cases. It might require to change BiometricServiceBase for actual
  fix
 
@@ -54,7 +54,7 @@ index f61582990cf..4ff373a108d 100644
              samsungCmd("fod_enable,0");
          }
 diff --git a/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java b/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java
-index c7de87126e8..972b4703860 100644
+index 92c0cc5dc85..1323c5ec0dd 100644
 --- a/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java
 +++ b/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java
 @@ -181,6 +181,16 @@ public class FingerprintService extends BiometricServiceBase {
@@ -74,7 +74,7 @@ index c7de87126e8..972b4703860 100644
          @Override
          public int start() {
              mFacola.show();
-@@ -219,6 +229,7 @@ public class FingerprintService extends BiometricServiceBase {
+@@ -220,6 +230,7 @@ public class FingerprintService extends BiometricServiceBase {
                  final IFingerprintServiceReceiver receiver, final int flags,
                  final String opPackageName) {
              checkPermission(MANAGE_FINGERPRINT);
@@ -82,7 +82,7 @@ index c7de87126e8..972b4703860 100644
  
              final boolean restricted = isRestricted();
              final int groupId = userId; // default group for fingerprint enrollment
-@@ -641,6 +652,9 @@ public class FingerprintService extends BiometricServiceBase {
+@@ -643,6 +654,9 @@ public class FingerprintService extends BiometricServiceBase {
          public void onError(final long deviceId, final int error, final int vendorCode) {
              mHandler.post(() -> {
                  FingerprintService.super.handleError(deviceId, error, vendorCode);
@@ -93,5 +93,5 @@ index c7de87126e8..972b4703860 100644
                  if (error == BiometricConstants.BIOMETRIC_ERROR_HW_UNAVAILABLE) {
                      // If we get HW_UNAVAILABLE, try to connect again later...
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0039-Link-hwui-with-libbase-because-of-updated-skia-depen.patch b/patches/platform_frameworks_base/0035-Link-hwui-with-libbase-because-of-updated-skia-depen.patch
similarity index 80%
rename from patches/platform_frameworks_base/0039-Link-hwui-with-libbase-because-of-updated-skia-depen.patch
rename to patches/platform_frameworks_base/0035-Link-hwui-with-libbase-because-of-updated-skia-depen.patch
index 2d86dfa..7a3be57 100644
--- a/patches/platform_frameworks_base/0039-Link-hwui-with-libbase-because-of-updated-skia-depen.patch
+++ b/patches/platform_frameworks_base/0035-Link-hwui-with-libbase-because-of-updated-skia-depen.patch
@@ -1,7 +1,7 @@
-From 12005c0b0a7f7e9c33bd8cf79ffaee609c43dafb Mon Sep 17 00:00:00 2001
+From 9cd57490c483e5a5b94d32d8fda5cc095734734d Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 22 Oct 2019 15:31:54 +0200
-Subject: [PATCH 39/39] Link hwui with libbase, because of updated skia
+Subject: [PATCH 35/58] Link hwui with libbase, because of updated skia
  dependency
 
 Change-Id: I201df2cd8f66674948b56fb6d5be5e8c3cb48bd1
@@ -22,5 +22,5 @@ index ebba4cb79df..b9808751130 100644
      static_libs: [
          "libEGL_blobCache",
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0040-Fix-crash-on-some-devices-by-checking-for-null-clien.patch b/patches/platform_frameworks_base/0036-Fix-crash-on-some-devices-by-checking-for-null-clien.patch
similarity index 88%
rename from patches/platform_frameworks_base/0040-Fix-crash-on-some-devices-by-checking-for-null-clien.patch
rename to patches/platform_frameworks_base/0036-Fix-crash-on-some-devices-by-checking-for-null-clien.patch
index 85029e3..b728894 100644
--- a/patches/platform_frameworks_base/0040-Fix-crash-on-some-devices-by-checking-for-null-clien.patch
+++ b/patches/platform_frameworks_base/0036-Fix-crash-on-some-devices-by-checking-for-null-clien.patch
@@ -1,7 +1,7 @@
-From 1573fc903e5c874b7a4fa78284801aa67a9f1ff7 Mon Sep 17 00:00:00 2001
+From 6806da584a014aa51429e4779f999f83a0e826be Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 27 Oct 2019 16:27:55 +0100
-Subject: [PATCH 40/40] Fix crash on some devices by checking for null client
+Subject: [PATCH 36/58] Fix crash on some devices by checking for null client
 
 Some device get the following system_server crash:
  *** FATAL EXCEPTION IN SYSTEM PROCESS: main
@@ -19,10 +19,10 @@ Change-Id: If39d8c1b26c8c0a44b3d9292b646cb71ff258a95
  1 file changed, 1 insertion(+)
 
 diff --git a/services/core/java/com/android/server/biometrics/BiometricServiceBase.java b/services/core/java/com/android/server/biometrics/BiometricServiceBase.java
-index d3c62bed7b5..b6710992a6e 100644
+index 37a08de62fc..292798721c6 100644
 --- a/services/core/java/com/android/server/biometrics/BiometricServiceBase.java
 +++ b/services/core/java/com/android/server/biometrics/BiometricServiceBase.java
-@@ -774,6 +774,7 @@ public abstract class BiometricServiceBase extends SystemService
+@@ -792,6 +792,7 @@ public abstract class BiometricServiceBase extends SystemService
      protected void handleEnumerate(BiometricAuthenticator.Identifier identifier, int remaining) {
          ClientMonitor client = getCurrentClient();
  
@@ -31,5 +31,5 @@ index d3c62bed7b5..b6710992a6e 100644
  
          // All templates in the HAL for this user were enumerated
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0041-Support-Samsung-Q-Light-HAL.patch b/patches/platform_frameworks_base/0037-Support-Samsung-Q-Light-HAL.patch
similarity index 99%
rename from patches/platform_frameworks_base/0041-Support-Samsung-Q-Light-HAL.patch
rename to patches/platform_frameworks_base/0037-Support-Samsung-Q-Light-HAL.patch
index 606307f..7949bb9 100644
--- a/patches/platform_frameworks_base/0041-Support-Samsung-Q-Light-HAL.patch
+++ b/patches/platform_frameworks_base/0037-Support-Samsung-Q-Light-HAL.patch
@@ -1,7 +1,7 @@
-From 6d0a4d0c2d14754f42189e8bce03e3f40d8d5668 Mon Sep 17 00:00:00 2001
+From ca4db4fe51356d20bf26142c188b6a691075c123 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 15 Dec 2019 16:38:44 +0100
-Subject: [PATCH] Support Samsung Q Light HAL
+Subject: [PATCH 37/58] Support Samsung Q Light HAL
 
 Change-Id: Ic5745eb115a14de348391e69ed6bf3c2a24b157e
 ---
@@ -471,5 +471,5 @@ index 00000000000..a21c6e2c8ef
 +
 +};
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0042-Add-a-nodim-property-for-FacolaView.patch b/patches/platform_frameworks_base/0038-Add-a-nodim-property-for-FacolaView.patch
similarity index 93%
rename from patches/platform_frameworks_base/0042-Add-a-nodim-property-for-FacolaView.patch
rename to patches/platform_frameworks_base/0038-Add-a-nodim-property-for-FacolaView.patch
index 5b36ed9..3cd5942 100644
--- a/patches/platform_frameworks_base/0042-Add-a-nodim-property-for-FacolaView.patch
+++ b/patches/platform_frameworks_base/0038-Add-a-nodim-property-for-FacolaView.patch
@@ -1,7 +1,7 @@
-From 6d095a568c1b3abc27bd9111155353c3688a761e Mon Sep 17 00:00:00 2001
+From 47c5660af8f54286d6c525e211077c05f9689ca8 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 15 Dec 2019 16:58:38 +0100
-Subject: [PATCH 42/45] Add a nodim property for FacolaView
+Subject: [PATCH 38/58] Add a nodim property for FacolaView
 
 Set persist.sys.phh.nodim to true to remove diming/full brightness
 ---
@@ -42,5 +42,5 @@ index 4ff373a108d..08436019bc9 100644
  
          return true;
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0043-Add-Samsung-s-Q-power-HAL-to-fix-suspend.patch b/patches/platform_frameworks_base/0039-Add-Samsung-s-Q-power-HAL-to-fix-suspend.patch
similarity index 96%
rename from patches/platform_frameworks_base/0043-Add-Samsung-s-Q-power-HAL-to-fix-suspend.patch
rename to patches/platform_frameworks_base/0039-Add-Samsung-s-Q-power-HAL-to-fix-suspend.patch
index a3545f5..e9ed6a5 100644
--- a/patches/platform_frameworks_base/0043-Add-Samsung-s-Q-power-HAL-to-fix-suspend.patch
+++ b/patches/platform_frameworks_base/0039-Add-Samsung-s-Q-power-HAL-to-fix-suspend.patch
@@ -1,7 +1,7 @@
-From 23fac793a4950f84a88ee2d5ceb3045d703a46e6 Mon Sep 17 00:00:00 2001
+From fffb6c1f4bf48d2bdc1a1b3c24b97d32bdaa4cca Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 15 Dec 2019 22:14:12 +0100
-Subject: [PATCH] Add Samsung's Q power HAL to fix suspend
+Subject: [PATCH 39/58] Add Samsung's Q power HAL to fix suspend
 
 Change-Id: I1edd4de9932ab089b7051f1329f60c15b9d99aaa
 ---
@@ -86,5 +86,5 @@ index 211ea50ddc9..bf0599fe18a 100644
  
  static void nativeSetAutoSuspend(JNIEnv* /* env */, jclass /* clazz */, jboolean enable) {
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0044-FacolaView-Support-goodix-ext-and-fix-wrong-forced-b.patch b/patches/platform_frameworks_base/0040-FacolaView-Support-goodix-ext-and-fix-wrong-forced-b.patch
similarity index 95%
rename from patches/platform_frameworks_base/0044-FacolaView-Support-goodix-ext-and-fix-wrong-forced-b.patch
rename to patches/platform_frameworks_base/0040-FacolaView-Support-goodix-ext-and-fix-wrong-forced-b.patch
index 14c3332..b2658e3 100644
--- a/patches/platform_frameworks_base/0044-FacolaView-Support-goodix-ext-and-fix-wrong-forced-b.patch
+++ b/patches/platform_frameworks_base/0040-FacolaView-Support-goodix-ext-and-fix-wrong-forced-b.patch
@@ -1,7 +1,7 @@
-From e156f6e2e7af7d743dc5ea52fe6a5623730141ef Mon Sep 17 00:00:00 2001
+From 2edb7c4d383365654a4e650041e0d85fd8fa2f9c Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 15 Dec 2019 23:19:32 +0100
-Subject: [PATCH 44/45] FacolaView: Support goodix ext and fix wrong forced
+Subject: [PATCH 40/58] FacolaView: Support goodix ext and fix wrong forced
  brightness
 
 ---
@@ -10,10 +10,10 @@ Subject: [PATCH 44/45] FacolaView: Support goodix ext and fix wrong forced
  2 files changed, 23 insertions(+), 8 deletions(-)
 
 diff --git a/services/core/Android.bp b/services/core/Android.bp
-index b2e8af938f3..9f83e49c27d 100644
+index 2e7118da1c0..ccf1ca99b54 100644
 --- a/services/core/Android.bp
 +++ b/services/core/Android.bp
-@@ -54,6 +54,7 @@ java_library_static {
+@@ -55,6 +55,7 @@ java_library_static {
          "dnsresolver_aidl_interface-V2-java",
          "netd_aidl_interface-V2-java",
          "netd_event_listener_interface-java",
@@ -113,5 +113,5 @@ index 08436019bc9..651cc97be39 100644
          mParams.packageName = "android";
  
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0045-Fix-big-goodix-integration-mistakes.patch b/patches/platform_frameworks_base/0041-Fix-big-goodix-integration-mistakes.patch
similarity index 95%
rename from patches/platform_frameworks_base/0045-Fix-big-goodix-integration-mistakes.patch
rename to patches/platform_frameworks_base/0041-Fix-big-goodix-integration-mistakes.patch
index f56eb43..0971dc8 100644
--- a/patches/platform_frameworks_base/0045-Fix-big-goodix-integration-mistakes.patch
+++ b/patches/platform_frameworks_base/0041-Fix-big-goodix-integration-mistakes.patch
@@ -1,7 +1,7 @@
-From 482586467473be36e881922152c9cf410ab0b73c Mon Sep 17 00:00:00 2001
+From 6963785c01498fcb54b697bb2530ecd7a8297f56 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 16 Dec 2019 19:31:12 +0100
-Subject: [PATCH 45/45] Fix (big) goodix integration mistakes
+Subject: [PATCH 41/58] Fix (big) goodix integration mistakes
 
 ---
  .../biometrics/fingerprint/FacolaView.java    | 19 ++++++++++++-------
@@ -55,5 +55,5 @@ index 651cc97be39..b8ca25a48d2 100644
              Slog.d("PHH-Enroll", "Failed calling xiaomi fp extcmd");
          }
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0046-fix-crashing-on-devices-with-higher-aspect-ratio-dow.patch b/patches/platform_frameworks_base/0042-fix-crashing-on-devices-with-higher-aspect-ratio-dow.patch
similarity index 92%
rename from patches/platform_frameworks_base/0046-fix-crashing-on-devices-with-higher-aspect-ratio-dow.patch
rename to patches/platform_frameworks_base/0042-fix-crashing-on-devices-with-higher-aspect-ratio-dow.patch
index 68bf55d..cc50c94 100644
--- a/patches/platform_frameworks_base/0046-fix-crashing-on-devices-with-higher-aspect-ratio-dow.patch
+++ b/patches/platform_frameworks_base/0042-fix-crashing-on-devices-with-higher-aspect-ratio-dow.patch
@@ -1,8 +1,8 @@
-From 1026ff090a11633027dd62fcff8fe91e2cdea732 Mon Sep 17 00:00:00 2001
+From 7117854a66e39ec6db3deb5caa02bb7008ed3650 Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Thu, 2 Jan 2020 10:16:49 +0800
-Subject: [PATCH] fix crashing on devices with higher aspect ratio down to
- sw288dp
+Subject: [PATCH 42/58] fix crashing on devices with higher aspect ratio down
+ to sw288dp
 
 * This is what the Qin 2 (Pro) is.
 
@@ -52,5 +52,5 @@ index 00000000000..40adc2e6879
 +
 +</resources>
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0049-FacolaView-Allow-system-side-properties-vendor-side-.patch b/patches/platform_frameworks_base/0043-FacolaView-Allow-system-side-properties-vendor-side-.patch
similarity index 91%
rename from patches/platform_frameworks_base/0049-FacolaView-Allow-system-side-properties-vendor-side-.patch
rename to patches/platform_frameworks_base/0043-FacolaView-Allow-system-side-properties-vendor-side-.patch
index 43201d2..b2ff332 100644
--- a/patches/platform_frameworks_base/0049-FacolaView-Allow-system-side-properties-vendor-side-.patch
+++ b/patches/platform_frameworks_base/0043-FacolaView-Allow-system-side-properties-vendor-side-.patch
@@ -1,7 +1,7 @@
-From 47af2ea4d5e850fc900a8f76682979325460a0e0 Mon Sep 17 00:00:00 2001
+From 1269ddf783c8d092c5eb51324ea9bb53230789af Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 22 Feb 2020 23:25:51 +0100
-Subject: [PATCH 49/49] FacolaView] Allow system-side properties (vendor-side
+Subject: [PATCH 43/58] FacolaView] Allow system-side properties (vendor-side
  works only with proper selinux)
 
 ---
@@ -25,5 +25,5 @@ index b8ca25a48d2..f77e8282689 100644
          if(size.length == 2 && location.length == 2) {
              Slog.d("PHH-Enroll", "Got real values");
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0050-WIP-report-press-events-to-oppo-fingerprint-sensor.patch b/patches/platform_frameworks_base/0044-report-press-events-to-oppo-fingerprint-sensor.patch
similarity index 92%
rename from patches/platform_frameworks_base/0050-WIP-report-press-events-to-oppo-fingerprint-sensor.patch
rename to patches/platform_frameworks_base/0044-report-press-events-to-oppo-fingerprint-sensor.patch
index 9053166..b88626f 100644
--- a/patches/platform_frameworks_base/0050-WIP-report-press-events-to-oppo-fingerprint-sensor.patch
+++ b/patches/platform_frameworks_base/0044-report-press-events-to-oppo-fingerprint-sensor.patch
@@ -1,7 +1,7 @@
-From 29fbc5853ee25d3cd72db8f87aec6addd863e677 Mon Sep 17 00:00:00 2001
+From d829818f8aaf25aaa6ae99f8220a73a2717342a5 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 22 Feb 2020 23:45:54 +0100
-Subject: [PATCH 50/53] [WIP] report press events to oppo fingerprint sensor
+Subject: [PATCH 44/58] report press events to oppo fingerprint sensor
 
 ---
  .../biometrics/fingerprint/FacolaView.java       | 16 ++++++++++++++++
@@ -45,5 +45,5 @@ index f77e8282689..0fb4254eb60 100644
                  if(mXiaomiFingerprint != null) {
                      mXiaomiFingerprint.extCmd(0xa, 0);
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0052-Add-support-for-samsung-optical-under-display-finger.patch b/patches/platform_frameworks_base/0045-Add-support-for-samsung-optical-under-display-finger.patch
similarity index 94%
rename from patches/platform_frameworks_base/0052-Add-support-for-samsung-optical-under-display-finger.patch
rename to patches/platform_frameworks_base/0045-Add-support-for-samsung-optical-under-display-finger.patch
index 715b885..2bae195 100644
--- a/patches/platform_frameworks_base/0052-Add-support-for-samsung-optical-under-display-finger.patch
+++ b/patches/platform_frameworks_base/0045-Add-support-for-samsung-optical-under-display-finger.patch
@@ -1,7 +1,7 @@
-From bc7c0ed48c84ea421d84049a5fdf509f0bdf8f8c Mon Sep 17 00:00:00 2001
+From 89f7440821343b3a55e75be79e4a58305f0bd660 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 2 Mar 2020 21:13:36 +0100
-Subject: [PATCH 52/53] Add support for samsung optical under-display
+Subject: [PATCH 45/58] Add support for samsung optical under-display
  fingerprint
 
 ---
@@ -10,10 +10,10 @@ Subject: [PATCH 52/53] Add support for samsung optical under-display
  2 files changed, 16 insertions(+), 2 deletions(-)
 
 diff --git a/services/core/Android.bp b/services/core/Android.bp
-index 9f83e49c27d..84a5450dc05 100644
+index ccf1ca99b54..ba6c5fcf7ee 100644
 --- a/services/core/Android.bp
 +++ b/services/core/Android.bp
-@@ -55,6 +55,7 @@ java_library_static {
+@@ -56,6 +56,7 @@ java_library_static {
          "netd_aidl_interface-V2-java",
          "netd_event_listener_interface-java",
          "vendor.goodix.extend.service-V2.0-java",
@@ -82,5 +82,5 @@ index 0fb4254eb60..edd13988e49 100644
              canvas.drawCircle(mW/2, mH/2, (float) (mW/2.0f), this.mPaintShow);
          }
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0053-Fix-persist.sys.fp.fod-override.patch b/patches/platform_frameworks_base/0046-Fix-persist.sys.fp.fod-override.patch
similarity index 92%
rename from patches/platform_frameworks_base/0053-Fix-persist.sys.fp.fod-override.patch
rename to patches/platform_frameworks_base/0046-Fix-persist.sys.fp.fod-override.patch
index 03ef66b..a04043e 100644
--- a/patches/platform_frameworks_base/0053-Fix-persist.sys.fp.fod-override.patch
+++ b/patches/platform_frameworks_base/0046-Fix-persist.sys.fp.fod-override.patch
@@ -1,7 +1,7 @@
-From 3b6fbd406c98211525f37d4d1e341d7750a652f0 Mon Sep 17 00:00:00 2001
+From 5c0dc33ebcbb06c0a1408f651c408afca1b606cc Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 2 Mar 2020 21:13:47 +0100
-Subject: [PATCH 53/53] Fix persist.sys.fp.fod override
+Subject: [PATCH 46/58] Fix persist.sys.fp.fod override
 
 ---
  .../com/android/server/biometrics/fingerprint/FacolaView.java | 4 ++--
@@ -25,5 +25,5 @@ index edd13988e49..2c1ba76f529 100644
          Slog.d("PHH-Enroll", "FacolaView hello");
          if(size.length == 2 && location.length == 2) {
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0054-Allow-disabling-of-fingerprint-cleanups-needed-on-so.patch b/patches/platform_frameworks_base/0047-Allow-disabling-of-fingerprint-cleanups-needed-on-so.patch
similarity index 87%
rename from patches/platform_frameworks_base/0054-Allow-disabling-of-fingerprint-cleanups-needed-on-so.patch
rename to patches/platform_frameworks_base/0047-Allow-disabling-of-fingerprint-cleanups-needed-on-so.patch
index a880a22..4263d84 100644
--- a/patches/platform_frameworks_base/0054-Allow-disabling-of-fingerprint-cleanups-needed-on-so.patch
+++ b/patches/platform_frameworks_base/0047-Allow-disabling-of-fingerprint-cleanups-needed-on-so.patch
@@ -1,7 +1,7 @@
-From b0d4bdf42853edee3ee12acf269c8891af63060c Mon Sep 17 00:00:00 2001
+From c9cc25cbfb382cbfad7f0694118e1791719c8f87 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 10 Mar 2020 23:30:17 +0100
-Subject: [PATCH 54/55] Allow disabling of fingerprint cleanups, needed on some
+Subject: [PATCH 47/58] Allow disabling of fingerprint cleanups, needed on some
  Realme devices that cant enumerate
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 54/55] Allow disabling of fingerprint cleanups, needed on some
  1 file changed, 6 insertions(+), 3 deletions(-)
 
 diff --git a/services/core/java/com/android/server/biometrics/BiometricServiceBase.java b/services/core/java/com/android/server/biometrics/BiometricServiceBase.java
-index 4031cd32829..e74343ce4de 100644
+index 292798721c6..aa94e2e2d40 100644
 --- a/services/core/java/com/android/server/biometrics/BiometricServiceBase.java
 +++ b/services/core/java/com/android/server/biometrics/BiometricServiceBase.java
-@@ -323,6 +323,7 @@ public abstract class BiometricServiceBase extends SystemService
+@@ -326,6 +326,7 @@ public abstract class BiometricServiceBase extends SystemService
          private List<? extends BiometricAuthenticator.Identifier> mEnrolledList;
          // List of templates to remove from the HAL
          private List<BiometricAuthenticator.Identifier> mUnknownHALTemplates = new ArrayList<>();
@@ -20,7 +20,7 @@ index 4031cd32829..e74343ce4de 100644
  
          InternalEnumerateClient(Context context,
                  DaemonWrapper daemon, long halDeviceId, IBinder token,
-@@ -367,9 +368,11 @@ public abstract class BiometricServiceBase extends SystemService
+@@ -370,9 +371,11 @@ public abstract class BiometricServiceBase extends SystemService
                  BiometricAuthenticator.Identifier identifier = mEnrolledList.get(i);
                  Slog.e(getTag(), "doTemplateCleanup(): Removing dangling template from framework: "
                          + identifier.getBiometricId() + " "
@@ -36,5 +36,5 @@ index 4031cd32829..e74343ce4de 100644
                          statsModality(),
                          BiometricsProtoEnums.ISSUE_UNKNOWN_TEMPLATE_ENROLLED_FRAMEWORK);
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0055-Support-Realme-FOD.patch b/patches/platform_frameworks_base/0048-Support-Realme-FOD.patch
similarity index 98%
rename from patches/platform_frameworks_base/0055-Support-Realme-FOD.patch
rename to patches/platform_frameworks_base/0048-Support-Realme-FOD.patch
index 3e3c0cb..5e2be9d 100644
--- a/patches/platform_frameworks_base/0055-Support-Realme-FOD.patch
+++ b/patches/platform_frameworks_base/0048-Support-Realme-FOD.patch
@@ -1,7 +1,7 @@
-From 612be3c02c49dc81924a58bf503bb04dfaa6b639 Mon Sep 17 00:00:00 2001
+From 8bec1b57d67df8b2d14b41f91ab909246e655ad0 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 10 Mar 2020 23:32:00 +0100
-Subject: [PATCH 55/55] Support Realme FOD
+Subject: [PATCH 48/58] Support Realme FOD
 
 List of changes:
 - Enable dimlayer_hbm. This dims the framebuffer, while putting screen
@@ -21,10 +21,10 @@ for slow brightness change
  2 files changed, 132 insertions(+), 15 deletions(-)
 
 diff --git a/services/core/Android.bp b/services/core/Android.bp
-index 84a5450dc05..dd0575c0b02 100644
+index ba6c5fcf7ee..334d0d04067 100644
 --- a/services/core/Android.bp
 +++ b/services/core/Android.bp
-@@ -56,6 +56,7 @@ java_library_static {
+@@ -57,6 +57,7 @@ java_library_static {
          "netd_event_listener_interface-java",
          "vendor.goodix.extend.service-V2.0-java",
          "vendor.samsung.hardware.biometrics.fingerprint-V2.1-java",
@@ -289,5 +289,5 @@ index 2c1ba76f529..42f21d63430 100644
 +
  }
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0048-TextureVuew-rebind-GL-texture-if-AHB-content-has-cha.patch b/patches/platform_frameworks_base/0048-TextureVuew-rebind-GL-texture-if-AHB-content-has-cha.patch
deleted file mode 100644
index cba3929..0000000
--- a/patches/platform_frameworks_base/0048-TextureVuew-rebind-GL-texture-if-AHB-content-has-cha.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From b13732f6a801d85390feb025d678e2b14effc915 Mon Sep 17 00:00:00 2001
-From: Stan Iliev <stani@google.com>
-Date: Thu, 1 Aug 2019 14:41:52 -0400
-Subject: [PATCH 48/49] TextureVuew rebind GL texture, if AHB content has
- changed
-
-Bug: 138674291
-Test: Ran apps with TextureView and CTS
-Change-Id: Ieecf7daf160761de719356644ddaeda8f9c068e1
----
- libs/hwui/surfacetexture/ImageConsumer.cpp | 18 +++++++++++++++---
- libs/hwui/surfacetexture/ImageConsumer.h   |  5 -----
- 2 files changed, 15 insertions(+), 8 deletions(-)
-
-diff --git a/libs/hwui/surfacetexture/ImageConsumer.cpp b/libs/hwui/surfacetexture/ImageConsumer.cpp
-index bae616bbc63..17ee17d5cd1 100644
---- a/libs/hwui/surfacetexture/ImageConsumer.cpp
-+++ b/libs/hwui/surfacetexture/ImageConsumer.cpp
-@@ -71,13 +71,16 @@ public:
-     void makeImage(sp<GraphicBuffer>& graphicBuffer, android_dataspace dataspace,
-                    GrContext* context);
- 
-+    void newBufferContent(GrContext* context);
-+
- private:
-     // The only way to invoke dtor is with unref, when mUsageCount is 0.
-     ~AutoBackendTextureRelease() {}
- 
-     GrBackendTexture mBackendTexture;
-     GrAHardwareBufferUtils::DeleteImageProc mDeleteProc;
--    GrAHardwareBufferUtils::DeleteImageCtx mDeleteCtx;
-+    GrAHardwareBufferUtils::UpdateImageProc mUpdateProc;
-+    GrAHardwareBufferUtils::TexImageCtx mImageCtx;
- 
-     // Starting with refcount 1, because the first ref is held by SurfaceTexture. Additional refs
-     // are held by SkImages.
-@@ -101,7 +104,8 @@ AutoBackendTextureRelease::AutoBackendTextureRelease(GrContext* context, Graphic
-         buffer->getWidth(),
-         buffer->getHeight(),
-         &mDeleteProc,
--        &mDeleteCtx,
-+        &mUpdateProc,
-+        &mImageCtx,
-         createProtectedImage,
-         backendFormat,
-         false);
-@@ -123,7 +127,7 @@ void AutoBackendTextureRelease::unref(bool releaseImage) {
-     mUsageCount--;
-     if (mUsageCount <= 0) {
-         if (mBackendTexture.isValid()) {
--            mDeleteProc(mDeleteCtx);
-+            mDeleteProc(mImageCtx);
-             mBackendTexture = {};
-         }
-         delete this;
-@@ -154,6 +158,12 @@ void AutoBackendTextureRelease::makeImage(sp<GraphicBuffer>& graphicBuffer,
-     }
- }
- 
-+void AutoBackendTextureRelease::newBufferContent(GrContext* context) {
-+    if (mBackendTexture.isValid()) {
-+        mUpdateProc(mImageCtx, context);
-+    }
-+}
-+
- void ImageConsumer::ImageSlot::createIfNeeded(sp<GraphicBuffer> graphicBuffer,
-                                               android_dataspace dataspace, bool forceCreate,
-                                               GrContext* context) {
-@@ -166,6 +176,8 @@ void ImageConsumer::ImageSlot::createIfNeeded(sp<GraphicBuffer> graphicBuffer,
- 
-         if (!mTextureRelease) {
-             mTextureRelease = new AutoBackendTextureRelease(context, graphicBuffer.get());
-+        } else {
-+            mTextureRelease->newBufferContent(context);
-         }
- 
-         mDataspace = dataspace;
-diff --git a/libs/hwui/surfacetexture/ImageConsumer.h b/libs/hwui/surfacetexture/ImageConsumer.h
-index 2fdece98987..3e2a91a251f 100644
---- a/libs/hwui/surfacetexture/ImageConsumer.h
-+++ b/libs/hwui/surfacetexture/ImageConsumer.h
-@@ -26,11 +26,6 @@
- #include <gui/BufferItem.h>
- #include <system/graphics.h>
- 
--namespace GrAHardwareBufferUtils {
--typedef void* DeleteImageCtx;
--typedef void (*DeleteImageProc)(DeleteImageCtx);
--}
--
- namespace android {
- 
- namespace uirenderer {
--- 
-2.17.1
-
diff --git a/patches/platform_frameworks_base/0056-Support-Huawei-light-HAL.patch b/patches/platform_frameworks_base/0049-Support-Huawei-light-HAL.patch
similarity index 90%
rename from patches/platform_frameworks_base/0056-Support-Huawei-light-HAL.patch
rename to patches/platform_frameworks_base/0049-Support-Huawei-light-HAL.patch
index caa4dc2..89060f0 100644
--- a/patches/platform_frameworks_base/0056-Support-Huawei-light-HAL.patch
+++ b/patches/platform_frameworks_base/0049-Support-Huawei-light-HAL.patch
@@ -1,7 +1,7 @@
-From 06972c2ccb195e177bab0184ca7f3abd1747080f Mon Sep 17 00:00:00 2001
+From b071b7633f20b176aee53cbf8baed331a2483019 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Mon, 30 Mar 2020 10:07:00 +0000
-Subject: [PATCH 56/57] Support Huawei light HAL
+Subject: [PATCH 49/58] Support Huawei light HAL
 
 For https://github.com/phhusson/treble_experimentations/issues/1204
 
@@ -12,7 +12,7 @@ Change-Id: I719a13eb66a46703b7ff0e00113f9b98b3244996
  2 files changed, 31 insertions(+)
 
 diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp
-index e417420a135..d1df6337240 100644
+index 8f44be480c9..2bc6a15129f 100644
 --- a/services/core/jni/Android.bp
 +++ b/services/core/jni/Android.bp
 @@ -138,6 +138,7 @@ cc_defaults {
@@ -24,10 +24,10 @@ index e417420a135..d1df6337240 100644
  
      static_libs: [
 diff --git a/services/core/jni/com_android_server_lights_LightsService.cpp b/services/core/jni/com_android_server_lights_LightsService.cpp
-index a6a5849caed..f3e456203f1 100644
+index dedc7734131..7c2a0b6203d 100644
 --- a/services/core/jni/com_android_server_lights_LightsService.cpp
 +++ b/services/core/jni/com_android_server_lights_LightsService.cpp
-@@ -26,6 +26,7 @@
+@@ -27,6 +27,7 @@
  #include <vendor/samsung/hardware/light/2.0/types.h>
  #include <vendor/samsung/hardware/light/3.0/ISehLight.h>
  #include <vendor/samsung/hardware/light/3.0/types.h>
@@ -35,7 +35,7 @@ index a6a5849caed..f3e456203f1 100644
  #include <android-base/chrono_utils.h>
  #include <utils/misc.h>
  #include <utils/Log.h>
-@@ -48,11 +49,15 @@ using SecType    = ::vendor::samsung::hardware::light::V2_0::SecType;
+@@ -49,11 +50,15 @@ using SecType    = ::vendor::samsung::hardware::light::V2_0::SecType;
  using ISehLight  = ::vendor::samsung::hardware::light::V3_0::ISehLight;
  using SehType    = ::vendor::samsung::hardware::light::V3_0::SehType;
  using SehLightState = ::vendor::samsung::hardware::light::V3_0::SehLightState;
@@ -51,7 +51,7 @@ index a6a5849caed..f3e456203f1 100644
  
  static bool validate(jint light, jint flash, jint brightness) {
      bool valid = true;
-@@ -193,6 +198,31 @@ static void setLight_native(
+@@ -204,6 +209,31 @@ static void setLight_native(
  	return;
      }
  
@@ -84,5 +84,5 @@ index a6a5849caed..f3e456203f1 100644
      LightState state = constructState(
          colorARGB, flashMode, onMS, offMS, brightnessMode);
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0057-Always-allow-overriding-the-number-of-work-profiles.patch b/patches/platform_frameworks_base/0050-Always-allow-overriding-the-number-of-work-profiles.patch
similarity index 81%
rename from patches/platform_frameworks_base/0057-Always-allow-overriding-the-number-of-work-profiles.patch
rename to patches/platform_frameworks_base/0050-Always-allow-overriding-the-number-of-work-profiles.patch
index 274e926..996b18e 100644
--- a/patches/platform_frameworks_base/0057-Always-allow-overriding-the-number-of-work-profiles.patch
+++ b/patches/platform_frameworks_base/0050-Always-allow-overriding-the-number-of-work-profiles.patch
@@ -1,17 +1,17 @@
-From ba959392b9e59279ec0fd490439c145618b3978b Mon Sep 17 00:00:00 2001
+From fe62d8d4d08605687312ca28f722978191e4ac41 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 57/57] Always allow overriding the number of work profiles
+Subject: [PATCH 50/58] Always allow overriding the number of work profiles
 
 ---
  .../java/com/android/server/pm/UserManagerService.java | 10 ++--------
  1 file changed, 2 insertions(+), 8 deletions(-)
 
 diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
-index d7e070981b1..52797ef1821 100644
+index 82bc41fcdcd..4a3da73cf42 100644
 --- a/services/core/java/com/android/server/pm/UserManagerService.java
 +++ b/services/core/java/com/android/server/pm/UserManagerService.java
-@@ -4429,14 +4429,8 @@ public class UserManagerService extends IUserManager.Stub {
+@@ -4438,14 +4438,8 @@ public class UserManagerService extends IUserManager.Stub {
  
      @VisibleForTesting
      static int getMaxManagedProfiles() {
@@ -29,5 +29,5 @@ index d7e070981b1..52797ef1821 100644
  
      @GuardedBy("mUsersLock")
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0058-Additional-fod-command-for-non-optical-samsung-devic.patch b/patches/platform_frameworks_base/0051-Additional-fod-command-for-non-optical-samsung-devic.patch
similarity index 87%
rename from patches/platform_frameworks_base/0058-Additional-fod-command-for-non-optical-samsung-devic.patch
rename to patches/platform_frameworks_base/0051-Additional-fod-command-for-non-optical-samsung-devic.patch
index 8650279..1c82de3 100644
--- a/patches/platform_frameworks_base/0058-Additional-fod-command-for-non-optical-samsung-devic.patch
+++ b/patches/platform_frameworks_base/0051-Additional-fod-command-for-non-optical-samsung-devic.patch
@@ -1,7 +1,7 @@
-From bd6e789f55e396d1672f97f5f95761b23044e2b4 Mon Sep 17 00:00:00 2001
+From 7a5d752d18a11b7a64e13879cdf42235bcd54237 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 9 Apr 2020 22:57:47 +0200
-Subject: [PATCH 58/58] Additional fod command for non-optical samsung devices
+Subject: [PATCH 51/58] Additional fod command for non-optical samsung devices
  running Q vendor
 
 ---
@@ -21,5 +21,5 @@ index 42f21d63430..a87f7e78af4 100644
          if(mX == -1 || mY == -1 || mW == -1 || mH == -1) return;
  
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0059-Add-a-backlight-listener-to-be-used-by-FOD-to-proper.patch b/patches/platform_frameworks_base/0052-Add-a-backlight-listener-to-be-used-by-FOD-to-proper.patch
similarity index 82%
rename from patches/platform_frameworks_base/0059-Add-a-backlight-listener-to-be-used-by-FOD-to-proper.patch
rename to patches/platform_frameworks_base/0052-Add-a-backlight-listener-to-be-used-by-FOD-to-proper.patch
index fc253af..b2a1b2d 100644
--- a/patches/platform_frameworks_base/0059-Add-a-backlight-listener-to-be-used-by-FOD-to-proper.patch
+++ b/patches/platform_frameworks_base/0052-Add-a-backlight-listener-to-be-used-by-FOD-to-proper.patch
@@ -1,7 +1,7 @@
-From 5d0e8590f692a4cc868310dbc61d502f204cfbaa Mon Sep 17 00:00:00 2001
+From d12f98cc2bde44b689cd4be62ba6e7d1b9fc8d9e Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 20 May 2020 17:28:26 +0200
-Subject: [PATCH 59/65] Add a backlight listener, to be used by FOD to properly
+Subject: [PATCH 52/58] Add a backlight listener, to be used by FOD to properly
  set dim
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 59/65] Add a backlight listener, to be used by FOD to properly
  1 file changed, 5 insertions(+)
 
 diff --git a/services/core/java/com/android/server/lights/LightsService.java b/services/core/java/com/android/server/lights/LightsService.java
-index 777a00daf31..9d7975d63b4 100644
+index f9ac8db09ea..6b0dbc336bb 100644
 --- a/services/core/java/com/android/server/lights/LightsService.java
 +++ b/services/core/java/com/android/server/lights/LightsService.java
-@@ -30,10 +30,14 @@ import android.view.SurfaceControl;
+@@ -31,10 +31,14 @@ import android.view.SurfaceControl;
  import com.android.server.SystemService;
  
  public class LightsService extends SystemService {
@@ -27,7 +27,7 @@ index 777a00daf31..9d7975d63b4 100644
  
      private final class LightImpl extends Light {
  
-@@ -90,6 +94,7 @@ public class LightsService extends SystemService {
+@@ -92,6 +96,7 @@ public class LightsService extends SystemService {
                              (float) brightness / mSurfaceControlMaximumBrightness);
  		    return;
                  }
@@ -36,5 +36,5 @@ index 777a00daf31..9d7975d63b4 100644
                  if(mId == 0) {
                      String fp = SystemProperties.get("ro.vendor.build.fingerprint", "hello");
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0060-Don-t-show-facola-on-preenroll-wait-for-enroll.patch b/patches/platform_frameworks_base/0053-Don-t-show-facola-on-preenroll-wait-for-enroll.patch
similarity index 93%
rename from patches/platform_frameworks_base/0060-Don-t-show-facola-on-preenroll-wait-for-enroll.patch
rename to patches/platform_frameworks_base/0053-Don-t-show-facola-on-preenroll-wait-for-enroll.patch
index fc07c1a..ad99ef9 100644
--- a/patches/platform_frameworks_base/0060-Don-t-show-facola-on-preenroll-wait-for-enroll.patch
+++ b/patches/platform_frameworks_base/0053-Don-t-show-facola-on-preenroll-wait-for-enroll.patch
@@ -1,7 +1,7 @@
-From 7e7cdc92f9f23fa9ea1fb1b6d7cea37f0301f899 Mon Sep 17 00:00:00 2001
+From 84c844aca01d2a838ae19be6b7961811852fa31f Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 20 May 2020 17:39:50 +0200
-Subject: [PATCH 60/65] Don't show facola on preenroll, wait for enroll
+Subject: [PATCH 53/58] Don't show facola on preenroll, wait for enroll
 
 ---
  .../server/biometrics/fingerprint/FingerprintService.java     | 4 +---
@@ -44,5 +44,5 @@ index 1323c5ec0dd..c53607786df 100644
              return daemon.preEnroll();
          } catch (RemoteException e) {
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0061-Add-support-for-new-Goodix-Samsung-Xiaomi-FODs.patch b/patches/platform_frameworks_base/0054-Add-support-for-new-Goodix-Samsung-Xiaomi-FODs.patch
similarity index 99%
rename from patches/platform_frameworks_base/0061-Add-support-for-new-Goodix-Samsung-Xiaomi-FODs.patch
rename to patches/platform_frameworks_base/0054-Add-support-for-new-Goodix-Samsung-Xiaomi-FODs.patch
index fcfe7c6..05c2c5f 100644
--- a/patches/platform_frameworks_base/0061-Add-support-for-new-Goodix-Samsung-Xiaomi-FODs.patch
+++ b/patches/platform_frameworks_base/0054-Add-support-for-new-Goodix-Samsung-Xiaomi-FODs.patch
@@ -1,7 +1,7 @@
-From 5624ce8b0cadf9cc588aadc8f216073a1eb8385f Mon Sep 17 00:00:00 2001
+From 5528cf273e0e2e4b33ad5202a494ebc4018216ae Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 20 May 2020 21:17:58 +0200
-Subject: [PATCH 61/65] Add support for new Goodix, Samsung, Xiaomi FODs
+Subject: [PATCH 54/58] Add support for new Goodix, Samsung, Xiaomi FODs
 
 - Xiaomi on MIUI12 has new magical Z to trigger HBM, and trigger feedback. Dim layer is done by kernel, but we need to set alpha
 - Samsung has usageBits to trigger HBM and trigger feedback
@@ -12,10 +12,10 @@ Subject: [PATCH 61/65] Add support for new Goodix, Samsung, Xiaomi FODs
  2 files changed, 285 insertions(+), 40 deletions(-)
 
 diff --git a/services/core/Android.bp b/services/core/Android.bp
-index dd0575c0b02..910e2fcf64c 100644
+index 334d0d04067..8dcb4396953 100644
 --- a/services/core/Android.bp
 +++ b/services/core/Android.bp
-@@ -55,7 +55,9 @@ java_library_static {
+@@ -56,7 +56,9 @@ java_library_static {
          "netd_aidl_interface-V2-java",
          "netd_event_listener_interface-java",
          "vendor.goodix.extend.service-V2.0-java",
@@ -527,5 +527,5 @@ index a87f7e78af4..d3d58aff6c0 100644
 +
  }
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0062-On-MIUI12-vendor-we-don-t-want-our-own-diming.patch b/patches/platform_frameworks_base/0055-On-MIUI12-vendor-we-don-t-want-our-own-diming.patch
similarity index 91%
rename from patches/platform_frameworks_base/0062-On-MIUI12-vendor-we-don-t-want-our-own-diming.patch
rename to patches/platform_frameworks_base/0055-On-MIUI12-vendor-we-don-t-want-our-own-diming.patch
index 9ba3e5a..5dd72e7 100644
--- a/patches/platform_frameworks_base/0062-On-MIUI12-vendor-we-don-t-want-our-own-diming.patch
+++ b/patches/platform_frameworks_base/0055-On-MIUI12-vendor-we-don-t-want-our-own-diming.patch
@@ -1,7 +1,7 @@
-From 80751a02c586e3280e41dc457b6ba3aa3404f5a4 Mon Sep 17 00:00:00 2001
+From 5bc5806b8570dcd25aae6bcb27926037a48855de Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 21 May 2020 16:12:42 +0200
-Subject: [PATCH 62/65] On MIUI12 vendor, we don't want our own diming
+Subject: [PATCH 55/58] On MIUI12 vendor, we don't want our own diming
 
 ---
  .../com/android/server/biometrics/fingerprint/FacolaView.java  | 3 +--
@@ -29,5 +29,5 @@ index d3d58aff6c0..8afbbc0dce0 100644
                  @Override
                  public void onEvent(int event, String path) {
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0063-Add-mUiHidden-which-is-guarded-by-Handler.-This-is-n.patch b/patches/platform_frameworks_base/0056-Add-mUiHidden-which-is-guarded-by-Handler.-This-is-n.patch
similarity index 95%
rename from patches/platform_frameworks_base/0063-Add-mUiHidden-which-is-guarded-by-Handler.-This-is-n.patch
rename to patches/platform_frameworks_base/0056-Add-mUiHidden-which-is-guarded-by-Handler.-This-is-n.patch
index 7b3a694..f43a051 100644
--- a/patches/platform_frameworks_base/0063-Add-mUiHidden-which-is-guarded-by-Handler.-This-is-n.patch
+++ b/patches/platform_frameworks_base/0056-Add-mUiHidden-which-is-guarded-by-Handler.-This-is-n.patch
@@ -1,7 +1,7 @@
-From a788201da61532891201d3dddcbdfb9a97d0a089 Mon Sep 17 00:00:00 2001
+From 2f5a9ff1301647e242dc37d25387dff5ed652207 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 21 May 2020 18:41:57 +0200
-Subject: [PATCH 63/65] Add mUiHidden which is guarded by Handler. This is
+Subject: [PATCH 56/58] Add mUiHidden which is guarded by Handler. This is
  needed because backlight listener might intervene at the wrong time
 
 ---
@@ -55,5 +55,5 @@ index 8afbbc0dce0..aeb81f5b7c9 100644
          });
      }
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0064-Always-try-to-get-FOD-HALs-because-we-check-samsung-.patch b/patches/platform_frameworks_base/0057-Always-try-to-get-FOD-HALs-because-we-check-samsung-.patch
similarity index 96%
rename from patches/platform_frameworks_base/0064-Always-try-to-get-FOD-HALs-because-we-check-samsung-.patch
rename to patches/platform_frameworks_base/0057-Always-try-to-get-FOD-HALs-because-we-check-samsung-.patch
index 9c173e3..ecc4c1c 100644
--- a/patches/platform_frameworks_base/0064-Always-try-to-get-FOD-HALs-because-we-check-samsung-.patch
+++ b/patches/platform_frameworks_base/0057-Always-try-to-get-FOD-HALs-because-we-check-samsung-.patch
@@ -1,7 +1,7 @@
-From f2c5806a14c89a6f029e7d27117749df4210bf10 Mon Sep 17 00:00:00 2001
+From ce6a18178130952fd1238d2fa66aceef1c114ed1 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 21 May 2020 18:42:20 +0200
-Subject: [PATCH 64/65] Always try to get FOD HALs, because we check samsung
+Subject: [PATCH 57/58] Always try to get FOD HALs, because we check samsung
  HAL later to compute width
 
 ---
@@ -80,5 +80,5 @@ index aeb81f5b7c9..3536093a4ee 100644
  
          if(mSamsungFingerprint3_0 != null || mSamsungFingerprint != null) {
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_base/0067-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch b/patches/platform_frameworks_base/0058-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch
similarity index 80%
rename from patches/platform_frameworks_base/0067-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch
rename to patches/platform_frameworks_base/0058-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch
index 1cacb8c..806747c 100644
--- a/patches/platform_frameworks_base/0067-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch
+++ b/patches/platform_frameworks_base/0058-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch
@@ -1,7 +1,7 @@
-From 7e4f00542b309de377bd43e1196cffe31c9086cc Mon Sep 17 00:00:00 2001
+From cb07b8475b5b0c9da86012d4c260a404a2e5c640 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 67/67] HOME deserves to wake-up devices just as well as back
+Subject: [PATCH 58/58] HOME deserves to wake-up devices just as well as back
  and menu
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH 67/67] HOME deserves to wake-up devices just as well as back
  1 file changed, 1 insertion(+)
 
 diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java
-index 87dd5b47c44..63d76ade2aa 100644
+index fee2503ccad..7bdeaa6e83e 100644
 --- a/core/java/android/view/KeyEvent.java
 +++ b/core/java/android/view/KeyEvent.java
 @@ -1935,6 +1935,7 @@ public class KeyEvent extends InputEvent implements Parcelable {
@@ -21,5 +21,5 @@ index 87dd5b47c44..63d76ade2aa 100644
              case KeyEvent.KEYCODE_PAIRING:
              case KeyEvent.KEYCODE_STEM_1:
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_native/0001-AOSP-8.0-8.1-didn-t-use-presentOrValidate-so-it-s-br.patch b/patches/platform_frameworks_native/0001-AOSP-8.0-8.1-didn-t-use-presentOrValidate-so-it-s-br.patch
index 05fd342..cd16773 100644
--- a/patches/platform_frameworks_native/0001-AOSP-8.0-8.1-didn-t-use-presentOrValidate-so-it-s-br.patch
+++ b/patches/platform_frameworks_native/0001-AOSP-8.0-8.1-didn-t-use-presentOrValidate-so-it-s-br.patch
@@ -1,7 +1,7 @@
-From 0ce8e40182af9c1955a862f8bba608b90e6a0524 Mon Sep 17 00:00:00 2001
+From 0b98498b3b9768fabd4b9a45e6ce23c6bcbc93a1 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 14 Aug 2018 21:01:35 +0200
-Subject: [PATCH 1/5] AOSP 8.0/8.1 didn't use presentOrValidate, so it's
+Subject: [PATCH 1/8] AOSP 8.0/8.1 didn't use presentOrValidate, so it's
  broken. Don't use it
 
 Change-Id: If86793dba3738680280f9dc0f7e7c802c0836690
@@ -23,5 +23,5 @@ index 1099041b4..2021c26b0 100644
          uint32_t state = UINT32_MAX;
          error = hwcDisplay->presentOrValidate(&numTypes, &numRequests, &outPresentFence , &state);
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_native/0002-Ignore-usage-bits-verification.patch b/patches/platform_frameworks_native/0002-Ignore-usage-bits-verification.patch
index af737e7..7e1264a 100644
--- a/patches/platform_frameworks_native/0002-Ignore-usage-bits-verification.patch
+++ b/patches/platform_frameworks_native/0002-Ignore-usage-bits-verification.patch
@@ -1,7 +1,7 @@
-From d51e5d5a041f8404b5d62cfca5f5765588ded4fb Mon Sep 17 00:00:00 2001
+From f4a49874650b6192a821a6e755f600745b34210a Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 19 Aug 2018 23:07:24 +0200
-Subject: [PATCH 2/5] Ignore usage bits verification
+Subject: [PATCH 2/8] Ignore usage bits verification
 
 This didn't ignore as of 8.1, so we're ""safe""
 
@@ -11,10 +11,10 @@ Change-Id: I40c1d588c1fa104d844322b469f76e52bee1495a
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/libs/ui/Gralloc2.cpp b/libs/ui/Gralloc2.cpp
-index 5dc453005..90dc90f39 100644
+index 2dd11b141..3ebf9808d 100644
 --- a/libs/ui/Gralloc2.cpp
 +++ b/libs/ui/Gralloc2.cpp
-@@ -108,7 +108,7 @@ status_t Gralloc2Mapper::validateBufferDescriptorInfo(
+@@ -115,7 +115,7 @@ status_t Gralloc2Mapper::validateBufferDescriptorInfo(
      if (descriptorInfo->usage & ~validUsageBits) {
          ALOGE("buffer descriptor contains invalid usage bits 0x%" PRIx64,
                descriptorInfo->usage & ~validUsageBits);
@@ -24,5 +24,5 @@ index 5dc453005..90dc90f39 100644
      return NO_ERROR;
  }
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_native/0003-Enable-fallback-to-old-ro.sf.hwrotation-property.patch b/patches/platform_frameworks_native/0003-Enable-fallback-to-old-ro.sf.hwrotation-property.patch
index f024283..f0f7a16 100644
--- a/patches/platform_frameworks_native/0003-Enable-fallback-to-old-ro.sf.hwrotation-property.patch
+++ b/patches/platform_frameworks_native/0003-Enable-fallback-to-old-ro.sf.hwrotation-property.patch
@@ -1,7 +1,7 @@
-From 8db7e963f05ebc59298cf8e9b74f98d670ec5742 Mon Sep 17 00:00:00 2001
+From 66d21d061b9c9f745c5cb199c29268f519425d71 Mon Sep 17 00:00:00 2001
 From: phh <phh@phh.me>
 Date: Wed, 22 Aug 2018 08:57:52 +0000
-Subject: [PATCH 3/5] Enable fallback to old ro.sf.hwrotation property
+Subject: [PATCH 3/8] Enable fallback to old ro.sf.hwrotation property
 
 Change-Id: I46b75a15b85fc5bda31357a4beeb7dab77bd6fe1
 ---
@@ -9,10 +9,10 @@ Change-Id: I46b75a15b85fc5bda31357a4beeb7dab77bd6fe1
  1 file changed, 18 insertions(+)
 
 diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
-index 6166789fc..14ca4729c 100644
+index e2ba4de6d..d66c8a8f5 100644
 --- a/services/surfaceflinger/SurfaceFlinger.cpp
 +++ b/services/surfaceflinger/SurfaceFlinger.cpp
-@@ -329,7 +329,25 @@ SurfaceFlinger::SurfaceFlinger(Factory& factory) : SurfaceFlinger(factory, SkipI
+@@ -339,7 +339,25 @@ SurfaceFlinger::SurfaceFlinger(Factory& factory) : SurfaceFlinger(factory, SkipI
              SurfaceFlinger::primaryDisplayOrientation = DisplayState::eOrientationDefault;
              break;
      }
@@ -39,5 +39,5 @@ index 6166789fc..14ca4729c 100644
      mInternalDisplayPrimaries = sysprop::getDisplayNativePrimaries();
  
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_native/0004-Some-Samsung-devices-requires-lying-colorspace.patch b/patches/platform_frameworks_native/0004-Some-Samsung-devices-requires-lying-colorspace.patch
index 2c7afcd..34b0768 100644
--- a/patches/platform_frameworks_native/0004-Some-Samsung-devices-requires-lying-colorspace.patch
+++ b/patches/platform_frameworks_native/0004-Some-Samsung-devices-requires-lying-colorspace.patch
@@ -1,7 +1,7 @@
-From c554242731125a5e6a3f7d31d4f4af9049d8c7f4 Mon Sep 17 00:00:00 2001
+From 1a0eb93d4e59e5857cd0afd3560647258955c6ed Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 12 Aug 2019 23:48:37 +0200
-Subject: [PATCH 4/5] Some Samsung devices requires lying colorspace
+Subject: [PATCH 4/8] Some Samsung devices requires lying colorspace
 
 Change-Id: I4153b8e7abc10c519565e4e4386c6388621477b2
 ---
@@ -9,10 +9,10 @@ Change-Id: I4153b8e7abc10c519565e4e4386c6388621477b2
  1 file changed, 6 insertions(+)
 
 diff --git a/opengl/libs/EGL/egl_platform_entries.cpp b/opengl/libs/EGL/egl_platform_entries.cpp
-index e996be685..57ca592a7 100644
+index a3bb6debe..bfa4a9bb2 100644
 --- a/opengl/libs/EGL/egl_platform_entries.cpp
 +++ b/opengl/libs/EGL/egl_platform_entries.cpp
-@@ -458,8 +458,14 @@ EGLBoolean eglGetConfigAttribImpl(EGLDisplay dpy, EGLConfig config,
+@@ -459,8 +459,14 @@ EGLBoolean eglGetConfigAttribImpl(EGLDisplay dpy, EGLConfig config,
  // ----------------------------------------------------------------------------
  
  // Translates EGL color spaces to Android data spaces.
@@ -28,5 +28,5 @@ index e996be685..57ca592a7 100644
      } else if (colorspace == EGL_GL_COLORSPACE_SRGB_KHR) {
          return HAL_DATASPACE_V0_SRGB;
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_native/0005-On-Samsung-we-need-to-send-a-hack-message-to-HAL-to-.patch b/patches/platform_frameworks_native/0005-On-Samsung-we-need-to-send-a-hack-message-to-HAL-to-.patch
index 144dd9d..606420f 100644
--- a/patches/platform_frameworks_native/0005-On-Samsung-we-need-to-send-a-hack-message-to-HAL-to-.patch
+++ b/patches/platform_frameworks_native/0005-On-Samsung-we-need-to-send-a-hack-message-to-HAL-to-.patch
@@ -1,7 +1,7 @@
-From fd7365352954e1ab647fca2eefeaa2707d47f7fa Mon Sep 17 00:00:00 2001
+From c1f0158346aace39261b787854e10d58e9d905fe 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 5/5] On Samsung, we need to send a hack-message to HAL to get
+Subject: [PATCH 5/8] On Samsung, we need to send a hack-message to HAL to get
  all Sensors
 
 Change-Id: Id6a1fa48340de61c418493668e9abd22c2599376
@@ -33,5 +33,5 @@ index 717f31769..45d6c679b 100644
              [&](const auto &list) {
                  const size_t count = list.size();
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_native/0006-SurfaceFlinger-retain-the-sideband-layer-information.patch b/patches/platform_frameworks_native/0006-SurfaceFlinger-retain-the-sideband-layer-information.patch
index c141359..10ab3ca 100644
--- a/patches/platform_frameworks_native/0006-SurfaceFlinger-retain-the-sideband-layer-information.patch
+++ b/patches/platform_frameworks_native/0006-SurfaceFlinger-retain-the-sideband-layer-information.patch
@@ -1,7 +1,7 @@
-From 723d8f84e0376b97840fa5e287a994823f6f5be4 Mon Sep 17 00:00:00 2001
+From a92fa788759b5b4550bf4d2778077af78dbc3af7 Mon Sep 17 00:00:00 2001
 From: Pierre Couillaud <pierre.couillaud@broadcom.com>
 Date: Tue, 27 Aug 2019 13:43:22 -0700
-Subject: [PATCH 6/6] SurfaceFlinger: retain the sideband layer information for
+Subject: [PATCH 6/8] SurfaceFlinger: retain the sideband layer information for
  composition
 
 when present, the sideband layer stream information is not saved into
@@ -72,7 +72,7 @@ Signed-off-by: Pierre Couillaud <pierre.couillaud@broadcom.com>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/services/surfaceflinger/BufferQueueLayer.cpp b/services/surfaceflinger/BufferQueueLayer.cpp
-index f35a4fd49..cbb9d658e 100644
+index eb1bf66cd..af5fe6246 100644
 --- a/services/surfaceflinger/BufferQueueLayer.cpp
 +++ b/services/surfaceflinger/BufferQueueLayer.cpp
 @@ -243,8 +243,9 @@ bool BufferQueueLayer::latchSidebandStream(bool& recomputeVisibleRegions) {
@@ -87,5 +87,5 @@ index f35a4fd49..cbb9d658e 100644
              setTransactionFlags(eTransactionNeeded);
              mFlinger->setTransactionFlags(eTraversalNeeded);
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_native/0007-Use-BKK-s-hwcomposer-hacks-to-properly-display-FOD-l.patch b/patches/platform_frameworks_native/0007-Use-BKK-s-hwcomposer-hacks-to-properly-display-FOD-l.patch
index b55ab0b..0cd8fe7 100644
--- a/patches/platform_frameworks_native/0007-Use-BKK-s-hwcomposer-hacks-to-properly-display-FOD-l.patch
+++ b/patches/platform_frameworks_native/0007-Use-BKK-s-hwcomposer-hacks-to-properly-display-FOD-l.patch
@@ -1,7 +1,7 @@
-From c982ade7da4d434e0a779b003e6bfcc6141232b6 Mon Sep 17 00:00:00 2001
+From 46a9476a66d10d574724ee37aa87c80cf90d1cdc Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 10 Mar 2020 23:26:55 +0100
-Subject: [PATCH 7/7] Use BKK's hwcomposer hacks to properly display FOD layers
+Subject: [PATCH 7/8] Use BKK's hwcomposer hacks to properly display FOD layers
 
 Insecure hack: Set FOD layers to magical Z values to trigger
 OPPO/Realme/Oneplus' whole blitter behaviours:
@@ -36,5 +36,5 @@ index 5ce72b087..23b29d6fd 100644
                    to_string(error).c_str(), static_cast<int32_t>(error));
          }
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_native/0008-Samsung-Xiaomi-new-FOD-HBM-controls.patch b/patches/platform_frameworks_native/0008-Samsung-Xiaomi-new-FOD-HBM-controls.patch
index 624d2b3..b72cf73 100644
--- a/patches/platform_frameworks_native/0008-Samsung-Xiaomi-new-FOD-HBM-controls.patch
+++ b/patches/platform_frameworks_native/0008-Samsung-Xiaomi-new-FOD-HBM-controls.patch
@@ -1,4 +1,4 @@
-From 8502ea88bf1ac84ceaa6495c6831a55c733212ad Mon Sep 17 00:00:00 2001
+From 3da16d65f8c84a4d4d29ad2ea351d9cb48fe3110 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 20 May 2020 21:16:56 +0200
 Subject: [PATCH 8/8] Samsung + Xiaomi new FOD HBM controls
@@ -121,5 +121,5 @@ index 23b29d6fd..0d7c9897a 100644
  
          if (auto error = hwcLayer->setZOrder(z); error != HWC2::Error::None) {
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_opt_net_wifi/0001-Revert-SupplicantManager-Remove-ensure_config_file_e.patch b/patches/platform_frameworks_opt_net_wifi/0001-Revert-SupplicantManager-Remove-ensure_config_file_e.patch
index e1dd13e..21470d8 100644
--- a/patches/platform_frameworks_opt_net_wifi/0001-Revert-SupplicantManager-Remove-ensure_config_file_e.patch
+++ b/patches/platform_frameworks_opt_net_wifi/0001-Revert-SupplicantManager-Remove-ensure_config_file_e.patch
@@ -1,4 +1,4 @@
-From d5a9fce16e57c2dfbc090190b0ed99f833f9842b Mon Sep 17 00:00:00 2001
+From dd8b2df79e6974c043adbd1ae734e4911fd3f314 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 14 Aug 2018 16:59:12 +0200
 Subject: [PATCH 1/4] Revert "SupplicantManager: Remove
@@ -126,5 +126,5 @@ index 60720d40f..f22eea92e 100644
     * Get a reference to the status property, so we can distinguish
     * the case where it goes stopped => running => stopped (i.e.,
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_opt_net_wifi/0002-Support-hostap-on-O-O-MR1-vendors.patch b/patches/platform_frameworks_opt_net_wifi/0002-Support-hostap-on-O-O-MR1-vendors.patch
index 6eeb4da..d5a1563 100644
--- a/patches/platform_frameworks_opt_net_wifi/0002-Support-hostap-on-O-O-MR1-vendors.patch
+++ b/patches/platform_frameworks_opt_net_wifi/0002-Support-hostap-on-O-O-MR1-vendors.patch
@@ -1,4 +1,4 @@
-From 5e4a56c542339de718992bdfeeb0a72ec5cd4d98 Mon Sep 17 00:00:00 2001
+From 70f91e88839fa8ce754f341620d9abc6070fbc56 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <pierre-hugues.husson@softathome.com>
 Date: Tue, 18 Sep 2018 17:05:07 +0200
 Subject: [PATCH 2/4] Support hostap on O/O-MR1 vendors
@@ -16,10 +16,10 @@ support it. force stop/start for every reconfiguration
  2 files changed, 34 insertions(+), 3 deletions(-)
 
 diff --git a/service/java/com/android/server/wifi/HalDeviceManager.java b/service/java/com/android/server/wifi/HalDeviceManager.java
-index bb53a6e88..612bd48b8 100644
+index e10234f68..bef3c0e9b 100644
 --- a/service/java/com/android/server/wifi/HalDeviceManager.java
 +++ b/service/java/com/android/server/wifi/HalDeviceManager.java
-@@ -63,8 +63,8 @@ import java.util.Set;
+@@ -64,8 +64,8 @@ import java.util.Set;
   */
  public class HalDeviceManager {
      private static final String TAG = "HalDevMgr";
@@ -30,7 +30,7 @@ index bb53a6e88..612bd48b8 100644
  
      private static final int START_HAL_RETRY_INTERVAL_MS = 20;
      // Number of attempts a start() is re-tried. A value of 0 means no retries after a single
-@@ -226,6 +226,16 @@ public class HalDeviceManager {
+@@ -233,6 +233,16 @@ public class HalDeviceManager {
       */
      public IWifiStaIface createStaIface(boolean lowPrioritySta,
              @Nullable InterfaceDestroyedListener destroyedListener, @Nullable Handler handler) {
@@ -47,7 +47,7 @@ index bb53a6e88..612bd48b8 100644
          return (IWifiStaIface) createIface(IfaceType.STA, lowPrioritySta, destroyedListener,
                  handler);
      }
-@@ -235,6 +245,14 @@ public class HalDeviceManager {
+@@ -242,6 +252,14 @@ public class HalDeviceManager {
       */
      public IWifiApIface createApIface(@Nullable InterfaceDestroyedListener destroyedListener,
              @Nullable Handler handler) {
@@ -90,5 +90,5 @@ index 3e5dc3c79..63907e67c 100644
                  Log.i(TAG, "Vendor Hal not supported, ignoring createApIface.");
                  return handleIfaceCreationWhenVendorHalNotSupported(iface);
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_opt_net_wifi/0003-Restore-O-O-MR1-behaviour-of-initing-ifaces-before-s.patch b/patches/platform_frameworks_opt_net_wifi/0003-Restore-O-O-MR1-behaviour-of-initing-ifaces-before-s.patch
index 31118fd..ac53ce3 100644
--- a/patches/platform_frameworks_opt_net_wifi/0003-Restore-O-O-MR1-behaviour-of-initing-ifaces-before-s.patch
+++ b/patches/platform_frameworks_opt_net_wifi/0003-Restore-O-O-MR1-behaviour-of-initing-ifaces-before-s.patch
@@ -1,4 +1,4 @@
-From e9e35f0091a58a51c21aaa46e52764578c85a5b4 Mon Sep 17 00:00:00 2001
+From 7b33cbe0f334d93768b59fdc920a0ced4b9db11c Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 16 Sep 2019 17:42:37 +0200
 Subject: [PATCH 3/4] Restore O/O-MR1 behaviour of initing ifaces before supp.
@@ -11,10 +11,10 @@ Change-Id: I7a94b3c4a3fca140a50962e6787af3a7aa2c7d61
  2 files changed, 16 insertions(+), 4 deletions(-)
 
 diff --git a/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java b/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java
-index bed66d926..fda64e977 100644
+index 8db7c90ee..fa82cca20 100644
 --- a/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java
 +++ b/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java
-@@ -717,7 +717,7 @@ public class SupplicantStaIfaceHal {
+@@ -741,7 +741,7 @@ public class SupplicantStaIfaceHal {
       * the device.
       * @return true if supported, false otherwise.
       */
@@ -23,7 +23,7 @@ index bed66d926..fda64e977 100644
          return checkHalVersionByInterfaceName(
                  android.hardware.wifi.supplicant.V1_1.ISupplicant.kInterfaceName);
      }
-@@ -727,7 +727,7 @@ public class SupplicantStaIfaceHal {
+@@ -751,7 +751,7 @@ public class SupplicantStaIfaceHal {
       * the device.
       * @return true if supported, false otherwise.
       */
@@ -90,5 +90,5 @@ index 63907e67c..917494a10 100644
                  Log.e(TAG, "Failed to setup iface in supplicant on " + iface);
                  teardownInterface(iface.name);
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_opt_net_wifi/0004-Boot-wifi-supplicant-both-with-lazy-hal-style-and-in.patch b/patches/platform_frameworks_opt_net_wifi/0004-Boot-wifi-supplicant-both-with-lazy-hal-style-and-in.patch
index 54049af..1b0b1ab 100644
--- a/patches/platform_frameworks_opt_net_wifi/0004-Boot-wifi-supplicant-both-with-lazy-hal-style-and-in.patch
+++ b/patches/platform_frameworks_opt_net_wifi/0004-Boot-wifi-supplicant-both-with-lazy-hal-style-and-in.patch
@@ -1,4 +1,4 @@
-From 77792728f07c8a1f9dbd9c2e2532138b2e06d8e3 Mon Sep 17 00:00:00 2001
+From adc0ad0aba52ef118afd66941963a051c576291c Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 16 Sep 2019 22:47:37 +0200
 Subject: [PATCH 4/4] Boot wifi supplicant both with lazy-hal style and init
@@ -10,10 +10,10 @@ Change-Id: I7e23348d4d16d3787f2c80bce3f8d0178dd5c4c7
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java b/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java
-index fda64e977..2b98557e9 100644
+index fa82cca20..c3064e130 100644
 --- a/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java
 +++ b/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java
-@@ -616,12 +616,12 @@ public class SupplicantStaIfaceHal {
+@@ -622,12 +622,12 @@ public class SupplicantStaIfaceHal {
       */
      public boolean startDaemon() {
          synchronized (mLock) {
@@ -29,5 +29,5 @@ index fda64e977..2b98557e9 100644
              }
          }
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_opt_telephony/0001-Add-route-to-gateway-on-null-netmask.patch b/patches/platform_frameworks_opt_telephony/0001-Add-route-to-gateway-on-null-netmask.patch
index 7a8ecae..86eb03a 100644
--- a/patches/platform_frameworks_opt_telephony/0001-Add-route-to-gateway-on-null-netmask.patch
+++ b/patches/platform_frameworks_opt_telephony/0001-Add-route-to-gateway-on-null-netmask.patch
@@ -1,7 +1,7 @@
-From 23e23d28af5ef1029c223fb617f19cc6b3a3ce08 Mon Sep 17 00:00:00 2001
+From c5db8caaf7f1391446cd50741d37ebbda9290694 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 16 Aug 2018 22:12:46 +0200
-Subject: [PATCH] Add route to gateway on null netmask
+Subject: [PATCH 1/9] Add route to gateway on null netmask
 
 Galaxy S9 returns empty prefix
 
@@ -11,7 +11,7 @@ Change-Id: I8133da8e8f5203666684100009ba658528a02e94
  1 file changed, 17 insertions(+)
 
 diff --git a/src/java/com/android/internal/telephony/dataconnection/DataConnection.java b/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
-index 1202ce875..dcb72d4d7 100644
+index 4d002846b..eb348e458 100644
 --- a/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
 +++ b/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
 @@ -25,6 +25,7 @@ import android.app.PendingIntent;
@@ -22,7 +22,7 @@ index 1202ce875..dcb72d4d7 100644
  import android.net.LinkAddress;
  import android.net.LinkProperties;
  import android.net.NetworkCapabilities;
-@@ -1403,6 +1404,22 @@ public class DataConnection extends StateMachine {
+@@ -1436,6 +1437,22 @@ public class DataConnection extends StateMachine {
                  }
  
                  for (InetAddress gateway : response.getGatewayAddresses()) {
@@ -46,5 +46,5 @@ index 1202ce875..dcb72d4d7 100644
                      // this indicates a point-to-point interface.
                      linkProperties.addRoute(new RouteInfo(gateway));
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_opt_telephony/0002-Telephony-Don-not-call-onUssdRelease-for-Huawei-RIL.patch b/patches/platform_frameworks_opt_telephony/0002-Telephony-Don-not-call-onUssdRelease-for-Huawei-RIL.patch
index 6a29087..2918b53 100644
--- a/patches/platform_frameworks_opt_telephony/0002-Telephony-Don-not-call-onUssdRelease-for-Huawei-RIL.patch
+++ b/patches/platform_frameworks_opt_telephony/0002-Telephony-Don-not-call-onUssdRelease-for-Huawei-RIL.patch
@@ -1,7 +1,7 @@
-From e66ddf44169f3dda57d01a9dd5aded920bdc80a9 Mon Sep 17 00:00:00 2001
+From 684919b3920b160ad7ef1d914b2b633580199e41 Mon Sep 17 00:00:00 2001
 From: Artem Borisov <dedsa2002@gmail.com>
 Date: Sat, 10 Nov 2018 17:19:17 +0000
-Subject: [PATCH 2/6] Telephony: Don not call onUssdRelease for Huawei RIL
+Subject: [PATCH 2/9] Telephony: Don not call onUssdRelease for Huawei RIL
 
 Huawei RIL doesn't seem to work properly with USSD_MODE_NW_RELEASE,
 always releasing USSD when it should be finished instead.
@@ -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 6e539f0ae..14a322747 100644
+index 06040d623..c5bb20631 100644
 --- a/src/java/com/android/internal/telephony/GsmCdmaPhone.java
 +++ b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
-@@ -2313,7 +2313,11 @@ public class GsmCdmaPhone extends Phone {
+@@ -2312,7 +2312,11 @@ public class GsmCdmaPhone extends Phone {
              // Complete pending USSD
  
              if (isUssdRelease) {
@@ -30,5 +30,5 @@ index 6e539f0ae..14a322747 100644
                  found.onUssdFinishedError();
              } else {
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_opt_telephony/0003-Make-MAX_CONNECTIONS_GSM-settable-from-property.patch b/patches/platform_frameworks_opt_telephony/0003-Make-MAX_CONNECTIONS_GSM-settable-from-property.patch
index faade13..0b9eaf4 100644
--- a/patches/platform_frameworks_opt_telephony/0003-Make-MAX_CONNECTIONS_GSM-settable-from-property.patch
+++ b/patches/platform_frameworks_opt_telephony/0003-Make-MAX_CONNECTIONS_GSM-settable-from-property.patch
@@ -1,7 +1,7 @@
-From e67dac2c25d6a64230a866566fbc2636b2f73bc6 Mon Sep 17 00:00:00 2001
+From 46bfcfb8cbe739e109060d3dfbbe469471b15f95 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 28 Dec 2018 13:06:32 +0100
-Subject: [PATCH 3/6] Make MAX_CONNECTIONS_GSM settable from property
+Subject: [PATCH 3/9] Make MAX_CONNECTIONS_GSM settable from property
 
 cf https://github.com/phhusson/treble_experimentations/issues/110
 
@@ -24,5 +24,5 @@ index 0a7acee57..aca129308 100755
  
      private static final int MAX_CONNECTIONS_CDMA = 8;
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_opt_telephony/0004-Choose-a-more-generic-prop.patch b/patches/platform_frameworks_opt_telephony/0004-Choose-a-more-generic-prop.patch
index 237843f..7835484 100644
--- a/patches/platform_frameworks_opt_telephony/0004-Choose-a-more-generic-prop.patch
+++ b/patches/platform_frameworks_opt_telephony/0004-Choose-a-more-generic-prop.patch
@@ -1,7 +1,7 @@
-From 21952419962b9a642a5312e8258039bbbb5f893b Mon Sep 17 00:00:00 2001
+From a038af3e1d22635a8b8832e4bd759a4d1aff9971 Mon Sep 17 00:00:00 2001
 From: Dil3mm4 <dil3mm4.dev@gmail.com>
 Date: Sat, 17 Nov 2018 18:18:42 +0000
-Subject: [PATCH 4/6] Choose a more generic prop.
+Subject: [PATCH 4/9] Choose a more generic prop.
 
 Since USSD it's a problem over MTK too and not only on Kirin, let's be more generic.
 
@@ -11,10 +11,10 @@ Change-Id: Icf1700f55be40915f9c64059019287f300d81405
  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 14a322747..8359a3858 100644
+index c5bb20631..bd408e1c7 100644
 --- a/src/java/com/android/internal/telephony/GsmCdmaPhone.java
 +++ b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
-@@ -2313,7 +2313,7 @@ public class GsmCdmaPhone extends Phone {
+@@ -2312,7 +2312,7 @@ public class GsmCdmaPhone extends Phone {
              // Complete pending USSD
  
              if (isUssdRelease) {
@@ -24,5 +24,5 @@ index 14a322747..8359a3858 100644
                  } else {
                      found.onUssdRelease();
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_opt_telephony/0005-Reverse-engineer-MTK-IRadio-interfaces-to-approve-in.patch b/patches/platform_frameworks_opt_telephony/0005-Reverse-engineer-MTK-IRadio-interfaces-to-approve-in.patch
index 1db59d5..ad996c0 100644
--- a/patches/platform_frameworks_opt_telephony/0005-Reverse-engineer-MTK-IRadio-interfaces-to-approve-in.patch
+++ b/patches/platform_frameworks_opt_telephony/0005-Reverse-engineer-MTK-IRadio-interfaces-to-approve-in.patch
@@ -1,8 +1,8 @@
-From acb8e3866e2c08c13fa3a111be911eee65c1cdbf Mon Sep 17 00:00:00 2001
+From 7c40af0f45eb36d4dfc46c2d3b5acfa40bd61f2b Mon Sep 17 00:00:00 2001
 From: Bevis Tseng <bevis@cloudmosa.com>
 Date: Thu, 18 Apr 2019 16:30:45 +0800
-Subject: [PATCH] Reverse-engineer MTK IRadio interfaces to approve incoming
- call for MTK devices from Telephony F/W.
+Subject: [PATCH 5/9] Reverse-engineer MTK IRadio interfaces to approve
+ incoming call for MTK devices from Telephony F/W.
 
 This is an alternative solution of 's/AT+EAIC=2/AT+EAIC=3/g' in device/phh/treble/rw-system.sh
 which is not workable on some MTK devices such as Nokia 1.
@@ -1526,10 +1526,10 @@ index 000000000..2548e967e
 +    //-- MTK Radio V2_0
 +}
 diff --git a/src/java/com/android/internal/telephony/RIL.java b/src/java/com/android/internal/telephony/RIL.java
-index 4e74cceee..c0c6db742 100644
+index 83398b62c..96f1efdd7 100644
 --- a/src/java/com/android/internal/telephony/RIL.java
 +++ b/src/java/com/android/internal/telephony/RIL.java
-@@ -237,6 +237,9 @@ public class RIL extends BaseCommands implements CommandsInterface {
+@@ -245,6 +245,9 @@ public class RIL extends BaseCommands implements CommandsInterface {
      final AtomicLong mRadioProxyCookie = new AtomicLong(0);
      final RadioProxyDeathRecipient mRadioProxyDeathRecipient;
      final RilHandler mRilHandler;
@@ -1539,7 +1539,7 @@ index 4e74cceee..c0c6db742 100644
  
      //***** Events
      static final int EVENT_WAKE_LOCK_TIMEOUT    = 2;
-@@ -494,6 +497,22 @@ public class RIL extends BaseCommands implements CommandsInterface {
+@@ -502,6 +505,22 @@ public class RIL extends BaseCommands implements CommandsInterface {
              }
          }
  
@@ -1562,7 +1562,7 @@ index 4e74cceee..c0c6db742 100644
          return mRadioProxy;
      }
  
-@@ -6060,4 +6079,23 @@ public class RIL extends BaseCommands implements CommandsInterface {
+@@ -6157,4 +6176,23 @@ public class RIL extends BaseCommands implements CommandsInterface {
      public boolean needsOldRilFeature(String feature) {
          return mOldRilFeatures.contains(feature);
      }
@@ -1587,7 +1587,7 @@ index 4e74cceee..c0c6db742 100644
 +    }
  }
 diff --git a/src/java/com/android/internal/telephony/RadioResponse.java b/src/java/com/android/internal/telephony/RadioResponse.java
-index a36b7a6fc..a52702f36 100644
+index 97fe3dc13..509cb8336 100644
 --- a/src/java/com/android/internal/telephony/RadioResponse.java
 +++ b/src/java/com/android/internal/telephony/RadioResponse.java
 @@ -1809,7 +1809,7 @@ public class RadioResponse extends IRadioResponse.Stub {
@@ -1600,5 +1600,5 @@ index a36b7a6fc..a52702f36 100644
  
          if (rr != null) {
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_opt_telephony/0006-Plugin-Samsung-RadioIndication-RadioResponse-to-get-.patch b/patches/platform_frameworks_opt_telephony/0006-Plugin-Samsung-RadioIndication-RadioResponse-to-get-.patch
index 46ba330..83a9d70 100644
--- a/patches/platform_frameworks_opt_telephony/0006-Plugin-Samsung-RadioIndication-RadioResponse-to-get-.patch
+++ b/patches/platform_frameworks_opt_telephony/0006-Plugin-Samsung-RadioIndication-RadioResponse-to-get-.patch
@@ -1,7 +1,7 @@
-From d11dbfd4177f8e6e13965faf20de758d88265057 Mon Sep 17 00:00:00 2001
+From 17f79dbb2628b9c58048a5d19b0bf02af7287de7 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 12 Aug 2019 23:49:56 +0200
-Subject: [PATCH 6/6] Plugin Samsung RadioIndication/RadioResponse to get
+Subject: [PATCH 6/9] Plugin Samsung RadioIndication/RadioResponse to get
  signal strength
 
 Change-Id: Ic3d5801627bf3dd72d2e7b6bb3741b9d368d1f07
@@ -27,10 +27,10 @@ index ae678cb54..bb9925beb 100644
          "ims-common",
          "services",
 diff --git a/src/java/com/android/internal/telephony/RIL.java b/src/java/com/android/internal/telephony/RIL.java
-index 47cb9f240..586dd063a 100644
+index 96f1efdd7..4b94ca5d4 100644
 --- a/src/java/com/android/internal/telephony/RIL.java
 +++ b/src/java/com/android/internal/telephony/RIL.java
-@@ -239,6 +239,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
+@@ -248,6 +248,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
      vendor.mediatek.hardware.radio.V2_0.IRadioResponse mMtkRadioResponse;
      vendor.mediatek.hardware.radio.V2_0.IRadioIndication mMtkRadioIndication;
      volatile vendor.mediatek.hardware.radio.V2_0.IRadio mMtkRadioProxy = null;
@@ -38,7 +38,7 @@ index 47cb9f240..586dd063a 100644
  
      //***** Events
      static final int EVENT_WAKE_LOCK_TIMEOUT    = 2;
-@@ -423,6 +424,26 @@ public class RIL extends BaseCommands implements CommandsInterface {
+@@ -432,6 +433,26 @@ public class RIL extends BaseCommands implements CommandsInterface {
              return mRadioProxy;
          }
  
@@ -65,7 +65,7 @@ index 47cb9f240..586dd063a 100644
          try {
              if (mDisabledRadioServices.contains(mPhoneId)) {
                  riljLoge("getRadioProxy: mRadioProxy for " + HIDL_SERVICE_NAME[mPhoneId]
-@@ -499,8 +520,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
+@@ -508,8 +529,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
          if (mRadioProxy != null) {
              try {
                  mMtkRadioProxy =
@@ -75,7 +75,7 @@ index 47cb9f240..586dd063a 100644
                  if (mMtkRadioProxy != null) {
                      if (mMtkRadioResponse == null && mMtkRadioIndication == null) {
                          mMtkRadioResponse = new MtkRadioResponse(this, mRadioResponse);
-@@ -511,6 +531,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
+@@ -520,6 +540,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
              } catch (RemoteException | RuntimeException e) {
                  riljLog("MTK RadioProxy is not available");
              }
@@ -1083,5 +1083,5 @@ index 000000000..63e680afb
 +    public void oemSelectCsgManualResponse(RadioResponseInfo info) {}
 +}
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_opt_telephony/0007-telephony-forward-port-support-for-forceCognitive.patch b/patches/platform_frameworks_opt_telephony/0007-telephony-forward-port-support-for-forceCognitive.patch
index e040b9f..d033e3f 100644
--- a/patches/platform_frameworks_opt_telephony/0007-telephony-forward-port-support-for-forceCognitive.patch
+++ b/patches/platform_frameworks_opt_telephony/0007-telephony-forward-port-support-for-forceCognitive.patch
@@ -1,7 +1,7 @@
-From 5c9753b0fe01bf6b5b025a3c2ad9405e92341fc4 Mon Sep 17 00:00:00 2001
+From d46c6ad5d946efad0ba6c675c027efce6f917632 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 13 Oct 2019 17:21:31 +0800
-Subject: [PATCH 7/7] telephony: forward-port support for forceCognitive
+Subject: [PATCH 7/9] telephony: forward-port support for forceCognitive
 
 * This is needed on some MTK devices. Android 10 refactored some code,
   so now the "non-persistent/cognitive" filter is relocated to RIL and
@@ -12,10 +12,10 @@ Subject: [PATCH 7/7] telephony: forward-port support for forceCognitive
  2 files changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/src/java/com/android/internal/telephony/RIL.java b/src/java/com/android/internal/telephony/RIL.java
-index 586dd063a..cc8997ccc 100644
+index 4b94ca5d4..39c5a2a33 100644
 --- a/src/java/com/android/internal/telephony/RIL.java
 +++ b/src/java/com/android/internal/telephony/RIL.java
-@@ -3963,7 +3963,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
+@@ -3991,7 +3991,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
                      for (DataProfile dp : dps) {
                          // For v1.0 to v1.2, we only send data profiles that has the persistent
                          // (a.k.a modem cognitive) bit set to true.
@@ -26,10 +26,10 @@ index 586dd063a..cc8997ccc 100644
                          }
                      }
 diff --git a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
-index 7a4bfd8d3..f5c54cc40 100644
+index 43966a918..83e9ab7ce 100644
 --- a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
 +++ b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
-@@ -1890,8 +1890,9 @@ public class DcTracker extends Handler {
+@@ -2001,8 +2001,9 @@ public class DcTracker extends Handler {
          }
  
          // profile id is only meaningful when the profile is persistent on the modem.
@@ -41,5 +41,5 @@ index 7a4bfd8d3..f5c54cc40 100644
              if (profileId == DATA_PROFILE_DEFAULT) {
                  profileId = getApnProfileID(apnContext.getApnType());
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_opt_telephony/0008-Hack-Catch-spurious-getModemStatus-calls-when-enabli.patch b/patches/platform_frameworks_opt_telephony/0008-Catch-spurious-getModemStatus-calls-when-enabling-CA.patch
similarity index 75%
rename from patches/platform_frameworks_opt_telephony/0008-Hack-Catch-spurious-getModemStatus-calls-when-enabli.patch
rename to patches/platform_frameworks_opt_telephony/0008-Catch-spurious-getModemStatus-calls-when-enabling-CA.patch
index f6e01bf..852ed90 100644
--- a/patches/platform_frameworks_opt_telephony/0008-Hack-Catch-spurious-getModemStatus-calls-when-enabli.patch
+++ b/patches/platform_frameworks_opt_telephony/0008-Catch-spurious-getModemStatus-calls-when-enabling-CA.patch
@@ -1,18 +1,17 @@
-From 00bec8866bd675f39181051fb1e5c21d0a9d6de0 Mon Sep 17 00:00:00 2001
+From a1752a0efd21d9c6a1bd373bd1773db4696f8f4a Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 3 Feb 2020 23:35:23 +0100
-Subject: [PATCH 8/8] [Hack] Catch spurious getModemStatus calls when enabling
- CAF IMS
+Subject: [PATCH 8/9] Catch spurious getModemStatus calls when enabling CAF IMS
 
 ---
  src/java/com/android/internal/telephony/RIL.java | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/src/java/com/android/internal/telephony/RIL.java b/src/java/com/android/internal/telephony/RIL.java
-index 2fff03029..32ddd4e07 100644
+index 39c5a2a33..30d5fed86 100644
 --- a/src/java/com/android/internal/telephony/RIL.java
 +++ b/src/java/com/android/internal/telephony/RIL.java
-@@ -988,7 +988,11 @@ public class RIL extends BaseCommands implements CommandsInterface {
+@@ -1002,7 +1002,11 @@ public class RIL extends BaseCommands implements CommandsInterface {
              if (result != null) {
                  AsyncResult.forMessage(result, null,
                          CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
@@ -26,5 +25,5 @@ index 2fff03029..32ddd4e07 100644
              return;
          }
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_frameworks_opt_telephony/0009-HACK-Never-blacklist-RILs.-It-might-get-blacklisted-.patch b/patches/platform_frameworks_opt_telephony/0009-Never-blacklist-RILs.-It-might-get-blacklisted-for-b.patch
similarity index 77%
rename from patches/platform_frameworks_opt_telephony/0009-HACK-Never-blacklist-RILs.-It-might-get-blacklisted-.patch
rename to patches/platform_frameworks_opt_telephony/0009-Never-blacklist-RILs.-It-might-get-blacklisted-for-b.patch
index 9283429..dd4413b 100644
--- a/patches/platform_frameworks_opt_telephony/0009-HACK-Never-blacklist-RILs.-It-might-get-blacklisted-.patch
+++ b/patches/platform_frameworks_opt_telephony/0009-Never-blacklist-RILs.-It-might-get-blacklisted-for-b.patch
@@ -1,18 +1,18 @@
-From 064f8936cd6d5e6d9a44a72bbc8600d092135e2c Mon Sep 17 00:00:00 2001
+From 03dffbcc585e632105ee0e0e34f8719f0331d33c Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 2 Mar 2020 21:11:25 +0100
-Subject: [PATCH 9/9] [HACK] Never blacklist RILs. It might get blacklisted for
- bad reasons
+Subject: [PATCH 9/9] Never blacklist RILs. It might get blacklisted for bad
+ reasons
 
 ---
  src/java/com/android/internal/telephony/RIL.java | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/java/com/android/internal/telephony/RIL.java b/src/java/com/android/internal/telephony/RIL.java
-index 32ddd4e07..7565798f7 100644
+index 30d5fed86..eb4d07700 100644
 --- a/src/java/com/android/internal/telephony/RIL.java
 +++ b/src/java/com/android/internal/telephony/RIL.java
-@@ -504,7 +504,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
+@@ -506,7 +506,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
                              mRadioProxyCookie.incrementAndGet());
                      mRadioProxy.setResponseFunctions(mRadioResponse, mRadioIndication);
                  } else {
@@ -22,5 +22,5 @@ index 32ddd4e07..7565798f7 100644
                              + HIDL_SERVICE_NAME[mPhoneId] + " is disabled");
                  }
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_packages_apps_Settings/0001-Act-as-usb-device-when-there-is-no-hal-but-we-believ.patch b/patches/platform_packages_apps_Settings/0001-Act-as-usb-device-when-there-is-no-hal-but-we-believ.patch
index d19b27d..b79b6bb 100644
--- a/patches/platform_packages_apps_Settings/0001-Act-as-usb-device-when-there-is-no-hal-but-we-believ.patch
+++ b/patches/platform_packages_apps_Settings/0001-Act-as-usb-device-when-there-is-no-hal-but-we-believ.patch
@@ -1,8 +1,8 @@
-From b009ff6561e52e151adfc4aaa5b0b4a56a66cac3 Mon Sep 17 00:00:00 2001
+From 5758b566cb2a2dd7a80fa7ea175742f8bf0e85ae 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] Act as usb device when there is no hal, but we believe we are
- a device
+Subject: [PATCH 1/2] Act as usb device when there is no hal, but we believe we
+ are a device
 
 Change-Id: I036090738525fd8cc63534d52d02ab1852950a7d
 ---
@@ -29,5 +29,5 @@ index 695a714528..1f2b751991 100644
          } else if (UsbManager.ACTION_USB_PORT_CHANGED.equals(intent.getAction())) {
              UsbPortStatus portStatus = intent.getExtras()
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_packages_apps_Settings/0002-Fix-operatorNumeric-parsing-in-CellInfoUtil-support-.patch b/patches/platform_packages_apps_Settings/0002-Fix-operatorNumeric-parsing-in-CellInfoUtil-support-.patch
index 77f8506..abef116 100644
--- a/patches/platform_packages_apps_Settings/0002-Fix-operatorNumeric-parsing-in-CellInfoUtil-support-.patch
+++ b/patches/platform_packages_apps_Settings/0002-Fix-operatorNumeric-parsing-in-CellInfoUtil-support-.patch
@@ -1,4 +1,4 @@
-From 03cfb2b7b10a4ff6040521bb974de6f1566ce0a0 Mon Sep 17 00:00:00 2001
+From d2ecd26ae5bc5d597bf688af1e3a5b2f96b06c05 Mon Sep 17 00:00:00 2001
 From: Michael Cheah <michael@cheah.xyz>
 Date: Sat, 11 Jan 2020 13:19:04 +0800
 Subject: [PATCH 2/2] Fix operatorNumeric parsing in CellInfoUtil & support old
@@ -70,5 +70,5 @@ index def81a10c6..6e6586a4cb 100644
          CellIdentityGsm cig = new CellIdentityGsm(
                  Integer.MAX_VALUE /* lac */,
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_packages_services_Telephony/0001-Telephony-Support-muting-by-RIL-command.patch b/patches/platform_packages_services_Telephony/0001-Telephony-Support-muting-by-RIL-command.patch
index 7778f43..9592b2f 100644
--- a/patches/platform_packages_services_Telephony/0001-Telephony-Support-muting-by-RIL-command.patch
+++ b/patches/platform_packages_services_Telephony/0001-Telephony-Support-muting-by-RIL-command.patch
@@ -1,7 +1,7 @@
-From 1dd0b7fde40e2e451126dcdea035ee8f0f662c8f Mon Sep 17 00:00:00 2001
+From 78dfa19452607ad716db496f035a2a181e780d1c Mon Sep 17 00:00:00 2001
 From: Artem Borisov <dedsa2002@gmail.com>
 Date: Wed, 19 Sep 2018 17:02:06 +0300
-Subject: [PATCH] Telephony: Support muting by RIL command
+Subject: [PATCH 1/4] Telephony: Support muting by RIL command
 
 While almost everyone already moved to AudioManager years ago,
 some OEMs (cough Huawei) still use RIL for muting and don't
@@ -14,7 +14,7 @@ Change-Id: Id916dec2574d6e57b6f809fbaf2b0959c0cc7256
  1 file changed, 4 insertions(+)
 
 diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
-index 06dce1626..be4b2c31c 100644
+index 05c3f211f..189f86ec7 100644
 --- a/src/com/android/services/telephony/TelephonyConnection.java
 +++ b/src/com/android/services/telephony/TelephonyConnection.java
 @@ -25,6 +25,7 @@ import android.os.Handler;
@@ -36,5 +36,5 @@ index 06dce1626..be4b2c31c 100644
      }
  
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_packages_services_Telephony/0002-Fixes-crash-when-selecting-network.patch b/patches/platform_packages_services_Telephony/0002-Fixes-crash-when-selecting-network.patch
index a4e16f3..4026646 100644
--- a/patches/platform_packages_services_Telephony/0002-Fixes-crash-when-selecting-network.patch
+++ b/patches/platform_packages_services_Telephony/0002-Fixes-crash-when-selecting-network.patch
@@ -1,7 +1,7 @@
-From 7c9e1ac4204748173e182c353f2c5b5c45ac1cdb Mon Sep 17 00:00:00 2001
+From 15786bb6066c85e689742814e4b84584b5aa2f08 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 6 May 2019 20:25:34 +0200
-Subject: [PATCH 2/3] Fixes crash when selecting network
+Subject: [PATCH 2/4] Fixes crash when selecting network
 
 Cf https://github.com/phhusson/treble_experimentations/issues/486
 ---
@@ -46,5 +46,5 @@ index e67582fa3..c622713e8 100644
              CellIdentityGsm cig = new CellIdentityGsm(
                      Integer.MAX_VALUE /* lac */,
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_packages_services_Telephony/0003-Fail-gracefully-in-mobile-settings.patch b/patches/platform_packages_services_Telephony/0003-Fail-gracefully-in-mobile-settings.patch
index 7816e29..f603565 100644
--- a/patches/platform_packages_services_Telephony/0003-Fail-gracefully-in-mobile-settings.patch
+++ b/patches/platform_packages_services_Telephony/0003-Fail-gracefully-in-mobile-settings.patch
@@ -1,7 +1,7 @@
-From 0c7e103fd7c8d50322057a1f0fe852de9df0a029 Mon Sep 17 00:00:00 2001
+From 2d584eb3bffd0868b6f0e0ec1a7b9eb26b035a0d Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 20 May 2019 23:45:56 +0200
-Subject: [PATCH 3/3] Fail gracefully in mobile settings
+Subject: [PATCH 3/4] Fail gracefully in mobile settings
 
 ---
  src/com/android/phone/DataUsagePreference.java | 8 ++++++--
@@ -27,5 +27,5 @@ index b6b26e2b8..ebd446dfa 100644
      }
  
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_packages_services_Telephony/0004-Fix-operatorNumeric-parsing-in-CellInfoUtil-support-.patch b/patches/platform_packages_services_Telephony/0004-Fix-operatorNumeric-parsing-in-CellInfoUtil-support-.patch
index cf81ca2..9cfa5fa 100644
--- a/patches/platform_packages_services_Telephony/0004-Fix-operatorNumeric-parsing-in-CellInfoUtil-support-.patch
+++ b/patches/platform_packages_services_Telephony/0004-Fix-operatorNumeric-parsing-in-CellInfoUtil-support-.patch
@@ -1,4 +1,4 @@
-From 348be3bd9a6e528232141b704af5b07eef5c2829 Mon Sep 17 00:00:00 2001
+From b842186739efd6a857049a281b2981ebbfd7fbfb Mon Sep 17 00:00:00 2001
 From: Michael Cheah <michael@cheah.xyz>
 Date: Sat, 11 Jan 2020 19:23:57 +0800
 Subject: [PATCH 4/4] Fix operatorNumeric parsing in CellInfoUtil & support old
@@ -100,5 +100,5 @@ index df3f44a8d..9fc571500 100644
      }
  
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_system_bpf/0001-Disable-rlimit-on-bpfloader-because-it-will-crash-8..patch b/patches/platform_system_bpf/0001-Disable-rlimit-on-bpfloader-because-it-will-crash-8..patch
index d8ae8af..84e2039 100644
--- a/patches/platform_system_bpf/0001-Disable-rlimit-on-bpfloader-because-it-will-crash-8..patch
+++ b/patches/platform_system_bpf/0001-Disable-rlimit-on-bpfloader-because-it-will-crash-8..patch
@@ -1,4 +1,4 @@
-From 8d85aaa52cf7deabcda97053cfc59288dd969d63 Mon Sep 17 00:00:00 2001
+From dae3effa9b22d284a757b88171ba3b1b68fbaa94 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 12 Sep 2019 20:41:03 +0200
 Subject: [PATCH] Disable rlimit on bpfloader, because it will crash 8.0 init
@@ -20,5 +20,5 @@ index 31747fb..d95cdbd 100644
 +    #rlimit memlock 67108864 67108864
      oneshot
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_system_bt/0001-Make-BTM_BYPASS_EXTRA_ACL_SETUP-dynamic.patch b/patches/platform_system_bt/0001-Make-BTM_BYPASS_EXTRA_ACL_SETUP-dynamic.patch
index 4467f59..04b97ec 100644
--- a/patches/platform_system_bt/0001-Make-BTM_BYPASS_EXTRA_ACL_SETUP-dynamic.patch
+++ b/patches/platform_system_bt/0001-Make-BTM_BYPASS_EXTRA_ACL_SETUP-dynamic.patch
@@ -1,7 +1,7 @@
-From fef557417bece64d452454b3263ce2a8d3661ff9 Mon Sep 17 00:00:00 2001
+From c193d34f95234894a464164b180ce6ecca0a7eb3 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 20 Feb 2018 23:04:50 +0100
-Subject: [PATCH 1/2] Make BTM_BYPASS_EXTRA_ACL_SETUP dynamic
+Subject: [PATCH 1/3] Make BTM_BYPASS_EXTRA_ACL_SETUP dynamic
 
 Change-Id: Icb0868566b29b053ed7e83c9fd32e225af3f2e46
 ---
@@ -26,7 +26,7 @@ index cf2c1136f..e2844db82 100644
  /******************************************************************************
   *  Constants & Macros
 diff --git a/internal_include/bt_target.h b/internal_include/bt_target.h
-index 67a67c56d..3021ca37b 100644
+index e33f0b580..83461b7f4 100644
 --- a/internal_include/bt_target.h
 +++ b/internal_include/bt_target.h
 @@ -32,6 +32,9 @@
@@ -40,10 +40,10 @@ index 67a67c56d..3021ca37b 100644
  #include "bt_types.h" /* This must be defined AFTER buildcfg.h */
  
 diff --git a/stack/btm/btm_acl.cc b/stack/btm/btm_acl.cc
-index dcb2fb4d9..5a6c3631e 100644
+index 6daf2d23c..ed07e8105 100644
 --- a/stack/btm/btm_acl.cc
 +++ b/stack/btm/btm_acl.cc
-@@ -1186,17 +1186,17 @@ void btm_read_remote_ext_features_failed(uint8_t status, uint16_t handle) {
+@@ -1208,17 +1208,17 @@ void btm_read_remote_ext_features_failed(uint8_t status, uint16_t handle) {
  void btm_establish_continue(tACL_CONN* p_acl_cb) {
    tBTM_BL_EVENT_DATA evt_data;
    BTM_TRACE_DEBUG("btm_establish_continue");
@@ -72,10 +72,10 @@ index dcb2fb4d9..5a6c3631e 100644
      BTM_TRACE_ERROR("%s: Already link is up ", __func__);
      return;
 diff --git a/stack/btm/btm_sec.cc b/stack/btm/btm_sec.cc
-index 4df0974dd..eb28b0a97 100644
+index 1ff4eeddf..60b64bd79 100644
 --- a/stack/btm/btm_sec.cc
 +++ b/stack/btm/btm_sec.cc
-@@ -4366,15 +4366,15 @@ void btm_sec_connected(const RawAddress& bda, uint16_t handle, uint8_t status,
+@@ -4369,15 +4369,15 @@ void btm_sec_connected(const RawAddress& bda, uint16_t handle, uint8_t status,
    if (p_acl_cb) {
  /* whatever is in btm_establish_continue() without reporting the BTM_BL_CONN_EVT
   * event */
@@ -101,5 +101,5 @@ index 4df0974dd..eb28b0a97 100644
    btm_acl_created(bda, p_dev_rec->dev_class, p_dev_rec->sec_bd_name, handle,
                    HCI_ROLE_SLAVE, BT_TRANSPORT_BR_EDR);
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_system_bt/0002-Add-props-to-control-supported-features-and-states-1.patch b/patches/platform_system_bt/0002-Add-props-to-control-supported-features-and-states-1.patch
index 191dadc..cd704bd 100644
--- a/patches/platform_system_bt/0002-Add-props-to-control-supported-features-and-states-1.patch
+++ b/patches/platform_system_bt/0002-Add-props-to-control-supported-features-and-states-1.patch
@@ -1,7 +1,7 @@
-From 9bc6c5d104edf78b5f795e17560ee4f8bb39a122 Mon Sep 17 00:00:00 2001
+From d8a0d677ab02422b21a8490bea5189254cc76df0 Mon Sep 17 00:00:00 2001
 From: penn5 <penn5@users.noreply.github.com>
 Date: Mon, 4 Mar 2019 22:21:07 +0000
-Subject: [PATCH 2/2] Add props to control supported features and states (#1)
+Subject: [PATCH 2/3] Add props to control supported features and states (#1)
 
 * Add bitmask for supported fields
 Use persist.sys.bt.unsupport.states, defaults to 0, left-aligned.
@@ -23,7 +23,7 @@ HCI_LE_ENCRYPTION..HCI_LE_PERIODIC_ADVERTISING
  1 file changed, 77 insertions(+)
 
 diff --git a/hci/src/hci_packet_parser.cc b/hci/src/hci_packet_parser.cc
-index b1efd444d..88dc4c6cd 100644
+index 3f4e46cb4..9e39c1596 100644
 --- a/hci/src/hci_packet_parser.cc
 +++ b/hci/src/hci_packet_parser.cc
 @@ -27,6 +27,8 @@
@@ -35,7 +35,7 @@ index b1efd444d..88dc4c6cd 100644
  static const command_opcode_t NO_OPCODE_CHECKING = 0;
  
  static const allocator_t* buffer_allocator;
-@@ -108,6 +110,31 @@ static void parse_read_local_supported_commands_response(
+@@ -122,6 +124,31 @@ static void parse_read_local_supported_commands_response(
    buffer_allocator->free(response);
  }
  
@@ -67,7 +67,7 @@ index b1efd444d..88dc4c6cd 100644
  static void parse_read_local_extended_features_response(
      BT_HDR* response, uint8_t* page_number_ptr, uint8_t* max_page_number_ptr,
      bt_device_features_t* feature_pages, size_t feature_pages_count) {
-@@ -123,6 +150,16 @@ static void parse_read_local_extended_features_response(
+@@ -137,6 +164,16 @@ static void parse_read_local_extended_features_response(
    STREAM_TO_ARRAY(feature_pages[*page_number_ptr].as_array, stream,
                    (int)sizeof(bt_device_features_t));
  
@@ -84,7 +84,7 @@ index b1efd444d..88dc4c6cd 100644
    buffer_allocator->free(response);
  }
  
-@@ -148,6 +185,19 @@ static void parse_ble_read_buffer_size_response(BT_HDR* response,
+@@ -162,6 +199,19 @@ static void parse_ble_read_buffer_size_response(BT_HDR* response,
    buffer_allocator->free(response);
  }
  
@@ -104,7 +104,7 @@ index b1efd444d..88dc4c6cd 100644
  static void parse_ble_read_supported_states_response(
      BT_HDR* response, uint8_t* supported_states, size_t supported_states_size) {
    uint8_t* stream =
-@@ -156,9 +206,30 @@ static void parse_ble_read_supported_states_response(
+@@ -170,9 +220,30 @@ static void parse_ble_read_supported_states_response(
    CHECK(stream != NULL);
    STREAM_TO_ARRAY(supported_states, stream, (int)supported_states_size);
  
@@ -135,7 +135,7 @@ index b1efd444d..88dc4c6cd 100644
  static void parse_ble_read_local_supported_features_response(
      BT_HDR* response, bt_device_features_t* supported_features) {
    uint8_t* stream = read_command_complete_header(
-@@ -168,6 +239,12 @@ static void parse_ble_read_local_supported_features_response(
+@@ -182,6 +253,12 @@ static void parse_ble_read_local_supported_features_response(
    STREAM_TO_ARRAY(supported_features->as_array, stream,
                    (int)sizeof(bt_device_features_t));
  
@@ -149,5 +149,5 @@ index b1efd444d..88dc4c6cd 100644
  }
  
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_system_bt/0003-Add-persist.sys.phh.disable_a2dp_offload-property-to.patch b/patches/platform_system_bt/0003-Add-persist.sys.phh.disable_a2dp_offload-property-to.patch
index ffa8ef8..aba1a11 100644
--- a/patches/platform_system_bt/0003-Add-persist.sys.phh.disable_a2dp_offload-property-to.patch
+++ b/patches/platform_system_bt/0003-Add-persist.sys.phh.disable_a2dp_offload-property-to.patch
@@ -1,4 +1,4 @@
-From c43fc9cdeb2a41da244279ec86473e9504f4311b Mon Sep 17 00:00:00 2001
+From 83293b39e918000818a87829ee6dc1803e953f18 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 25 May 2020 21:25:12 +0200
 Subject: [PATCH 3/3] Add persist.sys.phh.disable_a2dp_offload property to
@@ -10,7 +10,7 @@ Subject: [PATCH 3/3] Add persist.sys.phh.disable_a2dp_offload property to
  2 files changed, 12 insertions(+), 2 deletions(-)
 
 diff --git a/btif/src/btif_av.cc b/btif/src/btif_av.cc
-index 24e32ec10..fa537ba4e 100644
+index 14fabdbef..530c996d5 100644
 --- a/btif/src/btif_av.cc
 +++ b/btif/src/btif_av.cc
 @@ -959,9 +959,14 @@ bt_status_t BtifAvSource::Init(
@@ -30,10 +30,10 @@ index 24e32ec10..fa537ba4e 100644
    callbacks_ = callbacks;
    bta_av_co_init(codec_priorities);
 diff --git a/stack/a2dp/a2dp_codec_config.cc b/stack/a2dp/a2dp_codec_config.cc
-index edf7e0c46..143eed7a3 100644
+index 2480cdc66..6ddfb27fa 100644
 --- a/stack/a2dp/a2dp_codec_config.cc
 +++ b/stack/a2dp/a2dp_codec_config.cc
-@@ -560,13 +560,18 @@ bool A2dpCodecs::init() {
+@@ -564,13 +564,18 @@ bool A2dpCodecs::init() {
    char* tok = NULL;
    char* tmp_token = NULL;
    bool offload_codec_support[BTAV_A2DP_CODEC_INDEX_MAX] = {false};
@@ -54,5 +54,5 @@ index edf7e0c46..143eed7a3 100644
    if (a2dp_offload_status) {
      char value_cap[PROPERTY_VALUE_MAX];
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_system_core/0001-Revert-logd-add-passcred-for-logdw-socket.patch b/patches/platform_system_core/0001-Revert-logd-add-passcred-for-logdw-socket.patch
index cd98dc9..8dba388 100644
--- a/patches/platform_system_core/0001-Revert-logd-add-passcred-for-logdw-socket.patch
+++ b/patches/platform_system_core/0001-Revert-logd-add-passcred-for-logdw-socket.patch
@@ -1,7 +1,7 @@
-From 452c6e9529d5c66857853de368d1770b743d7678 Mon Sep 17 00:00:00 2001
+From bc50943b9d38f993e63ca44e783a0b8b836dcf7a Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 10 Dec 2017 00:26:21 +0100
-Subject: [PATCH 01/12] Revert "logd: add "+passcred" for logdw socket"
+Subject: [PATCH 01/14] Revert "logd: add "+passcred" for logdw socket"
 
 This reverts commit 54d8ff1121440d0ef4565ce0ab3751f82fdb393c.
 
@@ -49,5 +49,5 @@ index 438419ad6..5514e9456 100644
      file /dev/kmsg w
      user logd
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_system_core/0002-Some-kernel-crashes-when-using-too-recent-sdcardfs-o.patch b/patches/platform_system_core/0002-Some-kernel-crashes-when-using-too-recent-sdcardfs-o.patch
index 03ea14b..0216a60 100644
--- a/patches/platform_system_core/0002-Some-kernel-crashes-when-using-too-recent-sdcardfs-o.patch
+++ b/patches/platform_system_core/0002-Some-kernel-crashes-when-using-too-recent-sdcardfs-o.patch
@@ -1,7 +1,7 @@
-From 84efb8f43e2be2b7ab3c5a04956199b7f8683556 Mon Sep 17 00:00:00 2001
+From 67b3bc463852112c9a5bfd25e2cabf72449ec7bc 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 02/12] Some kernel crashes when using too recent sdcardfs
+Subject: [PATCH 02/14] Some kernel crashes when using too recent sdcardfs
  options. Force everyone to old options
 
 Change-Id: Ia5cf1aa8dc07a0f4a78b4d8f760ca0944dabaa89
@@ -24,5 +24,5 @@ index 2b358197a..4420ebbd2 100644
          for (int j = 0; j < new_opts_list.size() - i; ++j) {
              new_opts += new_opts_list[j];
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_system_core/0003-First-drop_privs-which-may-fail-and-only-run-thread-.patch b/patches/platform_system_core/0003-First-drop_privs-which-may-fail-and-only-run-thread-.patch
index 7bfea44..3532139 100644
--- a/patches/platform_system_core/0003-First-drop_privs-which-may-fail-and-only-run-thread-.patch
+++ b/patches/platform_system_core/0003-First-drop_privs-which-may-fail-and-only-run-thread-.patch
@@ -1,7 +1,7 @@
-From 51f63fdc8fa7144cb2bee8e5a8f8fef6db7a0447 Mon Sep 17 00:00:00 2001
+From 25929aa25dfbb4abbd02587303dd174fcda55ab4 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 14 Aug 2018 19:33:23 +0200
-Subject: [PATCH 03/12] First drop_privs (which may fail) and only run thread
+Subject: [PATCH 03/14] First drop_privs (which may fail) and only run thread
  that might be scheduled before us
 
 Change-Id: I118fb2d4beedbeecf5d3a8d255929d3be480b923
@@ -40,5 +40,5 @@ index fd3cdf877..4057347b8 100644
      // socket connection, and as a reader lock on a range of log
      // entries.
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_system_core/0004-Ignore-proc-kmsg-if-reading-from-it-faults.patch b/patches/platform_system_core/0004-Ignore-proc-kmsg-if-reading-from-it-faults.patch
index e87776e..74e7d96 100644
--- a/patches/platform_system_core/0004-Ignore-proc-kmsg-if-reading-from-it-faults.patch
+++ b/patches/platform_system_core/0004-Ignore-proc-kmsg-if-reading-from-it-faults.patch
@@ -1,7 +1,7 @@
-From 9d1ea37580d14cc71170595ec0c73fc04a99243a Mon Sep 17 00:00:00 2001
+From 473e2f208b9da9481ee31d5cc642c6d67b2bca4a Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 2 Jan 2019 17:17:20 +0100
-Subject: [PATCH 04/12] Ignore /proc/kmsg if reading from it faults
+Subject: [PATCH 04/14] Ignore /proc/kmsg if reading from it faults
 
 On some devices, (The only known one is Y6 2018), reading from
 /proc/kmsg fails, with a status EFAULT
@@ -29,5 +29,5 @@ index edd326aec..8ff719f6e 100644
          }
          len += retval;
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_system_core/0005-Panic-into-recovery-rather-than-bootloader.patch b/patches/platform_system_core/0005-Panic-into-recovery-rather-than-bootloader.patch
index 9c12425..6bb584d 100644
--- a/patches/platform_system_core/0005-Panic-into-recovery-rather-than-bootloader.patch
+++ b/patches/platform_system_core/0005-Panic-into-recovery-rather-than-bootloader.patch
@@ -1,7 +1,7 @@
-From 6892df4432eb01985e64368643708d68a6c8ac50 Mon Sep 17 00:00:00 2001
+From 3477f96207549399ec1d3ea7d4500947728d05e9 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 4 Sep 2019 21:11:48 +0200
-Subject: [PATCH 05/12] Panic into recovery rather than bootloader
+Subject: [PATCH 05/14] Panic into recovery rather than bootloader
 
 Getting last_kmsg/pstore from bootloader isn't possible for other people
 than the OEM, but we have TWRP to access last_kmsg/pstore
@@ -12,10 +12,10 @@ Change-Id: If04bb6572dc66677d7b44f7d302b2d69ce526200
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/init/reboot_utils.cpp b/init/reboot_utils.cpp
-index d1a712f2e..e79b634e8 100644
+index de085cc9b..36d39b50d 100644
 --- a/init/reboot_utils.cpp
 +++ b/init/reboot_utils.cpp
-@@ -32,7 +32,7 @@
+@@ -33,7 +33,7 @@
  namespace android {
  namespace init {
  
@@ -25,5 +25,5 @@ index d1a712f2e..e79b634e8 100644
  void SetFatalRebootTarget() {
      std::string cmdline;
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_system_core/0007-first-stage-If-Vboot2-fails-fall-back-to-Vboot1.patch b/patches/platform_system_core/0006-If-Vboot2-fails-fall-back-to-Vboot1.patch
similarity index 89%
rename from patches/platform_system_core/0007-first-stage-If-Vboot2-fails-fall-back-to-Vboot1.patch
rename to patches/platform_system_core/0006-If-Vboot2-fails-fall-back-to-Vboot1.patch
index 60d8121..d67cdd9 100644
--- a/patches/platform_system_core/0007-first-stage-If-Vboot2-fails-fall-back-to-Vboot1.patch
+++ b/patches/platform_system_core/0006-If-Vboot2-fails-fall-back-to-Vboot1.patch
@@ -1,7 +1,7 @@
-From 683ff1f93a10edbccd533056f836eb1307686783 Mon Sep 17 00:00:00 2001
+From 348fd1f5927ec083e9a8c031f005ea4320caf481 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 07/12] [first stage] If Vboot2 fails, fall-back to Vboot1
+Subject: [PATCH 06/14] 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.
@@ -37,5 +37,5 @@ index 3e76556ff..41498202f 100644
  
  void SetInitAvbVersionInRecovery() {
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_system_core/0008-wip.patch b/patches/platform_system_core/0007-wip.patch
similarity index 97%
rename from patches/platform_system_core/0008-wip.patch
rename to patches/platform_system_core/0007-wip.patch
index 6824f5d..df6c7a6 100644
--- a/patches/platform_system_core/0008-wip.patch
+++ b/patches/platform_system_core/0007-wip.patch
@@ -1,7 +1,7 @@
-From 26a7dd02cd2a9092b7d5fb40be277029ddd9dd7d Mon Sep 17 00:00:00 2001
+From 33abb6a827154fdd37738c701febc01b816bf585 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 12 Sep 2019 13:09:46 +0200
-Subject: [PATCH 08/12] wip
+Subject: [PATCH 07/14] wip
 
 Change-Id: I925f21802d3dd031c6d7d8c4777f36e62e52699b
 ---
@@ -102,5 +102,5 @@ index bf3fb4217..0a67281ab 100644
      socket usap_pool_primary stream 660 root system
      onrestart write /sys/android_power/request_state wake
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_system_core/0009-Remove-reserved_disk-group-not-very-useful-and-break.patch b/patches/platform_system_core/0008-Remove-reserved_disk-group-not-very-useful-and-break.patch
similarity index 95%
rename from patches/platform_system_core/0009-Remove-reserved_disk-group-not-very-useful-and-break.patch
rename to patches/platform_system_core/0008-Remove-reserved_disk-group-not-very-useful-and-break.patch
index 1a340ec..e29671f 100644
--- a/patches/platform_system_core/0009-Remove-reserved_disk-group-not-very-useful-and-break.patch
+++ b/patches/platform_system_core/0008-Remove-reserved_disk-group-not-very-useful-and-break.patch
@@ -1,7 +1,7 @@
-From 252ef3edfbd768b4005df28c026a0969221819c2 Mon Sep 17 00:00:00 2001
+From 33082290cb322fac202faecd45ebd73ca77e6b3c Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 14 Sep 2019 21:29:29 +0200
-Subject: [PATCH 09/12] Remove reserved_disk group (not very useful, and breaks
+Subject: [PATCH 08/14] Remove reserved_disk group (not very useful, and breaks
  SaS boot)
 
 Change-Id: Ib503fe64a095c00757d410ee65fde6fa8f6ea784
@@ -69,5 +69,5 @@ index 48461ecd3..6fd203bc5 100644
      socket usap_pool_secondary stream 660 root system
      onrestart restart zygote
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_system_core/0010-Take-ro.vndk.version-into-account-to-know-what-to-te.patch b/patches/platform_system_core/0009-Take-ro.vndk.version-into-account-to-know-what-to-te.patch
similarity index 93%
rename from patches/platform_system_core/0010-Take-ro.vndk.version-into-account-to-know-what-to-te.patch
rename to patches/platform_system_core/0009-Take-ro.vndk.version-into-account-to-know-what-to-te.patch
index cd8f319..2ebd3f2 100644
--- a/patches/platform_system_core/0010-Take-ro.vndk.version-into-account-to-know-what-to-te.patch
+++ b/patches/platform_system_core/0009-Take-ro.vndk.version-into-account-to-know-what-to-te.patch
@@ -1,7 +1,7 @@
-From b39f578a5772607b269bfe169a16f1adb8f7f037 Mon Sep 17 00:00:00 2001
+From 9a5b2aaea6fa41653cbdcea03427ac2b4c16e5e3 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 14 Sep 2019 21:53:35 +0200
-Subject: [PATCH 10/12] Take ro.vndk.version into account to know what to test
+Subject: [PATCH 09/14] Take ro.vndk.version into account to know what to test
 
 Change-Id: Ia7c710941c39b7051b904032a13e5f443049cc05
 ---
@@ -40,5 +40,5 @@ index 4420ebbd2..a6f290960 100644
          std::string new_opts;
          for (int j = 0; j < new_opts_list.size() - i; ++j) {
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_system_core/0011-Use-a-vndk-lite-friendly-ld-config.patch b/patches/platform_system_core/0010-Use-a-vndk-lite-friendly-ld-config.patch
similarity index 90%
rename from patches/platform_system_core/0011-Use-a-vndk-lite-friendly-ld-config.patch
rename to patches/platform_system_core/0010-Use-a-vndk-lite-friendly-ld-config.patch
index 1d29e74..fe3f5da 100644
--- a/patches/platform_system_core/0011-Use-a-vndk-lite-friendly-ld-config.patch
+++ b/patches/platform_system_core/0010-Use-a-vndk-lite-friendly-ld-config.patch
@@ -1,7 +1,7 @@
-From b99650956dc7943e965a0413bfb3b5f01d182e40 Mon Sep 17 00:00:00 2001
+From 03392f3d3dddde450bf5e2865105f9ad45a25744 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 14 Sep 2019 22:49:31 +0200
-Subject: [PATCH] Use a vndk-lite friendly ld config
+Subject: [PATCH 10/14] Use a vndk-lite friendly ld config
 
 Change-Id: I5b1e49fc534e6625ebdb6e183466e73b5c49e175
 ---
@@ -27,5 +27,5 @@ index c95f60fb0..50c153f4a 100644
  ###############################################################################
  # "runtime" APEX namespace
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_system_core/0012-fixup-Take-ro.vndk.version-into-account-to-know-what.patch b/patches/platform_system_core/0011-fixup-Take-ro.vndk.version-into-account-to-know-what.patch
similarity index 92%
rename from patches/platform_system_core/0012-fixup-Take-ro.vndk.version-into-account-to-know-what.patch
rename to patches/platform_system_core/0011-fixup-Take-ro.vndk.version-into-account-to-know-what.patch
index c5e300d..d99abc7 100644
--- a/patches/platform_system_core/0012-fixup-Take-ro.vndk.version-into-account-to-know-what.patch
+++ b/patches/platform_system_core/0011-fixup-Take-ro.vndk.version-into-account-to-know-what.patch
@@ -1,7 +1,7 @@
-From 1edfe5d82e20527ebb852cb506f878f19049f07e Mon Sep 17 00:00:00 2001
+From dbd09be4a1ef3a19e7c35b60f432b9f1c446a5da Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 1 Oct 2019 13:34:35 +0200
-Subject: [PATCH 12/12] fixup! Take ro.vndk.version into account to know what
+Subject: [PATCH 11/14] fixup! Take ro.vndk.version into account to know what
  to test
 
 ---
@@ -33,5 +33,5 @@ index a6f290960..7b2bb588a 100644
          for (int j = 0; j < new_opts_list.size() - i; ++j) {
              new_opts += new_opts_list[j];
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_system_core/0013-Give-lmkd-ptrace-capability-to-bypass-hidepid-AOSP-u.patch b/patches/platform_system_core/0012-Give-lmkd-ptrace-capability-to-bypass-hidepid-AOSP-u.patch
similarity index 84%
rename from patches/platform_system_core/0013-Give-lmkd-ptrace-capability-to-bypass-hidepid-AOSP-u.patch
rename to patches/platform_system_core/0012-Give-lmkd-ptrace-capability-to-bypass-hidepid-AOSP-u.patch
index 719a876..5190b5f 100644
--- a/patches/platform_system_core/0013-Give-lmkd-ptrace-capability-to-bypass-hidepid-AOSP-u.patch
+++ b/patches/platform_system_core/0012-Give-lmkd-ptrace-capability-to-bypass-hidepid-AOSP-u.patch
@@ -1,7 +1,7 @@
-From 4152eaf5e3da9f0e4d67187b351478d92c7ae627 Mon Sep 17 00:00:00 2001
+From 18b54f7bd4b9dbcc356c8e4f208bf25d73d93558 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 16 Oct 2019 15:52:12 +0200
-Subject: [PATCH 13/13] Give lmkd ptrace capability, to bypass hidepid (AOSP
+Subject: [PATCH 12/14] Give lmkd ptrace capability, to bypass hidepid (AOSP
  uses `readproc` group, but I cant because of A-only)
 
 Change-Id: Ic58e7c125d86fde45764d39f250675cf84777266
@@ -22,5 +22,5 @@ index 5a357ee84..d5ddab091 100644
      socket lmkd seqpacket 0660 system system
      writepid /dev/cpuset/system-background/tasks
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_system_core/0014-Ugly-but-secure-Set-dev-uinput-as-0666-to-fix-finger.patch b/patches/platform_system_core/0013-Ugly-but-secure-Set-dev-uinput-as-0666-to-fix-finger.patch
similarity index 88%
rename from patches/platform_system_core/0014-Ugly-but-secure-Set-dev-uinput-as-0666-to-fix-finger.patch
rename to patches/platform_system_core/0013-Ugly-but-secure-Set-dev-uinput-as-0666-to-fix-finger.patch
index b4edffe..039c07b 100644
--- a/patches/platform_system_core/0014-Ugly-but-secure-Set-dev-uinput-as-0666-to-fix-finger.patch
+++ b/patches/platform_system_core/0013-Ugly-but-secure-Set-dev-uinput-as-0666-to-fix-finger.patch
@@ -1,7 +1,7 @@
-From ef7918d80d3dcd9341e8bc967a1215e687ff5d47 Mon Sep 17 00:00:00 2001
+From 265050d1e6852b33961c8e5120808252aedebdf6 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 14/14] Ugly but secure: Set /dev/uinput as 0666 to fix
+Subject: [PATCH 13/14] 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
@@ -28,5 +28,5 @@ index 451f5adf3..41ad5bd09 100644
  /dev/tty0                 0660   root       system
  /dev/graphics/*           0660   root       graphics
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_system_core/0015-Allow-our-vndk-to-access-libnativeloader.patch b/patches/platform_system_core/0014-Allow-our-vndk-to-access-libnativeloader.patch
similarity index 83%
rename from patches/platform_system_core/0015-Allow-our-vndk-to-access-libnativeloader.patch
rename to patches/platform_system_core/0014-Allow-our-vndk-to-access-libnativeloader.patch
index b52dcdf..7c36a70 100644
--- a/patches/platform_system_core/0015-Allow-our-vndk-to-access-libnativeloader.patch
+++ b/patches/platform_system_core/0014-Allow-our-vndk-to-access-libnativeloader.patch
@@ -1,7 +1,7 @@
-From 2f556132ce533719576348932dbabc20d377c194 Mon Sep 17 00:00:00 2001
+From c11e83954cbb3bc3c0786736209658f690e542f3 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 11 Nov 2019 00:21:36 +0100
-Subject: [PATCH 15/16] Allow our vndk to access libnativeloader
+Subject: [PATCH 14/14] Allow our vndk to access libnativeloader
 
 ---
  rootdir/etc/ld.config.txt | 1 +
@@ -20,5 +20,5 @@ index 50c153f4a..b03d52e99 100644
  namespace.vndk.link.vndk_in_system.shared_libs = %VNDK_USING_CORE_VARIANT_LIBRARIES%
  
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_system_netd/0001-device-Huawei-Kirin-960-accept-broken-rpfilter-match.patch b/patches/platform_system_netd/0001-Huawei-Kirin-960-accept-broken-rpfilter-match.patch
similarity index 83%
rename from patches/platform_system_netd/0001-device-Huawei-Kirin-960-accept-broken-rpfilter-match.patch
rename to patches/platform_system_netd/0001-Huawei-Kirin-960-accept-broken-rpfilter-match.patch
index 850bf38..da75476 100644
--- a/patches/platform_system_netd/0001-device-Huawei-Kirin-960-accept-broken-rpfilter-match.patch
+++ b/patches/platform_system_netd/0001-Huawei-Kirin-960-accept-broken-rpfilter-match.patch
@@ -1,8 +1,7 @@
-From dad654943fe290ab081c3e5b07cc913130f1d3ad Mon Sep 17 00:00:00 2001
+From 8a2ca3ce52ddfeb816890380a1509b410a3c8943 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/2] [device] ::Huawei Kirin 960:: accept broken rpfilter
- match
+Subject: [PATCH 1/2] Huawei Kirin 960:: accept broken rpfilter match
 
 How bad a security flaw is this?
 People lived with rpfilter on IPv4 for a very long time...
@@ -13,7 +12,7 @@ Change-Id: I9aa63d18e54a8254133adf97bf757c03d6b66757
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/server/TetherController.cpp b/server/TetherController.cpp
-index 0c5b6bfe..d9439be6 100644
+index e9445c82..64ff80b0 100644
 --- a/server/TetherController.cpp
 +++ b/server/TetherController.cpp
 @@ -696,7 +696,7 @@ int TetherController::setForwardRules(bool add, const char *intIface, const char
@@ -26,5 +25,5 @@ index 0c5b6bfe..d9439be6 100644
      }
  
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_system_netd/0002-Don-t-fail-on-FTP-conntracking-failing.patch b/patches/platform_system_netd/0002-Don-t-fail-on-FTP-conntracking-failing.patch
index 8d37382..d12835d 100644
--- a/patches/platform_system_netd/0002-Don-t-fail-on-FTP-conntracking-failing.patch
+++ b/patches/platform_system_netd/0002-Don-t-fail-on-FTP-conntracking-failing.patch
@@ -1,4 +1,4 @@
-From 107c7e3fbff713065def6e10f11e7210929726fe Mon Sep 17 00:00:00 2001
+From be7c2877572c5aec84cd7aed071def189d17e0f0 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/2] Don't fail on FTP conntracking failing
@@ -43,5 +43,5 @@ index 64ff80b0..2fa4a0c9 100644
              StringPrintf("%s %s -i %s -o %s -m state --state ESTABLISHED,RELATED -g %s", op,
                           LOCAL_FORWARD, extIface, intIface, LOCAL_TETHER_COUNTERS_CHAIN),
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_system_sepolicy/0001-Don-t-set-esdfs-or-exfat-genfscon.-Assume-OEM-does.patch b/patches/platform_system_sepolicy/0001-Don-t-set-esdfs-or-exfat-genfscon.-Assume-OEM-does.patch
deleted file mode 100644
index d3f7fe3..0000000
--- a/patches/platform_system_sepolicy/0001-Don-t-set-esdfs-or-exfat-genfscon.-Assume-OEM-does.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 2963058b10e3f92d351dec6fa6a09dad4d3213b3 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Tue, 14 Aug 2018 20:56:54 +0200
-Subject: [PATCH 1/2] Don't set esdfs or exfat genfscon. Assume OEM does
-
----
- prebuilts/api/28.0/private/genfs_contexts | 4 ++--
- prebuilts/api/29.0/private/genfs_contexts | 4 ++--
- private/genfs_contexts                    | 4 ++--
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/prebuilts/api/28.0/private/genfs_contexts b/prebuilts/api/28.0/private/genfs_contexts
-index 7e2ea509..56cd92da 100644
---- a/prebuilts/api/28.0/private/genfs_contexts
-+++ b/prebuilts/api/28.0/private/genfs_contexts
-@@ -231,12 +231,12 @@ genfscon debugfs /tracing/events/fence/
- 
- genfscon inotifyfs / u:object_r:inotify:s0
- genfscon vfat / u:object_r:vfat:s0
--genfscon exfat / u:object_r:exfat:s0
-+#genfscon exfat / u:object_r:exfat:s0
- genfscon debugfs / u:object_r:debugfs:s0
- genfscon fuse / u:object_r:fuse:s0
- genfscon configfs / u:object_r:configfs:s0
- genfscon sdcardfs / u:object_r:sdcardfs:s0
--genfscon esdfs / u:object_r:sdcardfs:s0
-+#genfscon esdfs / u:object_r:sdcardfs:s0
- genfscon pstore / u:object_r:pstorefs:s0
- genfscon functionfs / u:object_r:functionfs:s0
- genfscon usbfs / u:object_r:usbfs:s0
-diff --git a/prebuilts/api/29.0/private/genfs_contexts b/prebuilts/api/29.0/private/genfs_contexts
-index 202d1b31..df21c503 100644
---- a/prebuilts/api/29.0/private/genfs_contexts
-+++ b/prebuilts/api/29.0/private/genfs_contexts
-@@ -285,12 +285,12 @@ genfscon debugfs /kcov								 u:object_r:debugfs_kcov:s0
- 
- genfscon inotifyfs / u:object_r:inotify:s0
- genfscon vfat / u:object_r:vfat:s0
--genfscon exfat / u:object_r:exfat:s0
-+#genfscon exfat / u:object_r:exfat:s0
- genfscon debugfs / u:object_r:debugfs:s0
- genfscon fuse / u:object_r:fuse:s0
- genfscon configfs / u:object_r:configfs:s0
- genfscon sdcardfs / u:object_r:sdcardfs:s0
--genfscon esdfs / u:object_r:sdcardfs:s0
-+#genfscon esdfs / u:object_r:sdcardfs:s0
- genfscon pstore / u:object_r:pstorefs:s0
- genfscon functionfs / u:object_r:functionfs:s0
- genfscon usbfs / u:object_r:usbfs:s0
-diff --git a/private/genfs_contexts b/private/genfs_contexts
-index 202d1b31..df21c503 100644
---- a/private/genfs_contexts
-+++ b/private/genfs_contexts
-@@ -285,12 +285,12 @@ genfscon debugfs /kcov								 u:object_r:debugfs_kcov:s0
- 
- genfscon inotifyfs / u:object_r:inotify:s0
- genfscon vfat / u:object_r:vfat:s0
--genfscon exfat / u:object_r:exfat:s0
-+#genfscon exfat / u:object_r:exfat:s0
- genfscon debugfs / u:object_r:debugfs:s0
- genfscon fuse / u:object_r:fuse:s0
- genfscon configfs / u:object_r:configfs:s0
- genfscon sdcardfs / u:object_r:sdcardfs:s0
--genfscon esdfs / u:object_r:sdcardfs:s0
-+#genfscon esdfs / u:object_r:sdcardfs:s0
- genfscon pstore / u:object_r:pstorefs:s0
- genfscon functionfs / u:object_r:functionfs:s0
- genfscon usbfs / u:object_r:usbfs:s0
--- 
-2.17.1
-
diff --git a/patches/platform_system_sepolicy/0003-Revert-Don-t-set-esdfs-or-exfat-genfscon.-Assume-OEM.patch b/patches/platform_system_sepolicy/0003-Revert-Don-t-set-esdfs-or-exfat-genfscon.-Assume-OEM.patch
deleted file mode 100644
index c13f1f0..0000000
--- a/patches/platform_system_sepolicy/0003-Revert-Don-t-set-esdfs-or-exfat-genfscon.-Assume-OEM.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 190246ee8a6cd75b3f414eae7489e83843b9e6bf Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sun, 24 May 2020 16:55:00 +0200
-Subject: [PATCH 3/3] Revert "Don't set esdfs or exfat genfscon. Assume OEM
- does"
-
-This reverts commit dd26ec1f5e1deb0626e12efc2ee966509da0f4fc.
----
- prebuilts/api/28.0/private/genfs_contexts | 4 ++--
- prebuilts/api/29.0/private/genfs_contexts | 4 ++--
- private/genfs_contexts                    | 4 ++--
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/prebuilts/api/28.0/private/genfs_contexts b/prebuilts/api/28.0/private/genfs_contexts
-index 56cd92da9..7e2ea5092 100644
---- a/prebuilts/api/28.0/private/genfs_contexts
-+++ b/prebuilts/api/28.0/private/genfs_contexts
-@@ -231,12 +231,12 @@ genfscon debugfs /tracing/events/fence/
- 
- genfscon inotifyfs / u:object_r:inotify:s0
- genfscon vfat / u:object_r:vfat:s0
--#genfscon exfat / u:object_r:exfat:s0
-+genfscon exfat / u:object_r:exfat:s0
- genfscon debugfs / u:object_r:debugfs:s0
- genfscon fuse / u:object_r:fuse:s0
- genfscon configfs / u:object_r:configfs:s0
- genfscon sdcardfs / u:object_r:sdcardfs:s0
--#genfscon esdfs / u:object_r:sdcardfs:s0
-+genfscon esdfs / u:object_r:sdcardfs:s0
- genfscon pstore / u:object_r:pstorefs:s0
- genfscon functionfs / u:object_r:functionfs:s0
- genfscon usbfs / u:object_r:usbfs:s0
-diff --git a/prebuilts/api/29.0/private/genfs_contexts b/prebuilts/api/29.0/private/genfs_contexts
-index 71f982413..d2819b194 100644
---- a/prebuilts/api/29.0/private/genfs_contexts
-+++ b/prebuilts/api/29.0/private/genfs_contexts
-@@ -287,12 +287,12 @@ genfscon debugfs /kcov								 u:object_r:debugfs_kcov:s0
- 
- genfscon inotifyfs / u:object_r:inotify:s0
- genfscon vfat / u:object_r:vfat:s0
--#genfscon exfat / u:object_r:exfat:s0
-+genfscon exfat / u:object_r:exfat:s0
- genfscon debugfs / u:object_r:debugfs:s0
- genfscon fuse / u:object_r:fuse:s0
- genfscon configfs / u:object_r:configfs:s0
- genfscon sdcardfs / u:object_r:sdcardfs:s0
--#genfscon esdfs / u:object_r:sdcardfs:s0
-+genfscon esdfs / u:object_r:sdcardfs:s0
- genfscon pstore / u:object_r:pstorefs:s0
- genfscon functionfs / u:object_r:functionfs:s0
- genfscon usbfs / u:object_r:usbfs:s0
-diff --git a/private/genfs_contexts b/private/genfs_contexts
-index 71f982413..d2819b194 100644
---- a/private/genfs_contexts
-+++ b/private/genfs_contexts
-@@ -287,12 +287,12 @@ genfscon debugfs /kcov								 u:object_r:debugfs_kcov:s0
- 
- genfscon inotifyfs / u:object_r:inotify:s0
- genfscon vfat / u:object_r:vfat:s0
--#genfscon exfat / u:object_r:exfat:s0
-+genfscon exfat / u:object_r:exfat:s0
- genfscon debugfs / u:object_r:debugfs:s0
- genfscon fuse / u:object_r:fuse:s0
- genfscon configfs / u:object_r:configfs:s0
- genfscon sdcardfs / u:object_r:sdcardfs:s0
--#genfscon esdfs / u:object_r:sdcardfs:s0
-+genfscon esdfs / u:object_r:sdcardfs:s0
- genfscon pstore / u:object_r:pstorefs:s0
- genfscon functionfs / u:object_r:functionfs:s0
- genfscon usbfs / u:object_r:usbfs:s0
--- 
-2.17.1
-
diff --git a/patches/platform_system_vold/0001-Allow-deletion-of-symlink.patch b/patches/platform_system_vold/0001-Allow-deletion-of-symlink.patch
index 46bfb59..20c8e6b 100644
--- a/patches/platform_system_vold/0001-Allow-deletion-of-symlink.patch
+++ b/patches/platform_system_vold/0001-Allow-deletion-of-symlink.patch
@@ -1,7 +1,7 @@
-From c3b771c76088e9308759d9d59a79c67fe52514b6 Mon Sep 17 00:00:00 2001
+From 675dd5936da0e44ede6e6b15337bf0c4b1958706 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/6] Allow deletion of symlink
+Subject: [PATCH 1/9] Allow deletion of symlink
 
 Change-Id: I9731895f88729072297f753088583aabbe6990f4
 ---
@@ -9,10 +9,10 @@ Change-Id: I9731895f88729072297f753088583aabbe6990f4
  1 file changed, 1 insertion(+)
 
 diff --git a/FsCrypt.cpp b/FsCrypt.cpp
-index 2a8e110..8b061cb 100644
+index 76a02ba..5f95338 100644
 --- a/FsCrypt.cpp
 +++ b/FsCrypt.cpp
-@@ -224,6 +224,7 @@ static bool prepare_dir(const std::string& dir, mode_t mode, uid_t uid, gid_t gi
+@@ -262,6 +262,7 @@ static bool prepare_dir(const std::string& dir, mode_t mode, uid_t uid, gid_t gi
  static bool destroy_dir(const std::string& dir) {
      LOG(DEBUG) << "Destroying: " << dir;
      if (rmdir(dir.c_str()) != 0 && errno != ENOENT) {
@@ -21,5 +21,5 @@ index 2a8e110..8b061cb 100644
          return false;
      }
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_system_vold/0002-Don-t-set-reserved_disk-group-it-panics-old-inits.patch b/patches/platform_system_vold/0002-Don-t-set-reserved_disk-group-it-panics-old-inits.patch
index 5ddc47c..7c45391 100644
--- a/patches/platform_system_vold/0002-Don-t-set-reserved_disk-group-it-panics-old-inits.patch
+++ b/patches/platform_system_vold/0002-Don-t-set-reserved_disk-group-it-panics-old-inits.patch
@@ -1,7 +1,7 @@
-From 95622cc1d194d74b5d7c38747c2b0ce14470d030 Mon Sep 17 00:00:00 2001
+From b287616ba4c0cb7a380b29b5ab70e98e6de90b75 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 14 Aug 2018 20:53:12 +0200
-Subject: [PATCH 2/6] Don't set reserved_disk group, it panics old inits
+Subject: [PATCH 2/9] Don't set reserved_disk group, it panics old inits
 
 Change-Id: Ic4893136c188059d40d3e97099f7990dfa7432a8
 ---
@@ -18,5 +18,5 @@ index 93d8786..c27aeda 100644
      shutdown critical
 -    group root reserved_disk
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_system_vold/0003-Create-vendor_de.-This-is-done-by-init.rc-on-system-.patch b/patches/platform_system_vold/0003-Create-vendor_de.-This-is-done-by-init.rc-on-system-.patch
index c3013bd..4b5b6ff 100644
--- a/patches/platform_system_vold/0003-Create-vendor_de.-This-is-done-by-init.rc-on-system-.patch
+++ b/patches/platform_system_vold/0003-Create-vendor_de.-This-is-done-by-init.rc-on-system-.patch
@@ -1,7 +1,7 @@
-From 54e73dca9f6ec77bbd2f88d3daaef3c9c87979a1 Mon Sep 17 00:00:00 2001
+From 2a1b3675348541cb7fcb2cf2c2a759d9b9637ba0 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 14 Aug 2018 20:54:08 +0200
-Subject: [PATCH 3/6] Create vendor_de. This is done by /init.rc on
+Subject: [PATCH 3/9] Create vendor_de. This is done by /init.rc on
  system-as-root device
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 3/6] Create vendor_de. This is done by /init.rc on
  1 file changed, 2 insertions(+)
 
 diff --git a/FsCrypt.cpp b/FsCrypt.cpp
-index 8b061cb..bb90ee0 100644
+index 5f95338..c5816b1 100644
 --- a/FsCrypt.cpp
 +++ b/FsCrypt.cpp
-@@ -669,6 +669,8 @@ bool fscrypt_prepare_user_storage(const std::string& volume_uuid, userid_t user_
+@@ -836,6 +836,8 @@ bool fscrypt_prepare_user_storage(const std::string& volume_uuid, userid_t user_
          auto vendor_de_path = android::vold::BuildDataVendorDePath(user_id);
          auto user_de_path = android::vold::BuildDataUserDePath(volume_uuid, user_id);
  
@@ -22,5 +22,5 @@ index 8b061cb..bb90ee0 100644
              if (!prepare_dir(system_legacy_path, 0700, AID_SYSTEM, AID_SYSTEM)) return false;
  #if MANAGE_MISC_DIRS
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_system_vold/0004-Support-Samsung-s-implementation-of-exfat-called-sdf.patch b/patches/platform_system_vold/0004-Support-Samsung-s-implementation-of-exfat-called-sdf.patch
index 82f685d..1f3e0c7 100644
--- a/patches/platform_system_vold/0004-Support-Samsung-s-implementation-of-exfat-called-sdf.patch
+++ b/patches/platform_system_vold/0004-Support-Samsung-s-implementation-of-exfat-called-sdf.patch
@@ -1,7 +1,7 @@
-From 742595997f8f2380e0229e231848211c8126b92f Mon Sep 17 00:00:00 2001
+From 1cf770f79b0fa11efe64818eb6fd9a25bbcd3da7 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 20 Aug 2018 22:37:54 +0200
-Subject: [PATCH 4/6] Support Samsung's implementation of exfat, called sdfat
+Subject: [PATCH 4/9] Support Samsung's implementation of exfat, called sdfat
 
 ---
  fs/Exfat.cpp | 9 ++++++---
@@ -40,5 +40,5 @@ index c624eb9..b9844a5 100644
      }
  
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_system_vold/0005-Also-create-vendor_ce-same-reason-as-vendor_de.patch b/patches/platform_system_vold/0005-Also-create-vendor_ce-same-reason-as-vendor_de.patch
index 89453b1..a2e1600 100644
--- a/patches/platform_system_vold/0005-Also-create-vendor_ce-same-reason-as-vendor_de.patch
+++ b/patches/platform_system_vold/0005-Also-create-vendor_ce-same-reason-as-vendor_de.patch
@@ -1,17 +1,17 @@
-From 1cdb0168b3bc3981f71aba62f51064be57ccf8f5 Mon Sep 17 00:00:00 2001
+From b11e5be450eaae1e0c099030d6de3c42ab77d9ae Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 20 Aug 2018 22:38:08 +0200
-Subject: [PATCH 5/6] Also create vendor_ce (same reason as vendor_de)
+Subject: [PATCH 5/9] Also create vendor_ce (same reason as vendor_de)
 
 ---
  FsCrypt.cpp | 2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/FsCrypt.cpp b/FsCrypt.cpp
-index bb90ee0..ec7ec7d 100644
+index c5816b1..92f31ea 100644
 --- a/FsCrypt.cpp
 +++ b/FsCrypt.cpp
-@@ -709,6 +709,8 @@ bool fscrypt_prepare_user_storage(const std::string& volume_uuid, userid_t user_
+@@ -876,6 +876,8 @@ bool fscrypt_prepare_user_storage(const std::string& volume_uuid, userid_t user_
          auto media_ce_path = android::vold::BuildDataMediaCePath(volume_uuid, user_id);
          auto user_ce_path = android::vold::BuildDataUserCePath(volume_uuid, user_id);
  
@@ -21,5 +21,5 @@ index bb90ee0..ec7ec7d 100644
              if (!prepare_dir(system_ce_path, 0770, AID_SYSTEM, AID_SYSTEM)) return false;
              if (!prepare_dir(misc_ce_path, 01771, AID_SYSTEM, AID_MISC)) return false;
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_system_vold/0006-Check-needsCheckpoint-only-if-checkpoint-is-supporte.patch b/patches/platform_system_vold/0006-Check-needsCheckpoint-only-if-checkpoint-is-supporte.patch
index be902fb..05fb1c5 100644
--- a/patches/platform_system_vold/0006-Check-needsCheckpoint-only-if-checkpoint-is-supporte.patch
+++ b/patches/platform_system_vold/0006-Check-needsCheckpoint-only-if-checkpoint-is-supporte.patch
@@ -1,7 +1,7 @@
-From b48715b53228daedd29507239ceb1704453f4163 Mon Sep 17 00:00:00 2001
+From bc2a20304940acdba8100857599f7c24216547fd Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 16 Sep 2019 13:49:05 +0200
-Subject: [PATCH] Check needsCheckpoint only if checkpoint is supported
+Subject: [PATCH 6/9] Check needsCheckpoint only if checkpoint is supported
 
 This is needed because some devices (Xiaomi MiPad 4, uncertified)
 declares a bootctrl HAL in manifest, but doesn't have it.
@@ -28,5 +28,5 @@ index ed9a53e..d2971ff 100644
          while ((mount_rc = fs_mgr_do_mount(&fstab_default, DATA_MNT_POINT, blkdev.data(), 0,
                                             needs_cp)) != 0) {
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_system_vold/0007-Sony-has-texfat-exfat-fs.patch b/patches/platform_system_vold/0007-Sony-has-texfat-exfat-fs.patch
index e9fddf5..cba00a4 100644
--- a/patches/platform_system_vold/0007-Sony-has-texfat-exfat-fs.patch
+++ b/patches/platform_system_vold/0007-Sony-has-texfat-exfat-fs.patch
@@ -1,7 +1,7 @@
-From a60d2da9137661584aa536a9b6fb80f87960d197 Mon Sep 17 00:00:00 2001
+From 1e166b81f3f0c3a26d4f5ae7ba5757fb989eb977 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 28 Jan 2020 00:27:17 +0100
-Subject: [PATCH 7/7] Sony has `texfat` exfat fs
+Subject: [PATCH 7/9] Sony has `texfat` exfat fs
 
 ---
  fs/Exfat.cpp | 8 +++++++-
@@ -34,5 +34,5 @@ index b9844a5..e6f8450 100644
          return 0;
      }
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_system_vold/0008-Failing-to-create-facedata-shouldn-t-be-fatal.patch b/patches/platform_system_vold/0008-Failing-to-create-facedata-shouldn-t-be-fatal.patch
index e2cd65a..e30b36e 100644
--- a/patches/platform_system_vold/0008-Failing-to-create-facedata-shouldn-t-be-fatal.patch
+++ b/patches/platform_system_vold/0008-Failing-to-create-facedata-shouldn-t-be-fatal.patch
@@ -1,4 +1,4 @@
-From e4a3ff285cb25559117d38d573e79a6fc34cc9f5 Mon Sep 17 00:00:00 2001
+From 4978743f9f1561d35fee071e056d9358845b5697 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 8/9] Failing to create facedata shouldn't be fatal
@@ -34,5 +34,5 @@ index a620edd..e07528f 100644
          }
      }
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches/platform_system_vold/0009-Every-voldmanaged-storage-is-adoptable.patch b/patches/platform_system_vold/0009-Every-voldmanaged-storage-is-adoptable.patch
index 6be1162..c44d775 100644
--- a/patches/platform_system_vold/0009-Every-voldmanaged-storage-is-adoptable.patch
+++ b/patches/platform_system_vold/0009-Every-voldmanaged-storage-is-adoptable.patch
@@ -1,7 +1,7 @@
-From c9d44f78250d927f6ff1712a6097c33559500cdd Mon Sep 17 00:00:00 2001
+From cb15b47a3a92f502dab77024caf66abe38654ba3 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 11 Mar 2020 14:02:35 +0100
-Subject: [PATCH] Every voldmanaged storage is adoptable
+Subject: [PATCH 9/9] Every voldmanaged storage is adoptable
 
 ---
  main.cpp | 2 +-
@@ -21,5 +21,5 @@ index 4d61110..6f6e803 100644
                  *has_adoptable = true;
              }
 -- 
-2.17.1
+2.25.1