Changes for July 2023

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/vendor_lineage/0001-vendor_lineage-Commonly-build-some-packages.patch

@@ -1,4 +1,4 @@
-From d20969f3b2cbc3e913bdc7e0dffaa5ed344f218a Mon Sep 17 00:00:00 2001
+From b83d78fc23a42ae844062ae3a953ae7426f2cf58 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 24 Sep 2022 11:40:52 +0000
 Subject: [PATCH 1/2] vendor_lineage: Commonly build some packages
@@ -8,32 +8,41 @@ Contacts, DeskClock, Gallery2, SettingsIntelligence, fwb overlays
 
 Change-Id: I00cc5918164ed70c612c5caa31eb8d2d0cd05b62
 ---
- config/common_mobile.mk | 7 ++++++-
+ config/common_full.mk   | 3 +++
- 1 file changed, 6 insertions(+), 1 deletion(-)
+ config/common_mobile.mk | 4 +++-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
 
-diff --git a/config/common_mobile.mk b/config/common_mobile.mk
+diff --git a/config/common_full.mk b/config/common_full.mk
-index 547804ce..6487e727 100644
+index 029ea068..a30b2523 100644
---- a/config/common_mobile.mk
+--- a/config/common_full.mk
-+++ b/config/common_mobile.mk
++++ b/config/common_full.mk
-@@ -10,12 +10,17 @@ PRODUCT_PRODUCT_PROPERTIES += \
+@@ -10,8 +10,11 @@ $(call inherit-product-if-exists, external/google-fonts/rubik/fonts.mk)
+ # Apps
  PRODUCT_PACKAGES += \
      Aperture \
-     Backgrounds \
 +    Contacts \
 +    DeskClock \
      Eleven \
      Etar \
-     ExactCalculator \
 +    Gallery2 \
-     Jelly \
      Profiles \
--    Seedvault
+     Recorder \
-+    Seedvault \
+     Seedvault
+diff --git a/config/common_mobile.mk b/config/common_mobile.mk
+index fc5a864b..e2f2ada2 100644
+--- a/config/common_mobile.mk
++++ b/config/common_mobile.mk
+@@ -16,7 +16,9 @@ PRODUCT_PRODUCT_PROPERTIES += \
+ PRODUCT_PACKAGES += \
+     Backgrounds \
+     ExactCalculator \
+-    Jelly
++    Jelly \
 +    SettingsIntelligence \
 +    frameworks-base-overlays
  
- ifneq ($(TARGET_EXCLUDES_AUDIOFX),true)
+ ifeq ($(PRODUCT_TYPE), go)
  PRODUCT_PACKAGES += \
 -- 
-2.25.1
+2.34.1
 

patches_treble/vendor_lineage/0002-vendor_lineage-Disable-ADB-authentication.patch

@@ -1,4 +1,4 @@
-From 5e40aa0d5977938ffcd1f788c2bbc8d2707631b5 Mon Sep 17 00:00:00 2001
+From eb4abffdd8e4cd692ebd0edef1a874fca6b46357 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Tue, 19 Oct 2021 15:48:43 +0000
 Subject: [PATCH 2/2] vendor_lineage: Disable ADB authentication
@@ -9,7 +9,7 @@ Change-Id: I4370583ecab1c88ef6f42e29d3eaa52c24d13f09
  1 file changed, 5 deletions(-)
 
 diff --git a/config/common.mk b/config/common.mk
-index bb84f0cd..a6703855 100644
+index 18413708..f98e5616 100644
 --- a/config/common.mk
 +++ b/config/common.mk
 @@ -13,16 +13,11 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
@@ -30,5 +30,5 @@ index bb84f0cd..a6703855 100644
  # Backup Tool
  PRODUCT_COPY_FILES += \
 -- 
-2.25.1
+2.34.1