Changes for July 2023, syncing up to 20230706

patches_platform/frameworks_base/0001-Check-null-FingerprintManager-first-in-onStartedWaki.patch

@@ -1,28 +0,0 @@
-From 9fb18df98c435af869b08b4796e45b9b8fe8c7cf Mon Sep 17 00:00:00 2001
-From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
-Date: Sun, 18 Jun 2023 19:56:36 +0800
-Subject: [PATCH 01/23] Check null FingerprintManager first in
- onStartedWakingUp
-
-Fixes crashing when unlocking from AOD
-
-Change-Id: I80423b14bbe54989fb9a561271e84988e7427209
----
- .../android/systemui/statusbar/phone/CentralSurfacesImpl.java    | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
-index ec8a7a4ffdd3..5462cfdebef4 100644
---- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
-+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
-@@ -3587,6 +3587,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces, Tune
-                                     && mStatusBarStateController.getDozeAmount() == 1f
-                                     && mWakefulnessLifecycle.getLastWakeReason()
-                                     == PowerManager.WAKE_REASON_POWER_BUTTON
-+                                    && mFingerprintManager.get() != null
-                                     && mFingerprintManager.get().isPowerbuttonFps()
-                                     && mFingerprintManager.get().hasEnrolledFingerprints()
-                                     && !touchToUnlockAnytime;
--- 
-2.34.1
-

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

@@ -1,7 +1,7 @@
-From ecfa5198eff7f7ce4276cd11469f53bd7aabe8ca Mon Sep 17 00:00:00 2001
+From 932755113e20c93742e347b7d3908325e69e566e Mon Sep 17 00:00:00 2001
 From: AndyCGYan <GeForce8800Ultra@gmail.com>
 Date: Fri, 22 Mar 2019 00:41:20 +0800
-Subject: [PATCH 02/23] Disable FP lockouts optionally
+Subject: [PATCH 01/22] Disable FP lockouts optionally
 
 Both timed and permanent lockouts - GET THE FUCK OUT
 Now targeting LockoutFramework, introduced in Android 12

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

@@ -1,7 +1,7 @@
-From 42a0b3f0599704873de0ac0aca2c1e67adc18c26 Mon Sep 17 00:00:00 2001
+From af408d8a6a83d7a64de95ba596bda09f552fc152 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Thu, 5 Apr 2018 10:01:19 +0800
-Subject: [PATCH 03/23] Disable vendor mismatch warning
+Subject: [PATCH 02/22] Disable vendor mismatch warning
 
 Change-Id: Ieb8fe91e2f02462f074312ed0f4885d183e9780b
 ---

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

@@ -1,7 +1,7 @@
-From 5be23474b8d72aa5111e78718272f23a31422295 Mon Sep 17 00:00:00 2001
+From ee786ac20d6586bd64839809ea16785758a5e2bf Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Tue, 17 Jan 2023 17:19:19 +0000
-Subject: [PATCH 04/23] Keyguard: Fix colors of slices not updating on doze
+Subject: [PATCH 03/22] Keyguard: Fix colors of slices not updating on doze
 
 Slices were invisible (black) in doze when using light wallpapers
 Introduced in https://github.com/LineageOS/android_frameworks_base/commit/a19e59d717ec6d573c11c7e8277bba3c4de189c2
@@ -31,10 +31,10 @@ index f4c581552bc4..c0f983551877 100644
       * Set which clock should be displayed on the keyguard. The other one will be automatically
       * hidden.
 diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
-index 3dbb6e0ccedb..778261ef6d1f 100644
+index 1394c68ceeb7..6cb1da129b60 100644
 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
 +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
-@@ -4421,6 +4421,7 @@ public final class NotificationPanelViewController implements Dumpable {
+@@ -4422,6 +4422,7 @@ public final class NotificationPanelViewController implements Dumpable {
          public void onDozeAmountChanged(float linearAmount, float amount) {
              mInterpolatedDarkAmount = amount;
              mLinearDarkAmount = linearAmount;

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

@@ -1,7 +1,7 @@
-From 56a81a819bb62e59f41552ff21d4e98133049b7f Mon Sep 17 00:00:00 2001
+From 9ac6b32beddae19e4fd85b888f7fe8fa7ebf76c2 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 16 Oct 2021 02:23:48 +0000
-Subject: [PATCH 05/23] UI: Adjust default navbar layouts
+Subject: [PATCH 04/22] UI: Adjust default navbar layouts
 
 - Slightly tighten nodpi layout
 - Remove sw372dp layout - looks terrible, probably meant for legacy phablets, but most modern phones qualify

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

@@ -1,7 +1,7 @@
-From 649ce048d4f01ac4ed24ede16f7e7f185cdb1f67 Mon Sep 17 00:00:00 2001
+From b67d11a609e9aab9ed8d36525815c5edf127a3e2 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 10 Jan 2021 11:44:29 +0000
-Subject: [PATCH 06/23] UI: Disable wallpaper zoom
+Subject: [PATCH 05/22] UI: Disable wallpaper zoom
 
 It does little more than inducing motion sickness
 
@@ -11,10 +11,10 @@ Change-Id: I78cc5484930b27f172cd8d8a5bd9042dce3478d0
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
-index 91dd9179c329..75941bbb8cd3 100644
+index f5ed2e508411..1bfb2da64706 100644
 --- a/core/res/res/values/config.xml
 +++ b/core/res/res/values/config.xml
-@@ -5203,7 +5203,7 @@
+@@ -5206,7 +5206,7 @@
      <item name="config_wallpaperMinScale" format="float" type="dimen">1</item>
  
      <!-- The max scale for the wallpaper when it's zoomed in -->

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

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

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

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

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

@@ -1,7 +1,7 @@
-From 01a3d9b6958a779bad976d07c38b06f518178072 Mon Sep 17 00:00:00 2001
+From c4cad43dbcbbfc0f1d86e8c7803282db738e48ed Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 25 Sep 2022 02:20:20 +0000
-Subject: [PATCH 09/23] UI: Remove QS footer background
+Subject: [PATCH 08/22] UI: Remove QS footer background
 
 Change-Id: I68e82e0c5e3eddb2d3f767fe792b1436eae506ef
 ---

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

@@ -1,7 +1,7 @@
-From 15e2a02275c1de3c194f18079b12bb3220afb862 Mon Sep 17 00:00:00 2001
+From d2185c0d7ed8a388f3ec6a0d9b02dbbd02578b0b Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 19 Mar 2022 09:22:24 +0000
-Subject: [PATCH 10/23] UI: Restore split-screen divider to pre-Sv2 looks
+Subject: [PATCH 09/22] UI: Restore split-screen divider to pre-Sv2 looks
 
 - Kill rounded corners - where two rectangles collide should be perfectly straight
 - Make it black again - taskbar should mind its own business
@@ -55,7 +55,7 @@ index 6fb70006e67f..906dc71d623a 100644
      <color name="minimize_dock_shadow_start">#60000000</color>
      <color name="minimize_dock_shadow_end">#00000000</color>
 diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java b/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java
-index b4acd6046182..b0a05d7c80d9 100644
+index ffc56b6f6106..fa7d70e34dd1 100644
 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java
 +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java
 @@ -154,23 +154,8 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange

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

@@ -1,7 +1,7 @@
-From 4b24750cb511cb2666335b46e053d2b3791e1d94 Mon Sep 17 00:00:00 2001
+From 37b6af802239f74fff078dc30576b01f43b64398 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Tue, 6 Oct 2020 01:41:16 +0000
-Subject: [PATCH 11/23] UI: Revive navbar layout tuning via sysui_nav_bar
+Subject: [PATCH 10/22] UI: Revive navbar layout tuning via sysui_nav_bar
  tunable
 
 Google keeps fixing what ain't broken.

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

@@ -1,7 +1,7 @@
-From 6957050c84f0fd86972408b016f3835e450de13b Mon Sep 17 00:00:00 2001
+From b5361204a9dd891c17bbca6934aaa78142a3db28 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 26 Apr 2020 08:56:13 +0000
-Subject: [PATCH 12/23] UI: Use SNAP_FIXED_RATIO for multi-window globally
+Subject: [PATCH 11/22] UI: Use SNAP_FIXED_RATIO for multi-window globally
 
 Enables multiple snap targets under landscape for phone UI
 
@@ -78,10 +78,10 @@ index 34b6a54be493..3921c9edfeac 100644
           Only applies if the device display is not square. -->
      <bool name="config_navBarCanMove">false</bool>
 diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
-index 75941bbb8cd3..87e3ddcf8fdf 100644
+index 1bfb2da64706..d1bbfb748379 100644
 --- a/core/res/res/values/config.xml
 +++ b/core/res/res/values/config.xml
-@@ -3882,7 +3882,7 @@
+@@ -3885,7 +3885,7 @@
               1 - 3 snap targets: fixed ratio, 1:1, (1 - fixed ratio)
               2 - 1 snap target: 1:1
      -->

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

@@ -1,7 +1,7 @@
-From 37a4d23386f038939c42819f050d22bd23627292 Mon Sep 17 00:00:00 2001
+From 0dc8c35dd5476c2dd0b688a47c3aa330bc0386c5 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Tue, 3 Nov 2020 22:43:12 -0800
-Subject: [PATCH 13/23] core: Remove old app target SDK dialog
+Subject: [PATCH 12/22] core: Remove old app target SDK dialog
 
 If an app is old, users should already know that, and there's usually no
 point in warning them about it because they would already be using a

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

@@ -1,7 +1,7 @@
-From ad6e9615c4473cb86b36ef383dfb74f4df078901 Mon Sep 17 00:00:00 2001
+From 64d61661bba53aec63b25038b66dc930f0059f8a Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Tue, 5 Oct 2021 21:01:50 -0700
-Subject: [PATCH 14/23] Paint: Enable subpixel text positioning by default
+Subject: [PATCH 13/22] Paint: Enable subpixel text positioning by default
 
 On desktop Linux, subpixel text positioning is necessary to avoid
 kerning issues, and Android is no different. Even though most phone

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

@@ -1,7 +1,7 @@
-From d6f40aec4b7a24c61f37c0c46240b4a263e4e796 Mon Sep 17 00:00:00 2001
+From 68072a29530a1e6a2274f3ec1422aaceb180b334 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Sat, 16 Oct 2021 05:27:57 -0700
-Subject: [PATCH 15/23] Add support for app signature spoofing
+Subject: [PATCH 14/22] Add support for app signature spoofing
 
 This is needed by microG GmsCore to pretend to be the official Google
 Play Services package, because client apps check the package signature

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

@@ -1,7 +1,7 @@
-From ecbc82fa7365a4fd123a7ad945c41c0b6b78658c Mon Sep 17 00:00:00 2001
+From a2924f660008f6400621d012d037ef2107341a76 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Mon, 11 Oct 2021 19:59:51 -0700
-Subject: [PATCH 16/23] Spoof product name for Google Play Services
+Subject: [PATCH 15/22] Spoof product name for Google Play Services
 
 NB: This code is under the gmscompat package, but it does not depend on
 any code from gmscompat.

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

@@ -1,7 +1,7 @@
-From 229fe76ca5e1980981668fa0fc926b0982e91fba Mon Sep 17 00:00:00 2001
+From c5b11c6240de3e08613a80791866549c624cf2f7 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Mon, 11 Oct 2021 20:00:44 -0700
-Subject: [PATCH 17/23] keystore: Block key attestation for SafetyNet
+Subject: [PATCH 16/22] keystore: Block key attestation for SafetyNet
 
 SafetyNet (part of Google Play Services) opportunistically uses
 hardware-backed key attestation via KeyStore as a strong integrity

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

@@ -1,7 +1,7 @@
-From 56dbd5d3d3a54582731fcfeacaed9fa8ac542ea6 Mon Sep 17 00:00:00 2001
+From f3163fabeb398df4f1a3e44c79c5d66d7d567754 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Mon, 1 Nov 2021 20:06:48 -0700
-Subject: [PATCH 18/23] Limit SafetyNet workarounds to unstable GMS process
+Subject: [PATCH 17/22] Limit SafetyNet workarounds to unstable GMS process
 
 The unstable process is where SafetyNet attestation actually runs, so
 we only need to spoof the model in that process. Leaving other processes

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

@@ -1,7 +1,7 @@
-From 502ad20c8b29c937821a70f26be83f481b941e4f Mon Sep 17 00:00:00 2001
+From 0f190aa490eac609ae6331092863c8c209cb150b Mon Sep 17 00:00:00 2001
 From: Dyneteve <dyneteve@hentaios.com>
 Date: Tue, 23 Aug 2022 18:57:05 +0200
-Subject: [PATCH 19/23] gmscompat: Apply the SafetyNet workaround to Play Store
+Subject: [PATCH 18/22] gmscompat: Apply the SafetyNet workaround to Play Store
  aswell
 
 Play Store is used for the new Play Integrity API, extend the hack

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

@@ -1,7 +1,7 @@
-From 643dcbbac4e1955c62f7760fefad20d261797e5b Mon Sep 17 00:00:00 2001
+From 786a25e8bceba2a165945905b102b2d883e2c63b Mon Sep 17 00:00:00 2001
 From: Dyneteve <dyneteve@hentaios.com>
 Date: Thu, 8 Sep 2022 14:39:52 +0200
-Subject: [PATCH 20/23] gmscompat: Use Nexus 6P fingerprint for CTS/Integrity
+Subject: [PATCH 19/22] gmscompat: Use Nexus 6P fingerprint for CTS/Integrity
 
 Google seems to have patched the KM block to Play Store in record time,
 but is still not enforced for anything under android N.

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

@@ -1,7 +1,7 @@
-From 3f021fc317d07d0d9443832bc568161707013746 Mon Sep 17 00:00:00 2001
+From 651f1b866834ee07ee6560469fcbd5e59a105c8a Mon Sep 17 00:00:00 2001
 From: Dyneteve <dyneteve@hentaios.com>
 Date: Tue, 6 Dec 2022 15:59:08 +0100
-Subject: [PATCH 21/23] gmscompat: Use actual device model name
+Subject: [PATCH 20/22] gmscompat: Use actual device model name
 
 Signed-off-by: Dyneteve <dyneteve@hentaios.com>
 Change-Id: I454654d87b3ea6286e12e9a9f5ed120f06cb2aa6

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

@@ -1,7 +1,7 @@
-From 721c979c994c6cdf4f92dfb283d28cfeaf649a51 Mon Sep 17 00:00:00 2001
+From 2010137112b9a768bf766e3eb7bc4f084a4b7b28 Mon Sep 17 00:00:00 2001
 From: Anirudh Gupta <anirudhgupta109@aosip.dev>
 Date: Wed, 4 Jan 2023 18:20:56 +0000
-Subject: [PATCH 22/23] gmscompat: Set shipping level to 32 for devices >=33
+Subject: [PATCH 21/22] gmscompat: Set shipping level to 32 for devices >=33
 
 If ro.product.first_api_level is 33, its forced to use HW attestation even though the safteynet checker app shows BASIC
 setting it to 32 allows for software attestation and passing CTS

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

@@ -1,7 +1,7 @@
-From 69908af269c76085862d4034abf615e5416838a1 Mon Sep 17 00:00:00 2001
+From eefc48647852fc2ced0ff413c9a40fa14b00e92c Mon Sep 17 00:00:00 2001
 From: Dyneteve <dyneteve@hentaios.com>
 Date: Wed, 8 Feb 2023 15:21:01 +0000
-Subject: [PATCH 23/23] gmscompat: Make CTS/Play Integrity pass again
+Subject: [PATCH 22/22] gmscompat: Make CTS/Play Integrity pass again
 
 The logic behind CTS and Play Integrity has been updated today it now
 checks the product and model names against the fingerprint and if

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

@@ -1,7 +1,7 @@
-From ddbc5deb0aac58b6a9c9d21b43c5e5e4dea08b0c Mon Sep 17 00:00:00 2001
+From 598c7139b69f6af6337c3c8829c4b3292ae7cc7c Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 8 Aug 2021 01:43:40 +0000
-Subject: [PATCH 1/9] treble: Lineage-ify
+Subject: [PATCH 01/10] treble: Lineage-ify
 
 Squash of:
 - Proper target names

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,7 +1,7 @@
-From ada7dfd43781e97480001f24365a76d55548928f Mon Sep 17 00:00:00 2001
+From dd2922cc2edf2130e13117383208bfd96f59ea68 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Fri, 24 Mar 2023 00:13:01 +0000
-Subject: [PATCH 9/9] treble: Include androidx.window.extensions
+Subject: [PATCH 09/10] treble: Include androidx.window.extensions
 
 This enables two-pane layout in Settings for tablets
 

patches_treble_td/platform_frameworks_av/0001-APM-Restore-S-R-and-Q-behavior-respectively-for-tele.patch

@@ -1,7 +1,7 @@
-From cb6c37a57fcbfe2b78ec56effe1f881ea6a5a8d5 Mon Sep 17 00:00:00 2001
+From 620a8b0407bb0cdd1889e8491bb17777ecc05121 Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Thu, 18 Aug 2022 15:44:46 -0400
-Subject: [PATCH 01/26] APM: Restore S, R and Q behavior respectively for
+Subject: [PATCH 01/27] APM: Restore S, R and Q behavior respectively for
  telephony audio
 
 This conditionally reverts part of b2e5cb (T), 51c9cc (S) and afd4ce (R)

patches_treble_td/platform_frameworks_av/0002-Fix-BT-in-call-on-CAF-devices.patch

@@ -1,7 +1,7 @@
-From b2067fffebd035a5649a22e7f9887517e3c4c74e Mon Sep 17 00:00:00 2001
+From 92225b786a57d5247d5fc536fcc1e98625b7cb23 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 5 Aug 2019 18:09:50 +0200
-Subject: [PATCH 02/26] Fix BT in-call on CAF devices
+Subject: [PATCH 02/27] Fix BT in-call on CAF devices
 
 See https://github.com/phhusson/treble_experimentations/issues/374
 

patches_treble_td/platform_frameworks_av/0003-Add-partial-cam-id-is-hardcoded-support-for-Asus-ZF6.patch

@@ -1,7 +1,7 @@
-From 6c82041ec3be8a58afbbb506b97eb4527e58e814 Mon Sep 17 00:00:00 2001
+From d5d39a14ce40d2a31bf7e12facfdd5751c180d8c Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 1 Oct 2019 13:35:49 +0200
-Subject: [PATCH 03/26] Add (partial, cam id is hardcoded) support for Asus ZF6
+Subject: [PATCH 03/27] Add (partial, cam id is hardcoded) support for Asus ZF6
  motor camera
 
 Change-Id: Iea6e1370780a1d16f728748d1d948d092532d8fe

patches_treble_td/platform_frameworks_av/0004-APM-Optionally-force-load-audio-policy-for-system-si.patch

@@ -1,7 +1,7 @@
-From 52e8dbd65b0e119ea95d4c77d6aa71983d14f07c Mon Sep 17 00:00:00 2001
+From 626ddf76c4c7b78cc7199aa0d1954734c2ea6dcf Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Wed, 24 Aug 2022 15:42:39 -0400
-Subject: [PATCH 04/26] APM: Optionally force-load audio policy for system-side
+Subject: [PATCH 04/27] APM: Optionally force-load audio policy for system-side
  bt audio HAL
 
 Required to support our system-side bt audio implementation, i.e.

patches_treble_td/platform_frameworks_av/0005-APM-Remove-A2DP-audio-ports-from-the-primary-HAL.patch

@@ -1,7 +1,7 @@
-From d8562da99ed769e3bdadacb95e9bb5d0d47607cb Mon Sep 17 00:00:00 2001
+From 1ad922fb5329d5610d75a92688c8485fd7b4ce2a Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Thu, 25 Aug 2022 13:30:29 -0400
-Subject: [PATCH 05/26] APM: Remove A2DP audio ports from the primary HAL
+Subject: [PATCH 05/27] APM: Remove A2DP audio ports from the primary HAL
 
 These ports defined in the primary HAL are intended for A2DP offloading,
 however they do not work in general on GSIs, and will interfere with

patches_treble_td/platform_frameworks_av/0006-audiopolicy-try-again-with-trimmed-audio-port-name-i.patch

@@ -1,7 +1,7 @@
-From 073693679231981063a1f72494f611197e87e1eb Mon Sep 17 00:00:00 2001
+From e214f14c3fd150c90d1081f03db20bbc5ee2757a Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Thu, 23 Jan 2020 11:13:43 +0800
-Subject: [PATCH 06/26] audiopolicy: try again with trimmed audio port name if
+Subject: [PATCH 06/27] audiopolicy: try again with trimmed audio port name if
  not found
 
 * In Spreadtrum BSP, some audio routes may contain ports with extra

patches_treble_td/platform_frameworks_av/0007-camera-Implement-property-to-override-default-camera.patch

@@ -1,7 +1,7 @@
-From 6f1e2e575733e8720adb3f7076a58604a74d6cff Mon Sep 17 00:00:00 2001
+From 9d8a7a5a7fe9eb541f6228b7f129285c712a5190 Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Wed, 1 Jun 2022 16:56:46 -0400
-Subject: [PATCH 07/26] camera: Implement property to override default camera
+Subject: [PATCH 07/27] camera: Implement property to override default camera
 
 Complement to the frameworks/base patch.
 

patches_treble_td/platform_frameworks_av/0008-There-are-three-SCO-devices.-Fallback-from-one-to-th.patch

@@ -1,7 +1,7 @@
-From 6a19995756f43d79a6cc5588849e6b4dbc537f92 Mon Sep 17 00:00:00 2001
+From bf9f035fc4466e6b9c290890ef59c2a0f598910c Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 13 Apr 2020 21:01:16 +0200
-Subject: [PATCH 08/26] There are three SCO devices. Fallback from one to the
+Subject: [PATCH 08/27] There are three SCO devices. Fallback from one to the
  others if needed
 
 Change-Id: I414dcb6b154855c00cb8520b23dc1069827864b2

patches_treble_td/platform_frameworks_av/0009-Add-persist.sys.phh.samsung.camera_ids-property-to-a.patch

@@ -1,7 +1,7 @@
-From 5b1cae905f25ba99cc7c85a94a519fb80fa9d5eb Mon Sep 17 00:00:00 2001
+From 51ee2c02c249cec676666e96c38ef490691472b8 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 14 May 2020 19:54:55 +0200
-Subject: [PATCH 09/26] Add persist.sys.phh.samsung.camera_ids property to
+Subject: [PATCH 09/27] Add persist.sys.phh.samsung.camera_ids property to
  access hidden Samsung cameras
 
 Change-Id: I2c7bf535272acc28ed2277e96c78ddd28a0b4593

patches_treble_td/platform_frameworks_av/0010-Add-a-property-to-force-camera-timestamp-source.patch

@@ -1,7 +1,7 @@
-From 2562c9ac80280aaaa4bad2faadc04a43251296be Mon Sep 17 00:00:00 2001
+From 0d20180865ec1cb65b2dc15a5413716699ba7e96 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 19 May 2020 14:01:14 +0200
-Subject: [PATCH 10/26] Add a property to force camera timestamp source
+Subject: [PATCH 10/27] 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

patches_treble_td/platform_frameworks_av/0011-FIH-devices-Fix-Earpiece-audio-output.patch

@@ -1,7 +1,7 @@
-From 85c4a39093b25f29812543429344fe0f4ae3df36 Mon Sep 17 00:00:00 2001
+From 775dc822264016796b73795df280c0a40906a3ae Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 24 Apr 2018 00:14:28 +0200
-Subject: [PATCH 11/26] FIH devices: Fix "Earpiece" audio output
+Subject: [PATCH 11/27] 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

patches_treble_td/platform_frameworks_av/0012-No-longer-make-re-assigning-legacy-audio-groups-fata.patch

@@ -1,7 +1,7 @@
-From 870ab4cd819f5e1fcd365f78eb3b878aed8cfb79 Mon Sep 17 00:00:00 2001
+From b0f09457da9d8ed272cc8cfb26763ea7ffa60a7d Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 12 Sep 2020 12:32:50 +0200
-Subject: [PATCH 12/26] No longer make re-assigning legacy audio groups fatal.
+Subject: [PATCH 12/27] No longer make re-assigning legacy audio groups fatal.
  Mi9 declares AUDIO_STREAM_PATCH and AUDIO_STREAM_REROUTING which is defined
  by framework too
 

patches_treble_td/platform_frameworks_av/0013-Make-camera-IDs-filter-out-optional.patch

@@ -1,7 +1,7 @@
-From 0f756fe5abcc7f88525d6c99ac6b1ba5c24a24a8 Mon Sep 17 00:00:00 2001
+From 60ae0874a3dcf3c41bbddc40438707ab5043b346 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 21 Dec 2020 20:19:11 +0100
-Subject: [PATCH 13/26] Make camera IDs filter-out optional
+Subject: [PATCH 13/27] Make camera IDs filter-out optional
 
 Nowadays most people have Camera 2 apps, and would like to have all
 cameras, rather than limit which cameras are available.

patches_treble_td/platform_frameworks_av/0014-Support-Samsung-R-multi-cams.patch

@@ -1,7 +1,7 @@
-From 16a72adcdbf2e9769deb88ed369d88a4103e7913 Mon Sep 17 00:00:00 2001
+From ce308a54ba2c124fe2f13b82cb3eec26ccb939a5 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 13 Mar 2021 14:20:03 -0500
-Subject: [PATCH 14/26] Support Samsung R multi-cams
+Subject: [PATCH 14/27] Support Samsung R multi-cams
 
 Change-Id: If46f385e8dd16185cbf37ab083e6a1242e1d1555
 ---

patches_treble_td/platform_frameworks_av/0015-Don-t-crash-on-unknown-audio-devices.patch

@@ -1,7 +1,7 @@
-From 6d192a969db7a9e24cd597f0f0f274390473cf5d Mon Sep 17 00:00:00 2001
+From a8dd44229768011b7796c963aa0cc4c34f663cbf Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 23 Mar 2021 00:16:42 +0100
-Subject: [PATCH 15/26] Don't crash on unknown audio devices
+Subject: [PATCH 15/27] Don't crash on unknown audio devices
 
 Change-Id: I2df8d88f742da6a84aa8888cdf19de25444de919
 ---

patches_treble_td/platform_frameworks_av/0016-Not-all-sources-in-a-route-are-valid.-Dont-ignore-th.patch

@@ -1,7 +1,7 @@
-From b2f7b7bbbd9eb1943c7f14bd2a9158c8ee10937d Mon Sep 17 00:00:00 2001
+From a12df382effb38dd39beafd75de33f4e3efeb6e7 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 28 Mar 2021 18:54:47 +0200
-Subject: [PATCH 16/26] Not all sources in a route are valid. Dont ignore the
+Subject: [PATCH 16/27] Not all sources in a route are valid. Dont ignore the
  whole route because of one broken source
 
 Change-Id: If8a51740e71bef3a4738262ad7b43a337b0ec36d

patches_treble_td/platform_frameworks_av/0017-Use-a-fake-volume-policy-when-none-has-been-found.patch

@@ -1,7 +1,7 @@
-From 71a2e7c525ff8c93a678c0c9baa3b43dc725de4c Mon Sep 17 00:00:00 2001
+From 08b6eef1e529f2ccc4e7f114b6ba8d658a587809 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 28 Mar 2021 14:48:49 +0200
-Subject: [PATCH 17/26] Use a fake volume policy when none has been found
+Subject: [PATCH 17/27] Use a fake volume policy when none has been found
 
 This is useful, because on Samsung devices, the "real"
 (=non-gsi-cheating) audio policy doesn't have any volume policy.

patches_treble_td/platform_frameworks_av/0018-When-aux-cameras-are-enabled-ignore-system-only-came.patch

@@ -1,7 +1,7 @@
-From 5809e5b3935b98d46a81e3e4fe684d878668d400 Mon Sep 17 00:00:00 2001
+From 1e5b723ba89f94976124da664d5524325f84c029 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 7 Aug 2021 11:11:39 +0200
-Subject: [PATCH 18/26] When aux cameras are enabled, ignore "system only"
+Subject: [PATCH 18/27] When aux cameras are enabled, ignore "system only"
  camera flag (it shouldnt be q security issue since secure cameras are listed
  otherwise)
 

patches_treble_td/platform_frameworks_av/0019-Revert-Remove-support-for-audio-HAL-V2-from-the-fram.patch

@@ -1,7 +1,7 @@
-From 8e3d68f0c713c4a759421a7981661bbde249e8ef Mon Sep 17 00:00:00 2001
+From e132448df71613b3f39390a392676db0847ce21e Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 11 Oct 2021 16:10:42 -0400
-Subject: [PATCH 19/26] Revert "Remove support for audio HAL V2 from the
+Subject: [PATCH 19/27] Revert "Remove support for audio HAL V2 from the
  framework"
 
 This reverts commit cbf517f837f7bf8a59f3ff8aa1e0e3e19612e251.

patches_treble_td/platform_frameworks_av/0020-Fix-parsing-audio-hal-7.0-audio-policies.patch

@@ -1,7 +1,7 @@
-From bbce086c423807c7b0566bf4a6167cd234ac1b8f Mon Sep 17 00:00:00 2001
+From ad429fa67055370b25424e5a1457e58df1406732 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 30 Jan 2022 07:40:19 -0500
-Subject: [PATCH 20/26] Fix parsing audio hal 7.0 audio policies
+Subject: [PATCH 20/27] Fix parsing audio hal 7.0 audio policies
 
 Google changed separator from natural "," to weird " "
 We broke its support in "FIH devices: Fix "Earpiece" audio output"

patches_treble_td/platform_frameworks_av/0021-fixup-Not-all-sources-in-a-route-are-valid.-Dont-ign.patch

@@ -1,7 +1,7 @@
-From dce9b06ef349b7f63fb048e20c6e537db290e53e Mon Sep 17 00:00:00 2001
+From af8dc4fe8272deb5350182390b307e757d1b2199 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 12 Mar 2022 18:07:43 -0500
-Subject: [PATCH 21/26] fixup! Not all sources in a route are valid. Dont
+Subject: [PATCH 21/27] fixup! Not all sources in a route are valid. Dont
  ignore the whole route because of one broken source
 
 ---

patches_treble_td/platform_frameworks_av/0022-Add-a-prop-to-change-Samsung-flash-strength.patch

@@ -1,7 +1,7 @@
-From 8e6856f46c09f34adde7f29d82a061b82f8ad061 Mon Sep 17 00:00:00 2001
+From 0fa119c66801a5e2a0fce1055bfbc261d65c00fb Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 16 Apr 2022 14:30:14 -0400
-Subject: [PATCH 22/26] Add a prop to change Samsung flash strength
+Subject: [PATCH 22/27] Add a prop to change Samsung flash strength
 
 ---
  services/camera/libcameraservice/Android.bp        |  1 +

patches_treble_td/platform_frameworks_av/0023-Support-variable-flash-strength-on-samsung-hal-4.0.patch

@@ -1,7 +1,7 @@
-From af599ed508e955ecf25492020b4f6f6bf08abdce Mon Sep 17 00:00:00 2001
+From 7ba94ce583e1ab8b6bf86f798865082bd1bd86e9 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 2 May 2022 17:37:09 -0400
-Subject: [PATCH 23/26] Support variable flash strength on samsung hal 4.0
+Subject: [PATCH 23/27] Support variable flash strength on samsung hal 4.0
 
 ---
  services/camera/libcameraservice/Android.bp                 | 1 +

patches_treble_td/platform_frameworks_av/0024-voip-Fix-high-pitched-voice-on-Qualcomm-devices.patch

@@ -1,7 +1,7 @@
-From 091266e8f3534f3fc0d20a0d8f14fa1ab3a1cab8 Mon Sep 17 00:00:00 2001
+From 5655807c950398807021c6cf82934cf021eb7c7d Mon Sep 17 00:00:00 2001
 From: ponces <ponces26@gmail.com>
 Date: Mon, 24 Oct 2022 09:38:34 +0100
-Subject: [PATCH 24/26] voip: Fix high pitched voice on Qualcomm devices
+Subject: [PATCH 24/27] voip: Fix high pitched voice on Qualcomm devices
 
 ---
  .../common/managerdefinitions/src/Serializer.cpp         | 9 +++++++++

patches_treble_td/platform_frameworks_av/0025-Fix-audio-hal-2.0-support.-Fixup-of-Revert-Remove-su.patch

@@ -1,7 +1,7 @@
-From c484da1761e5fa9df14b81ca95deaf51dcdd3a47 Mon Sep 17 00:00:00 2001
+From f88f786994d6a77e5e9a1646e37aa99a3ed7a21b Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 9 Nov 2022 17:10:52 -0500
-Subject: [PATCH 25/26] Fix audio hal 2.0 support. Fixup of Revert "Remove
+Subject: [PATCH 25/27] Fix audio hal 2.0 support. Fixup of Revert "Remove
  support for audio HAL V2 from the framework"
 
 ---

patches_treble_td/platform_frameworks_av/0026-Allow-uname-syscall-in-all-seccomp-This-is-needed-be.patch

@@ -0,0 +1,168 @@
+From 07dc1d61963fffbfdd53ea01fdacca83370bb9c9 Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Wed, 29 Mar 2023 16:53:18 -0400
+Subject: [PATCH 26/27] Allow uname syscall in all seccomp -- This is needed
+ because of the getCallingSid change in fw/n libbinder
+
+---
+ services/mediacodec/seccomp_policy/mediacodec-arm.policy        | 2 ++
+ services/mediacodec/seccomp_policy/mediacodec-arm64.policy      | 2 ++
+ services/mediacodec/seccomp_policy/mediacodec-x86.policy        | 2 ++
+ services/mediacodec/seccomp_policy/mediacodec-x86_64.policy     | 2 ++
+ services/mediacodec/seccomp_policy/mediaswcodec-arm.policy      | 2 ++
+ services/mediacodec/seccomp_policy/mediaswcodec-arm64.policy    | 2 ++
+ services/mediacodec/seccomp_policy/mediaswcodec-x86.policy      | 2 ++
+ services/mediacodec/seccomp_policy/mediaswcodec-x86_64.policy   | 2 ++
+ .../mediaextractor/seccomp_policy/mediaextractor-arm.policy     | 2 ++
+ .../mediaextractor/seccomp_policy/mediaextractor-arm64.policy   | 2 ++
+ .../mediaextractor/seccomp_policy/mediaextractor-x86.policy     | 2 ++
+ .../mediaextractor/seccomp_policy/mediaextractor-x86_64.policy  | 2 ++
+ 12 files changed, 24 insertions(+)
+
+diff --git a/services/mediacodec/seccomp_policy/mediacodec-arm.policy b/services/mediacodec/seccomp_policy/mediacodec-arm.policy
+index b4a9ff6249..aa6fc70d45 100644
+--- a/services/mediacodec/seccomp_policy/mediacodec-arm.policy
++++ b/services/mediacodec/seccomp_policy/mediacodec-arm.policy
+@@ -58,6 +58,8 @@ ugetrlimit: 1
+ getdents64: 1
+ getrandom: 1
+ 
++uname: 1
++
+ @include /system/etc/seccomp_policy/crash_dump.arm.policy
+ 
+ @include /system/etc/seccomp_policy/code_coverage.arm.policy
+diff --git a/services/mediacodec/seccomp_policy/mediacodec-arm64.policy b/services/mediacodec/seccomp_policy/mediacodec-arm64.policy
+index b4a9ff6249..aa6fc70d45 100644
+--- a/services/mediacodec/seccomp_policy/mediacodec-arm64.policy
++++ b/services/mediacodec/seccomp_policy/mediacodec-arm64.policy
+@@ -58,6 +58,8 @@ ugetrlimit: 1
+ getdents64: 1
+ getrandom: 1
+ 
++uname: 1
++
+ @include /system/etc/seccomp_policy/crash_dump.arm.policy
+ 
+ @include /system/etc/seccomp_policy/code_coverage.arm.policy
+diff --git a/services/mediacodec/seccomp_policy/mediacodec-x86.policy b/services/mediacodec/seccomp_policy/mediacodec-x86.policy
+index 4bcc077ce8..3a08ff6f09 100644
+--- a/services/mediacodec/seccomp_policy/mediacodec-x86.policy
++++ b/services/mediacodec/seccomp_policy/mediacodec-x86.policy
+@@ -69,5 +69,7 @@ sched_yield: 1
+ getpid: 1
+ gettid: 1
+ 
++uname: 1
++
+ @include /system/etc/seccomp_policy/crash_dump.x86.policy
+ @include /system/etc/seccomp_policy/code_coverage.x86.policy
+diff --git a/services/mediacodec/seccomp_policy/mediacodec-x86_64.policy b/services/mediacodec/seccomp_policy/mediacodec-x86_64.policy
+index 4bcc077ce8..3a08ff6f09 100644
+--- a/services/mediacodec/seccomp_policy/mediacodec-x86_64.policy
++++ b/services/mediacodec/seccomp_policy/mediacodec-x86_64.policy
+@@ -69,5 +69,7 @@ sched_yield: 1
+ getpid: 1
+ gettid: 1
+ 
++uname: 1
++
+ @include /system/etc/seccomp_policy/crash_dump.x86.policy
+ @include /system/etc/seccomp_policy/code_coverage.x86.policy
+diff --git a/services/mediacodec/seccomp_policy/mediaswcodec-arm.policy b/services/mediacodec/seccomp_policy/mediaswcodec-arm.policy
+index 41efce08b1..3c74e077c6 100644
+--- a/services/mediacodec/seccomp_policy/mediaswcodec-arm.policy
++++ b/services/mediacodec/seccomp_policy/mediaswcodec-arm.policy
+@@ -86,4 +86,6 @@ getegid32: 1
+ getgroups32: 1
+ sysinfo: 1
+ 
++uname: 1
++
+ @include /apex/com.android.media.swcodec/etc/seccomp_policy/code_coverage.arm.policy
+diff --git a/services/mediacodec/seccomp_policy/mediaswcodec-arm64.policy b/services/mediacodec/seccomp_policy/mediaswcodec-arm64.policy
+index 4317cccfdd..9d9b11538f 100644
+--- a/services/mediacodec/seccomp_policy/mediaswcodec-arm64.policy
++++ b/services/mediacodec/seccomp_policy/mediaswcodec-arm64.policy
+@@ -90,4 +90,6 @@ sysinfo: 1
+ setsockopt: 1
+ sendmsg: 1
+ 
++uname: 1
++
+ @include /apex/com.android.media.swcodec/etc/seccomp_policy/code_coverage.arm64.policy
+diff --git a/services/mediacodec/seccomp_policy/mediaswcodec-x86.policy b/services/mediacodec/seccomp_policy/mediaswcodec-x86.policy
+index 9bafe7bc55..4d9192cfe9 100644
+--- a/services/mediacodec/seccomp_policy/mediaswcodec-x86.policy
++++ b/services/mediacodec/seccomp_policy/mediaswcodec-x86.policy
+@@ -69,5 +69,7 @@ sched_yield: 1
+ getpid: 1
+ gettid: 1
+ 
++uname: 1
++
+ @include /apex/com.android.media.swcodec/etc/seccomp_policy/crash_dump.x86.policy
+ @include /apex/com.android.media.swcodec/etc/seccomp_policy/code_coverage.x86.policy
+diff --git a/services/mediacodec/seccomp_policy/mediaswcodec-x86_64.policy b/services/mediacodec/seccomp_policy/mediaswcodec-x86_64.policy
+index b0ed0402bb..607d8dadd8 100644
+--- a/services/mediacodec/seccomp_policy/mediaswcodec-x86_64.policy
++++ b/services/mediacodec/seccomp_policy/mediaswcodec-x86_64.policy
+@@ -69,5 +69,7 @@ sched_yield: 1
+ getpid: 1
+ gettid: 1
+ 
++uname: 1
++
+ @include /apex/com.android.media.swcodec/etc/seccomp_policy/crash_dump.x86_64.policy
+ @include /apex/com.android.media.swcodec/etc/seccomp_policy/code_coverage.x86_64.policy
+diff --git a/services/mediaextractor/seccomp_policy/mediaextractor-arm.policy b/services/mediaextractor/seccomp_policy/mediaextractor-arm.policy
+index e1f7fe7265..435f76cf9d 100644
+--- a/services/mediaextractor/seccomp_policy/mediaextractor-arm.policy
++++ b/services/mediaextractor/seccomp_policy/mediaextractor-arm.policy
+@@ -60,5 +60,7 @@ mremap: arg3 == 3 || arg3 == MREMAP_MAYMOVE
+ readlinkat: 1
+ _llseek: 1
+ 
++uname: 1
++
+ @include /apex/com.android.media/etc/seccomp_policy/crash_dump.arm.policy
+ @include /apex/com.android.media/etc/seccomp_policy/code_coverage.arm.policy
+diff --git a/services/mediaextractor/seccomp_policy/mediaextractor-arm64.policy b/services/mediaextractor/seccomp_policy/mediaextractor-arm64.policy
+index e54c9187e7..c2be7cf820 100644
+--- a/services/mediaextractor/seccomp_policy/mediaextractor-arm64.policy
++++ b/services/mediaextractor/seccomp_policy/mediaextractor-arm64.policy
+@@ -57,5 +57,7 @@ setsockopt: 1
+ sendmsg: 1
+ set_tid_address: 1
+ 
++uname: 1
++
+ @include /apex/com.android.media/etc/seccomp_policy/crash_dump.arm64.policy
+ @include /apex/com.android.media/etc/seccomp_policy/code_coverage.arm64.policy
+diff --git a/services/mediaextractor/seccomp_policy/mediaextractor-x86.policy b/services/mediaextractor/seccomp_policy/mediaextractor-x86.policy
+index 5b3762712d..5897402ca1 100644
+--- a/services/mediaextractor/seccomp_policy/mediaextractor-x86.policy
++++ b/services/mediaextractor/seccomp_policy/mediaextractor-x86.policy
+@@ -59,5 +59,7 @@ sched_yield: 1
+ getpid: 1
+ gettid: 1
+ 
++uname: 1
++
+ @include /apex/com.android.media/etc/seccomp_policy/crash_dump.x86.policy
+ @include /apex/com.android.media/etc/seccomp_policy/code_coverage.x86.policy
+diff --git a/services/mediaextractor/seccomp_policy/mediaextractor-x86_64.policy b/services/mediaextractor/seccomp_policy/mediaextractor-x86_64.policy
+index 51df1a238d..6846c01d0e 100644
+--- a/services/mediaextractor/seccomp_policy/mediaextractor-x86_64.policy
++++ b/services/mediaextractor/seccomp_policy/mediaextractor-x86_64.policy
+@@ -53,5 +53,7 @@ sched_yield: 1
+ getpid: 1
+ gettid: 1
+ 
++uname: 1
++
+ @include /apex/com.android.media/etc/seccomp_policy/crash_dump.x86_64.policy
+ @include /apex/com.android.media/etc/seccomp_policy/code_coverage.x86_64.policy
+-- 
+2.34.1
+

patches_treble_td/platform_frameworks_av/0027-audiopolicy-Fix-broken-mic-while-video-recording-on-.patch

@@ -1,7 +1,7 @@
-From fdd219ba505320ea7f065f8b1f3a8166c6847453 Mon Sep 17 00:00:00 2001
+From 587857dd7fe840aa86ce058c26d71baf1d86c1f0 Mon Sep 17 00:00:00 2001
 From: Alberto Ponces <ponces26@gmail.com>
 Date: Sun, 30 Apr 2023 23:29:04 +0100
-Subject: [PATCH 26/26] audiopolicy: Fix broken mic while video recording on
+Subject: [PATCH 27/27] audiopolicy: Fix broken mic while video recording on
  some Exynos devices This should fix
  https://github.com/phhusson/treble_experimentations/issues/2021 and
  https://github.com/phhusson/treble_experimentations/issues/2384. Credits to

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

@@ -1,7 +1,7 @@
-From 15e7893c7072a2d912a48dd2bec2b7ce368d6088 Mon Sep 17 00:00:00 2001
+From aba065a693525e5399cc8e60495b83d3df43ac35 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 5 Oct 2021 17:59:16 -0400
-Subject: [PATCH 01/36] Fallback to stupid autobrightness if brightness values
+Subject: [PATCH 01/38] Fallback to stupid autobrightness if brightness values
  are broken
 
 This is needed because of:

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

@@ -1,7 +1,7 @@
-From 5111abd8552dd2b97bc3ef436fc0b64001998a25 Mon Sep 17 00:00:00 2001
+From 17da9f9bedc15236713907ac9169364d2932e42b Mon Sep 17 00:00:00 2001
 From: Raphael Mounier <mounierr07@gmail.com>
 Date: Sat, 6 Aug 2022 18:08:36 +0200
-Subject: [PATCH 02/36] Fix env empty string - ANDROID_STORAGE
+Subject: [PATCH 02/38] Fix env empty string - ANDROID_STORAGE
 
 Huawei hi6250 define in init.hi6250.rc ANDROID_STORAGE to "", so check empty string and replace with default path. Apply change for all env directory
 ---

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

@@ -1,7 +1,7 @@
-From 4236c37fb14996fef7e8341ede0a939f6afe61a0 Mon Sep 17 00:00:00 2001
+From f615b0bd7ad658ec06d6610c81b2e64a065ebb14 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 28 Nov 2017 18:28:04 +0100
-Subject: [PATCH 03/36] Relax requirement for visible flag to sdcards
+Subject: [PATCH 03/38] Relax requirement for visible flag to sdcards
 
 The vast majority of sdcard readers are stable enough to be declared by
 the API. (I see no counter-example)

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

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

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

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

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

@@ -1,7 +1,7 @@
-From c069368112a6d809a9a67515139e816a6ac3df9f Mon Sep 17 00:00:00 2001
+From 8d0bd2d34fda0ebe3978bab80262fe16b1433102 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 6 Aug 2018 12:49:00 +0200
-Subject: [PATCH 06/36] Show APN Settings for CDMA carriers
+Subject: [PATCH 06/38] Show APN Settings for CDMA carriers
 
 ---
  telephony/java/android/telephony/CarrierConfigManager.java | 2 +-

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

@@ -1,7 +1,7 @@
-From 081b2db68c6e3e94ef5fc5ec661d65626b7398ea Mon Sep 17 00:00:00 2001
+From 7896ffbf9b94a6eb30567b615c9e1f8928ece263 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 8 Nov 2018 23:04:03 +0100
-Subject: [PATCH 07/36] Re-order services so that it works even without qtaguid
+Subject: [PATCH 07/38] Re-order services so that it works even without qtaguid
 
 Change-Id: I0c0f527b3ae151d45c68f7ac6c205da3f34e74df
 ---

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

@@ -1,7 +1,7 @@
-From f845026696358476f62d994469503a78c1708347 Mon Sep 17 00:00:00 2001
+From c895a000a184c877d34bc4121cce20811b331a24 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 24 Mar 2019 23:05:14 +0100
-Subject: [PATCH 08/36] Support samsung Pie and Q light hal
+Subject: [PATCH 08/38] Support samsung Pie and Q light hal
 
 Change-Id: I01f94acd7d0672733e48854d80368f9ac6f861c6
 ---

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

@@ -1,7 +1,7 @@
-From 03c4069fbc2b8293981720a511f254646dae55b7 Mon Sep 17 00:00:00 2001
+From 8d32a83ebd16e55651b00dfdaf9943739a2550ef Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 12 Aug 2019 23:08:26 +0200
-Subject: [PATCH 09/36] Add support for samsung touch, physical and hover
+Subject: [PATCH 09/38] Add support for samsung touch, physical and hover
  proximity sensor as fallback to real proximity sensor
 
 Change-Id: I7a0f8b4665c802140d19197d850b77b2a7ac1865

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

@@ -1,7 +1,7 @@
-From f2eb9f0bec676e79e8542d284c537c9fa13b34ff Mon Sep 17 00:00:00 2001
+From 046ee1b81708470cb74aacb02b26bdd810929b90 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 5 Apr 2020 16:32:46 +0200
-Subject: [PATCH 10/36] Always allow overriding the number of work profiles
+Subject: [PATCH 10/38] Always allow overriding the number of work profiles
 
 Change-Id: I6eb09aa71663c6fbe7563e3038bffcabdba0ff6a
 ---

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

@@ -1,7 +1,7 @@
-From 6f3a5b5a9e5e57e3866bc271a83ad8941f1bdd44 Mon Sep 17 00:00:00 2001
+From cf7d6c1af4fb6db11fb224c92b9f089f46060218 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 6 Jun 2020 18:21:56 +0200
-Subject: [PATCH 11/36] HOME deserves to wake-up devices just as well as back
+Subject: [PATCH 11/38] HOME deserves to wake-up devices just as well as back
  and menu
 
 Change-Id: Ia562bafd8c620d00c17e8eb338e4701c6c4a3c3a

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

@@ -1,7 +1,7 @@
-From 743c3b688e9fbfc793dfb1cf436097f395782807 Mon Sep 17 00:00:00 2001
+From 68d88bf9fdf99325b99071b994b7d097d96ec934 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 29 Sep 2020 22:39:47 +0200
-Subject: [PATCH 12/36] Some devices have proximity sensor reporting NaN as max
+Subject: [PATCH 12/38] Some devices have proximity sensor reporting NaN as max
  range for some reason. Make them behave standard way by setting 5 cm
 
 Change-Id: I3c39e3e914a05903c140235702e0480d2d58a612

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

@@ -1,7 +1,7 @@
-From ccd4514be6b981a828e8f87ca8a8927eb448327b Mon Sep 17 00:00:00 2001
+From 801a99dd02f7b2b269f21744ade5a738fa98a08e Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 29 Sep 2020 22:40:10 +0200
-Subject: [PATCH 13/36] Fix brightness range not being complete on Samsung
+Subject: [PATCH 13/38] Fix brightness range not being complete on Samsung
  devices
 
 On some devices, minimum brightness is 0, which totally messes with

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

@@ -1,7 +1,7 @@
-From f3a51f5d2f66f34e83db99606581e8975b1d0c14 Mon Sep 17 00:00:00 2001
+From e7ad6162412fa8400868a585fee042ad6fe00cc4 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 25 Oct 2020 23:57:26 +0100
-Subject: [PATCH 14/36] Re-implement fnmatch-like behaviour for RRO java-side
+Subject: [PATCH 14/38] Re-implement fnmatch-like behaviour for RRO java-side
 
 T: Also apply to FrameworkParsingPackageUtils (@PeterCxy)
 

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

@@ -1,7 +1,7 @@
-From bca6a22f8d31410f9eb3110e0b7449f26c0396a8 Mon Sep 17 00:00:00 2001
+From 6248679163fd630ff0a9e9b747fc479a29a27e20 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 11 Dec 2020 14:41:09 +0100
-Subject: [PATCH 15/36] Remove useless notification about "console" service
+Subject: [PATCH 15/38] Remove useless notification about "console" service
  being running
 
 ---

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

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

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

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

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

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

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

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

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

@@ -1,7 +1,7 @@
-From 58abbc1f534bc80d37afa671a61e3ad19a89e270 Mon Sep 17 00:00:00 2001
+From 5097053dfc152b2b540759c8f3655437cd93eed6 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 20 Mar 2021 14:31:01 +0100
-Subject: [PATCH 20/36] Automatically detect pick up sensor, so that an overlay
+Subject: [PATCH 20/38] Automatically detect pick up sensor, so that an overlay
  is required for the sole purpose of enabling pulse doze on pick up sensor
 
 ---

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

@@ -1,7 +1,7 @@
-From 41fd41f8738b4af84b3dbbd83db160a548ca9705 Mon Sep 17 00:00:00 2001
+From ef0f6464f2e2ebc2b7feb77a7c1cec70796f00a8 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 23 Mar 2021 19:43:26 +0100
-Subject: [PATCH 21/36] Catch broken mainBuiltInDisplayCutoutRectApproximation
+Subject: [PATCH 21/38] Catch broken mainBuiltInDisplayCutoutRectApproximation
 
 Some devices (Redmi Note 9T) have:
 mainBuiltInDisplayCutoutRectApproximation = @android:mainBuiltInDisplayCutout

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

@@ -1,7 +1,7 @@
-From bd838504833d00d0ba166deadfb402e2adce7e6f Mon Sep 17 00:00:00 2001
+From f833898f65bd07f61bee9319873b6e8806cc48d7 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 24 Mar 2018 08:01:48 +0100
-Subject: [PATCH 22/36] backlight: Fix backlight control on Galaxy S9(+)
+Subject: [PATCH 22/38] backlight: Fix backlight control on Galaxy S9(+)
 
 Change-Id: I1fbbb47939c377597ef8ad6b88b2acea5f4acaa6
 

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

@@ -1,7 +1,7 @@
-From 28f11c7bafdc29940b9bd3ca49f75303b7d97ae1 Mon Sep 17 00:00:00 2001
+From 6f8ed5c4319fe9b62db660b15fe794ea5716f24a Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 4 Sep 2021 08:26:30 +0000
-Subject: [PATCH 23/36] Revert "Switch long-press power behavior in AOSP."
+Subject: [PATCH 23/38] Revert "Switch long-press power behavior in AOSP."
 
 This reverts commit 803c77a0a24624111944832098c6f65158051dc4.
 ---
@@ -9,10 +9,10 @@ This reverts commit 803c77a0a24624111944832098c6f65158051dc4.
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
-index 91dd9179c329..96066bf60a5f 100644
+index f5ed2e508411..f015b485dfa6 100644
 --- a/core/res/res/values/config.xml
 +++ b/core/res/res/values/config.xml
-@@ -1083,7 +1083,7 @@
+@@ -1086,7 +1086,7 @@
              5 - Go to assistant (Settings.Secure.ASSISTANT)
              6 - Toggle torch on / off (if screen is off)
      -->
@@ -21,7 +21,7 @@ index 91dd9179c329..96066bf60a5f 100644
  
      <!-- The time in milliseconds after which a press on power button is considered "long". -->
      <integer name="config_longPressOnPowerDurationMs">500</integer>
-@@ -1115,7 +1115,7 @@
+@@ -1118,7 +1118,7 @@
              1 - Mute toggle
              2 - Global actions menu
      -->

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

@@ -1,7 +1,7 @@
-From 948060e0d47c7324cfd4ac77910d9bcb9e03c0a5 Mon Sep 17 00:00:00 2001
+From ba614ea5242cdec3349765d8e73360522f73c4df Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 27 Dec 2021 17:57:11 -0500
-Subject: [PATCH 24/36] Once we integrate Samsung Power hal in libpowermanager,
+Subject: [PATCH 24/38] Once we integrate Samsung Power hal in libpowermanager,
  libpowermanager and its deps require linking against
  vendor.samsung.hardware.miscpower@2.0
 

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

@@ -1,7 +1,7 @@
-From 292bc6431c2a32d750a0a5e97a3833ff81f94399 Mon Sep 17 00:00:00 2001
+From 489a3d36e5cc0f6cfff9b64f9837287611817df4 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 2 Apr 2022 18:04:01 -0400
-Subject: [PATCH 25/36] Allow disabling of fingerprint cleanups, needed on some
+Subject: [PATCH 25/38] Allow disabling of fingerprint cleanups, needed on some
  Realme devices that cant enumerate
 
 ---

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

@@ -1,7 +1,7 @@
-From 766c755564a764bb9934a94addc0e61156fe38f4 Mon Sep 17 00:00:00 2001
+From 8d1a0811322546ddc8a879b0b893dda756b27eaa Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 17 Dec 2021 17:16:14 -0500
-Subject: [PATCH 26/36] Reduce the size of udfps enroll progress bar. Some
+Subject: [PATCH 26/38] Reduce the size of udfps enroll progress bar. Some
  devices have their udfps pretty low, and the progress bar would make the icon
  at the wrong place
 

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

@@ -1,7 +1,7 @@
-From 0808d5fd7f8b8e2d1af3d9048e67fb5018398216 Mon Sep 17 00:00:00 2001
+From b656ec3bfb10ce6af8b9453148aee7b27ec8ee16 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 20 Dec 2021 15:01:41 -0500
-Subject: [PATCH 27/36] Dynamically resize boot animation to match screen size
+Subject: [PATCH 27/38] Dynamically resize boot animation to match screen size
 
 Change-Id: I54e49fc6b8c670103852e212d1416e27ff976205
 ---

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

@@ -1,7 +1,7 @@
-From 7630da97cd575007923bc90544bebfdada9aa442 Mon Sep 17 00:00:00 2001
+From 2d2755154abfedd0521959aaf6217917ae4c1bb5 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 15 Oct 2022 09:33:56 +0000
-Subject: [PATCH 28/36] Revert "Remove more FDE methods from StorageManager"
+Subject: [PATCH 28/38] Revert "Remove more FDE methods from StorageManager"
 
 This reverts commit bd13f84152449a3ead6fa8604fd31f48c0224676.
 ---

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

@@ -1,7 +1,7 @@
-From 21cc4681dddd9b26b9db885fd7074a0f6a225a7a Mon Sep 17 00:00:00 2001
+From 4d5546a8320037da1259944cfd1a3c5c1c92893e Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 3 Dec 2022 17:13:24 -0500
-Subject: [PATCH 29/36] Set old fingerprint sensors to security "strong"
+Subject: [PATCH 29/38] Set old fingerprint sensors to security "strong"
 
 This allows removing config_biometric_sensors from overlays, which led
 to Pixels not booting, because they are using AIDL biometric sensor, and

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

@@ -1,7 +1,7 @@
-From 2fd62edb166b5a5392ae43b47602888427721d8a Mon Sep 17 00:00:00 2001
+From c37ec2c90d0483fa02be820fdee555312ea5eb45 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 14 Dec 2022 17:21:00 -0500
-Subject: [PATCH 30/36] Call Samsung's ISehSysInputDev to report screen state
+Subject: [PATCH 30/38] Call Samsung's ISehSysInputDev to report screen state
  to touchscreen driver
 
 This fixes touchscreen not waking up on Galaxy F23

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

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

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

@@ -1,7 +1,7 @@
-From 2791003adb0d155a17fa663fb58265a86b653ab8 Mon Sep 17 00:00:00 2001
+From d0ebcd15cbdec953bc7bd74f05eac0a42a67586e Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 18 Dec 2022 18:20:40 -0500
-Subject: [PATCH 32/36] FOD support for Asus ZF8 and Samsung devices
+Subject: [PATCH 32/38] FOD support for Asus ZF8 and Samsung devices
 
 Thanks Asus for providing a free device to make this support
 And thanks @davigamer987 for donating enough to get a Samsung FOD device

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

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

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

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

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

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

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

@@ -1,7 +1,7 @@
-From 58f6ed39c0f2bc90db6920e025ae59b04e0fa9e3 Mon Sep 17 00:00:00 2001
+From efec390e1f59e2c8c74b8f099795e2e786c6ac32 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 2 Jun 2023 19:19:31 -0400
-Subject: [PATCH 36/36] Try catch around constrainNitsAndBacklightArrays, and
+Subject: [PATCH 36/38] Try catch around constrainNitsAndBacklightArrays, and
  falls back to dumb curve. It crashes on Xperia 1 IV.
 
 ---

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

@@ -0,0 +1,125 @@
+From 0a0a7d47277f2dad18718fb3f8b3829798a49cf0 Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Sat, 17 Jun 2023 08:31:55 -0400
+Subject: [PATCH 37/38] Add Mediatek power hints on touch
+
+Mediatek has multiple HALs (which existed concurrently), so it is a bit
+of a mess.
+From what I can tell, mOldMtkPerf is used on Android 10 vendors, while
+mMtkPerf is used on Android 11/12 vendors.
+If anyone has an Android 9 vendor and want to take a look, I think it
+would be something like this:
+vendor.mediatek.hardware.power.V2_0.IPower.powerHint()
+
+On some devices, sending the touch boost isn't very helpful. Our guess
+is that Android 12 rendering got a lot heavier, and then touch boost is
+not enough. So, we add a property to /cheat/ and report a bigger boost:
+APP_ROTATE.
+On the few devices we've seen, touch boost only boosts scheduler, while
+app rotate will also for cpu min frequency.
+Experimentally using this app rotate boost indeed makes the device much
+smoother.
+
+Change-Id: I92729336e8a27b925a1c3aede24c95e971d41b88
+---
+ services/core/Android.bp                      |  1 +
+ .../com/android/server/wm/DisplayPolicy.java  | 50 +++++++++++++++++++
+ 2 files changed, 51 insertions(+)
+
+diff --git a/services/core/Android.bp b/services/core/Android.bp
+index c4c8ee1f565a..8514ad55da09 100644
+--- a/services/core/Android.bp
++++ b/services/core/Android.bp
+@@ -175,6 +175,7 @@ java_library_static {
+         "overlayable_policy_aidl-java",
+         "com.android.sysprop.watchdog",
+         // HIDL
++        "vendor.mediatek.hardware.mtkpower-V1.1-java",
+         "vendor.samsung.hardware.sysinput-V1.2-java",
+         "vendor.goodix.hardware.biometrics.fingerprint-V2.1-java",
+         "vendor.samsung.hardware.biometrics.fingerprint-V3.0-java",
+diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java
+index 6921c5eaf2b0..8b892f1f4f87 100644
+--- a/services/core/java/com/android/server/wm/DisplayPolicy.java
++++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
+@@ -221,6 +221,9 @@ public class DisplayPolicy {
+     private boolean mCanSystemBarsBeShownByUser;
+     private boolean mNavButtonForcedVisible;
+ 
++    private vendor.mediatek.hardware.mtkpower.V1_1.IMtkPerf mMtkPerf;
++    private vendor.mediatek.hardware.mtkpower.V1_0.IMtkPower mOldMtkPerf;
++
+     StatusBarManagerInternal getStatusBarManagerInternal() {
+         synchronized (mServiceAcquireLock) {
+             if (mStatusBarManagerInternal == null) {
+@@ -473,6 +476,20 @@ public class DisplayPolicy {
+             mScreenOnEarly = true;
+             mScreenOnFully = true;
+         }
++        try {
++            mMtkPerf = vendor.mediatek.hardware.mtkpower.V1_1.IMtkPerf.getService();
++        } catch(Throwable t) {
++            android.util.Log.d("PHH-Power", "Retrieving mtkpower 1.0", t);
++            mMtkPerf = null;
++        }
++
++        try {
++            mOldMtkPerf = vendor.mediatek.hardware.mtkpower.V1_0.IMtkPower.getService();
++        } catch(Throwable t) {
++            android.util.Log.d("PHH-Power", "Retrieving mtkpower 1.0", t);
++            mOldMtkPerf = null;
++        }
++
+ 
+         final Looper looper = UiThread.getHandler().getLooper();
+         mHandler = new PolicyHandler(looper);
+@@ -552,6 +569,17 @@ public class DisplayPolicy {
+                             mService.mPowerManagerInternal.setPowerBoost(
+                                     Boost.INTERACTION, duration);
+                         }
++                        if(mOldMtkPerf != null) {
++                            try {
++                                android.util.Log.d("PHH-Power", "mtk1 fling power hint");
++                                int hint = 36; // MTKPOWER_HINT_APP_TOUCH
++                                if("rotate".equals(SystemProperties.get("persist.sys.phh.touch_hint")))
++                                        hint = 35; // MTKPOWER_HINT_APP_ROTATE
++                                mOldMtkPerf.mtkPowerHint(hint, duration);
++                            } catch(Throwable t) {
++                                android.util.Log.d("PHH-Power", "Failed sending touch power hint", t);
++                            }
++                        }
+                     }
+ 
+                     @Override
+@@ -570,6 +598,28 @@ public class DisplayPolicy {
+                         if (listener != null) {
+                             listener.onTouchStart();
+                         }
++                        if(mMtkPerf != null) {
++                            try {
++                                android.util.Log.d("PHH-Power", "mtk power hint");
++                                int hint = 25; //MTKPOWER_HINT_APP_TOUCH
++                                if("rotate".equals(SystemProperties.get("persist.sys.phh.touch_hint")))
++                                        hint = 24; // MTKPOWER_HINT_APP_ROTATE
++                                mMtkPerf.perfCusLockHint(hint, 1000);
++                            } catch(Throwable t) {
++                                android.util.Log.d("PHH-Power", "Failed sending touch power hint", t);
++                            }
++                        }
++                        if(mOldMtkPerf != null) {
++                            try {
++                                android.util.Log.d("PHH-Power", "mtk1 power hint");
++                                int hint = 36; // MTKPOWER_HINT_APP_TOUCH
++                                if("rotate".equals(SystemProperties.get("persist.sys.phh.touch_hint")))
++                                        hint = 35; // MTKPOWER_HINT_APP_ROTATE
++                                mOldMtkPerf.mtkPowerHint(hint, 1000);
++                            } catch(Throwable t) {
++                                android.util.Log.d("PHH-Power", "Failed sending touch power hint", t);
++                            }
++                        }
+                     }
+ 
+                     @Override
+-- 
+2.34.1
+

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

@@ -0,0 +1,48 @@
+From 9d2acab3eb291d7df535ab3e164909fd2a476b98 Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Wed, 5 Jul 2023 10:50:36 -0400
+Subject: [PATCH 38/38] Detect Moto dynamic hardware feature
+
+Moto added a custom node in sysconfig XMLs:
+<unavailable-feature-conditional />
+This node reads a property and enables a feature based on it.
+
+Take those into account to enable NFC on Moto devices which have
+NFC-less variants
+---
+ .../java/com/android/server/SystemConfig.java | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+diff --git a/core/java/com/android/server/SystemConfig.java b/core/java/com/android/server/SystemConfig.java
+index 00b01051adae..ffcc75e63d66 100644
+--- a/core/java/com/android/server/SystemConfig.java
++++ b/core/java/com/android/server/SystemConfig.java
+@@ -979,6 +979,25 @@ public class SystemConfig {
+                         }
+                         XmlUtils.skipCurrentTag(parser);
+                     } break;
++                    case "unavailable-feature-conditional": {
++                        if (allowFeatures) {
++                            String fname = parser.getAttributeValue(null, "name");
++                            String prop = parser.getAttributeValue(null, "prop");
++                            if (fname == null || prop == null) {
++                                Slog.w(TAG, "<" + name + "> without name in " + permFile
++                                        + " at " + parser.getPositionDescription());
++                            } else {
++                                if(android.os.SystemProperties.getBoolean(prop, false)) {
++                                    addFeature(fname, 0);
++                                } else {
++                                    mUnavailableFeatures.add(fname);
++                                }
++                            }
++                        } else {
++                            logNotAllowedInPartition(name, permFile, parser);
++                        }
++                        XmlUtils.skipCurrentTag(parser);
++                    } break;
+                     case "allow-in-power-save-except-idle": {
+                         if (allowOverrideAppRestrictions) {
+                             String pkgname = parser.getAttributeValue(null, "package");
+-- 
+2.34.1
+