Changes for July 2022, syncing up to v415

patches_platform/vendor_lineage/0001-vendor_lineage-Log-privapp-permissions-whitelist-vio.patch

@@ -1,4 +1,4 @@
-From e1dc1797dff7d100154071384be787816b28a5ae Mon Sep 17 00:00:00 2001
+From 7a007cb8e518381d98d620a9d71ae6d7fe86304e Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Thu, 5 Sep 2019 02:08:22 +0000
 Subject: [PATCH 1/2] vendor_lineage: Log privapp-permissions whitelist
@@ -10,12 +10,12 @@ Change-Id: I49dba61f332253e291a65e79ca70d9a07d45bb07
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/config/common.mk b/config/common.mk
-index 913d36fb..9cf7f816 100644
+index 436fb2f1..81bbffbd 100644
 --- a/config/common.mk
 +++ b/config/common.mk
-@@ -78,9 +78,9 @@ PRODUCT_COPY_FILES += \
+@@ -74,9 +74,9 @@ PRODUCT_COPY_FILES += \
- PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
+ PRODUCT_COPY_FILES += \
-     persist.wm.enable_remote_keyguard_animation=0
+     vendor/lineage/config/permissions/org.lineageos.android.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/org.lineageos.android.xml
  
 -# Enforce privapp-permissions whitelist
 +# Log privapp-permissions whitelist violations

patches_platform/vendor_lineage/0002-Revert-overlay-Default-to-night-mode.patch

@@ -1,4 +1,4 @@
-From a57f80f3a5570710a915141687eac995b52aa486 Mon Sep 17 00:00:00 2001
+From d5776b7e2edf66e2a03d79863c20c82da8a98bd5 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Mon, 14 Mar 2022 03:44:59 +0000
 Subject: [PATCH 2/2] Revert "overlay: Default to night mode"
@@ -11,10 +11,10 @@ Change-Id: I036bdd576e536392cf41e3c536d5ca2eb04e5a0f
  1 file changed, 8 deletions(-)
 
 diff --git a/overlay/common/frameworks/base/core/res/res/values/config.xml b/overlay/common/frameworks/base/core/res/res/values/config.xml
-index 19104aa4..337c3f9f 100644
+index ee5bc917..4a4ae958 100644
 --- a/overlay/common/frameworks/base/core/res/res/values/config.xml
 +++ b/overlay/common/frameworks/base/core/res/res/values/config.xml
-@@ -144,12 +144,4 @@
+@@ -155,12 +155,4 @@
      <bool name="config_supportsMicToggle">true</bool>
      <!-- Whether this device is supporting the camera toggle -->
      <bool name="config_supportsCamToggle">true</bool>

patches_platform_personal/frameworks_base/0001-Add-MiuiNavbarOverlay.patch

@@ -1,7 +1,7 @@
-From d74d1cb657dcee5ff59ca3b5ee3564db7afa6a66 Mon Sep 17 00:00:00 2001
+From 25d9150d8e100259647ba248fdc13ccd23497137 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 20 Jun 2021 03:39:32 +0000
-Subject: [PATCH 01/17] Add MiuiNavbarOverlay
+Subject: [PATCH 01/19] Add MiuiNavbarOverlay
 
 Change-Id: I0e6791abc3c9521d7dc612df2fec2b041affe7e9
 ---

patches_platform_personal/frameworks_base/0002-Disable-Bluetooth-by-default.patch

@@ -0,0 +1,26 @@
+From 05ac45a37799322ddb9774326359a3414fb7f8d8 Mon Sep 17 00:00:00 2001
+From: Hikari-no-Tenshi <kyryljan.serhij@gmail.com>
+Date: Thu, 30 Jan 2020 22:20:54 +0200
+Subject: [PATCH 02/19] Disable Bluetooth by default
+
+Change-Id: Iea5d24f977928bf01cd7a46b98c75c0a4bd6a23c
+---
+ packages/SettingsProvider/res/values/defaults.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml
+index 8e6e251ff3f2..53324ba4d966 100644
+--- a/packages/SettingsProvider/res/values/defaults.xml
++++ b/packages/SettingsProvider/res/values/defaults.xml
+@@ -36,7 +36,7 @@
+     <fraction name="def_window_transition_scale">100%</fraction>
+     <bool name="def_haptic_feedback">true</bool>
+ 
+-    <bool name="def_bluetooth_on">true</bool>
++    <bool name="def_bluetooth_on">false</bool>
+     <bool name="def_wifi_display_on">false</bool>
+     <bool name="def_install_non_market_apps">false</bool>
+     <!-- 0 == off, 3 == on -->
+-- 
+2.25.1
+

patches_platform_personal/frameworks_base/0003-Disable-cursor-drag-by-default-for-editable-TextView.patch

@@ -1,7 +1,7 @@
-From c01a32795448437e5bf624fc4c2c4e31108c4566 Mon Sep 17 00:00:00 2001
+From 21208235ad12f038f80f22416992ada15d1a3868 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Mon, 27 Sep 2021 16:30:00 +0000
-Subject: [PATCH 02/17] Disable cursor drag by default for editable TextViews
+Subject: [PATCH 03/19] Disable cursor drag by default for editable TextViews
 
 Requested by @TadiT7
 

patches_platform_personal/frameworks_base/0004-Disable-FP-lockouts.patch

@@ -1,7 +1,7 @@
-From b4ca2e090b7a049691be56bda35c36f51c201f1d Mon Sep 17 00:00:00 2001
+From 938658e1a31d80907f8f3f616710b27efb5aa74f Mon Sep 17 00:00:00 2001
 From: AndyCGYan <GeForce8800Ultra@gmail.com>
 Date: Fri, 22 Mar 2019 00:41:20 +0800
-Subject: [PATCH 03/17] Disable FP lockouts
+Subject: [PATCH 04/19] Disable FP lockouts
 
 Both timed and permanent lockouts - GET THE FUCK OUT
 Now targeting LockoutFramework, introduced in Android 12

patches_platform_personal/frameworks_base/0005-Disable-RESTRICTED-bucket-toast.patch

@@ -0,0 +1,40 @@
+From 4a72033948d6fb7bbef8b4c4233d0f8077f83ae1 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sun, 3 Jul 2022 00:08:42 +0000
+Subject: [PATCH 05/19] Disable "RESTRICTED bucket" toast
+
+Change-Id: I20a328d3c77962f3a6095bfca42d0b165a093ce8
+---
+ .../server/usage/AppStandbyController.java       | 16 +---------------
+ 1 file changed, 1 insertion(+), 15 deletions(-)
+
+diff --git a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
+index 4b081d258fd4..ded38c55325a 100644
+--- a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
++++ b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
+@@ -1493,21 +1493,7 @@ public class AppStandbyController
+                         .noteRestrictionAttempt(packageName, userId, elapsedRealtime, reason);
+ 
+                 if (isForcedByUser) {
+-                    // Only user force can bypass the delay restriction. If the user forced the
+-                    // app into the RESTRICTED bucket, then a toast confirming the action
+-                    // shouldn't be surprising.
+-                    if (Build.IS_DEBUGGABLE) {
+-                        Toast.makeText(mContext,
+-                                // Since AppStandbyController sits low in the lock hierarchy,
+-                                // make sure not to call out with the lock held.
+-                                mHandler.getLooper(),
+-                                mContext.getResources().getString(
+-                                        R.string.as_app_forced_to_restricted_bucket, packageName),
+-                                Toast.LENGTH_SHORT)
+-                                .show();
+-                    } else {
+-                        Slog.i(TAG, packageName + " restricted by user");
+-                    }
++                    Slog.i(TAG, packageName + " restricted by user");
+                 } else {
+                     final long timeUntilRestrictPossibleMs = app.lastUsedByUserElapsedTime
+                             + mInjector.getAutoRestrictedBucketDelayMs() - elapsedRealtime;
+-- 
+2.25.1
+

patches_platform_personal/frameworks_base/0006-Keyguard-Adjust-clock-style.patch

@@ -1,7 +1,7 @@
-From 895cde345dd8b0126ca9081ece183b873ded0d47 Mon Sep 17 00:00:00 2001
+From f8b17ff4c88c210606c33bf9c622c1b9ee99153e Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Thu, 2 Sep 2021 16:15:19 +0000
-Subject: [PATCH 04/17] Keyguard: Adjust clock style
+Subject: [PATCH 06/19] Keyguard: Adjust clock style
 
 Thinner font, less padding and unintrusive colors
 

patches_platform_personal/frameworks_base/0007-Keyguard-Hide-padlock-unless-UDFPS-is-in-use.patch

@@ -1,7 +1,7 @@
-From 4a8a2dd5f300a8bac754508011e83244a1825638 Mon Sep 17 00:00:00 2001
+From 5dc1b1b3954e77640b15dc5a9f850c2048060595 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 2 Nov 2019 06:41:03 +0000
-Subject: [PATCH 05/17] Keyguard: Hide padlock unless UDFPS is in use
+Subject: [PATCH 07/19] Keyguard: Hide padlock unless UDFPS is in use
 
 Fair enough Google, but don't give me that otherwise
 

patches_platform_personal/frameworks_base/0008-Keyguard-Never-switch-to-large-clock.patch

@@ -1,7 +1,7 @@
-From 950789a6a39f79506dd05c293f2edb709710810e Mon Sep 17 00:00:00 2001
+From 19bce23d94b7a5288cadc6523371b5155422808a Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Wed, 1 Sep 2021 14:41:53 +0000
-Subject: [PATCH 06/17] Keyguard: Never switch to large clock
+Subject: [PATCH 08/19] Keyguard: Never switch to large clock
 
 It looks alright actually, but as always breaks under landscape
 

patches_platform_personal/frameworks_base/0009-Keyguard-Refine-indication-text.patch

@@ -1,7 +1,7 @@
-From 096def92c7e4ff40d1bee39e27f57ca858957324 Mon Sep 17 00:00:00 2001
+From 595b07a5e1d1f446dea60072eb5fd35945aee741 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 2 Nov 2019 08:31:36 +0000
-Subject: [PATCH 07/17] Keyguard: Refine indication text
+Subject: [PATCH 09/19] Keyguard: Refine indication text
 
 Change-Id: Ib771c35610f712a1de34736e817bcfe616ac37d8
 ---
@@ -9,9 +9,9 @@ Change-Id: Ib771c35610f712a1de34736e817bcfe616ac37d8
  .../SystemUI/res/layout/keyguard_bottom_area.xml     |  1 +
  packages/SystemUI/res/values/dimens.xml              |  3 +--
  .../KeyguardIndicationRotateTextViewController.java  | 12 +++++++++++-
- .../statusbar/KeyguardIndicationController.java      |  5 ++---
+ .../statusbar/KeyguardIndicationController.java      |  7 ++++---
  .../statusbar/phone/KeyguardIndicationTextView.java  |  2 +-
- 6 files changed, 16 insertions(+), 9 deletions(-)
+ 6 files changed, 18 insertions(+), 9 deletions(-)
 
 diff --git a/packages/SystemUI/res-keyguard/values/styles.xml b/packages/SystemUI/res-keyguard/values/styles.xml
 index 7f47e274304a..bb6c56455d72 100644
@@ -84,7 +84,7 @@ index d73d9cdb7d40..a7a23032963a 100644
       * Clears all messages in the queue and sets the current message to an empty string.
       */
 diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
-index d7b4738340e6..e4f01184e0d8 100644
+index d7b4738340e6..d89440057975 100644
 --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
 +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
 @@ -471,12 +471,11 @@ public class KeyguardIndicationController {
@@ -102,6 +102,19 @@ index d7b4738340e6..e4f01184e0d8 100644
                              .setTextColor(mInitialTextColorState)
                              .build(),
                      false);
+@@ -861,10 +860,12 @@ public class KeyguardIndicationController {
+         public void handleMessage(Message msg) {
+             if (msg.what == MSG_HIDE_TRANSIENT) {
+                 hideTransientIndication();
++                updatePersistentIndications(false /* animate */, KeyguardUpdateMonitor.getCurrentUser());
+             } else if (msg.what == MSG_SHOW_ACTION_TO_UNLOCK) {
+                 showActionToUnlock();
+             } else if (msg.what == MSG_HIDE_BIOMETRIC_MESSAGE) {
+                 hideBiometricMessage();
++                updatePersistentIndications(false /* animate */, KeyguardUpdateMonitor.getCurrentUser());
+             }
+         }
+     };
 diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java
 index 339f371c0d12..bd1432303463 100644
 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java

patches_platform_personal/frameworks_base/0010-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch

@@ -1,7 +1,7 @@
-From 8ce58e00f60ce8a9c28b8d1ce4dcaa656e51cc51 Mon Sep 17 00:00:00 2001
+From d1f90b64712601d17974e3651fa709e409f171d6 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 20 Mar 2021 10:35:14 +0000
-Subject: [PATCH 08/17] Keyguard/UI: Fix status bar / quick settings margins
+Subject: [PATCH 10/19] Keyguard/UI: Fix status bar / quick settings margins
  and paddings
 
 Last revised on 2022/03/13, targeting s-v2
@@ -139,10 +139,10 @@ index aa59fd6a9b51..a55c394a3e53 100644
      <!-- Additional translation (downwards) for appearing notifications when going to the full shade
           from Keyguard. -->
 diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
-index ec31c4cd942b..936a1f98f767 100644
+index 5d3539b66141..a93c71987855 100644
 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
 +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
-@@ -93,6 +93,10 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu
+@@ -98,6 +98,10 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu
      private StatusBarContentInsetsProvider mInsetsProvider;
  
      private int mRoundedCornerPadding = 0;
@@ -153,7 +153,7 @@ index ec31c4cd942b..936a1f98f767 100644
      private int mWaterfallTopInset;
      private int mCutOutPaddingLeft;
      private int mCutOutPaddingRight;
-@@ -259,6 +263,11 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu
+@@ -271,6 +275,11 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu
              mRoundedCornerPadding = resources.getDimensionPixelSize(
                      R.dimen.rounded_corner_content_padding);
  
@@ -165,7 +165,7 @@ index ec31c4cd942b..936a1f98f767 100644
          int qsOffsetHeight = SystemBarUtils.getQuickQsOffsetHeight(mContext);
  
          mDatePrivacyView.getLayoutParams().height =
-@@ -346,6 +355,9 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu
+@@ -358,6 +367,9 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu
                  .addFloat(mDateView, "alpha", 0, 0, 1)
                  .addFloat(mClockDateView, "alpha", 1, 0, 0)
                  .addFloat(mQSCarriers, "alpha", 0, 1)
@@ -175,7 +175,7 @@ index ec31c4cd942b..936a1f98f767 100644
                  .setListener(new TouchAnimator.ListenerAdapter() {
                      @Override
                      public void onAnimationAtEnd() {
-@@ -451,8 +463,6 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu
+@@ -463,8 +475,6 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu
                  .getStatusBarContentInsetsForCurrentRotation();
          boolean hasCornerCutout = mInsetsProvider.currentRotationHasCornerCutout();
  
@@ -184,7 +184,7 @@ index ec31c4cd942b..936a1f98f767 100644
          LinearLayout.LayoutParams datePrivacySeparatorLayoutParams =
                  (LinearLayout.LayoutParams) mDatePrivacySeparator.getLayoutParams();
          LinearLayout.LayoutParams mClockIconsSeparatorLayoutParams =
-@@ -516,34 +526,37 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu
+@@ -528,34 +538,37 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu
      private void updateHeadersPadding() {
          setContentMargins(mDatePrivacyView, 0, 0);
          setContentMargins(mStatusIconsView, 0, 0);

patches_platform_personal/frameworks_base/0011-Replace-NTP-server.patch

@@ -1,7 +1,7 @@
-From 7ac21db0fa546257587e7d39f496e33be2835049 Mon Sep 17 00:00:00 2001
+From bfd123cf8cd9c926838c95d0a2eaf3a034cd359a Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 17 Apr 2022 08:48:42 +0000
-Subject: [PATCH 09/17] Replace NTP server
+Subject: [PATCH 11/19] Replace NTP server
 
 Change-Id: I938ab46026d841e7536d8fc02b0ef6b28ebb6ea1
 ---
@@ -9,7 +9,7 @@ Change-Id: I938ab46026d841e7536d8fc02b0ef6b28ebb6ea1
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
-index e4e7243bbb76..d7872f457b34 100644
+index 60a4e15d93ec..999e5b95003c 100644
 --- a/core/res/res/values/config.xml
 +++ b/core/res/res/values/config.xml
 @@ -2246,7 +2246,7 @@

patches_platform_personal/frameworks_base/0012-Revert-SystemUI-Add-left-padding-for-keyguard-slices.patch

@@ -1,7 +1,7 @@
-From 29f205b99483c357c5186795da3f4a935ae1362c Mon Sep 17 00:00:00 2001
+From 529ab35d8bff56cacbf77689fde2bbb4e720fa0a Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Tue, 31 May 2022 00:00:08 +0000
-Subject: [PATCH 10/17] Revert "SystemUI: Add left padding for keyguard slices"
+Subject: [PATCH 12/19] Revert "SystemUI: Add left padding for keyguard slices"
 
 This reverts commit 4a7a4426944e28e70a3eca6a696ff6c7599fb896.
 ---

patches_platform_personal/frameworks_base/0013-Revert-Update-RAT-icons-to-match-Silk-design.patch

@@ -1,7 +1,7 @@
-From 2ca4a9aba74165e037de2434b64108138d145328 Mon Sep 17 00:00:00 2001
+From 243c196f3e5bacc8c05cbc7632f2846445836759 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 5 Sep 2021 01:20:12 +0000
-Subject: [PATCH 11/17] Revert "Update RAT icons to match Silk design"
+Subject: [PATCH 13/19] Revert "Update RAT icons to match Silk design"
 
 This reverts commit 084c13c8216f6a899cd3eda04fc1d7acff3d1248.
 ---

patches_platform_personal/frameworks_base/0014-UI-Always-render-windows-into-cutouts.patch

@@ -1,7 +1,7 @@
-From 6906f3f8b74104d9c2e80f469d1296ed72f1af96 Mon Sep 17 00:00:00 2001
+From b472b86f1bc17ade0b4b5e2e9743d11ef704ab4f Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Wed, 7 Oct 2020 14:00:35 +0000
-Subject: [PATCH 12/17] UI: Always render windows into cutouts
+Subject: [PATCH 14/19] UI: Always render windows into cutouts
 
 Eliminates black/white letterboxing
 Quick and dirty way to do the latter - wait for proper fix from Google

patches_platform_personal/frameworks_base/0015-UI-Kill-rounded-corners-in-notification-scrim.patch

@@ -1,7 +1,7 @@
-From 8044b45f7aa0108fdc4d5f7fd445adbe20dc515e Mon Sep 17 00:00:00 2001
+From 9fe9c77b0d6ced77567fc17a09688ee6b6c4c9e5 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Wed, 1 Sep 2021 14:10:50 +0000
-Subject: [PATCH 13/17] UI: Kill rounded corners in notification scrim
+Subject: [PATCH 15/19] UI: Kill rounded corners in notification scrim
 
 Rounded corners in S is nicely implemented, but this is one occasion where it looks out of place
 

patches_platform_personal/frameworks_base/0016-UI-Reconfigure-power-menu-items.patch

@@ -1,7 +1,7 @@
-From 9dbf50b60e1ceb062174e05e28b78f34149c25e0 Mon Sep 17 00:00:00 2001
+From 53ca533e468c5b88268399b905ad61585431361b Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Mon, 26 Oct 2020 14:06:56 +0000
-Subject: [PATCH 14/17] UI: Reconfigure power menu items
+Subject: [PATCH 16/19] UI: Reconfigure power menu items
 
 Change-Id: I32cca6e2c6bb64d891efee959127edf7c0802cbc
 ---
@@ -9,7 +9,7 @@ Change-Id: I32cca6e2c6bb64d891efee959127edf7c0802cbc
  1 file changed, 1 insertion(+), 4 deletions(-)
 
 diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
-index d7872f457b34..df9a0d487e9e 100644
+index 999e5b95003c..b61233bdf931 100644
 --- a/core/res/res/values/config.xml
 +++ b/core/res/res/values/config.xml
 @@ -3016,13 +3016,10 @@

patches_platform_personal/frameworks_base/0017-UI-Reconfigure-quick-settings-tiles.patch

@@ -1,7 +1,7 @@
-From d7fc8ae4d57d3ec1ccd9ff6ca6d7becbfaec9c70 Mon Sep 17 00:00:00 2001
+From 819573575f21c3ebef03940d91b48ed1fe206034 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 5 Mar 2022 01:43:37 +0000
-Subject: [PATCH 15/17] UI: Reconfigure quick settings tiles
+Subject: [PATCH 17/19] UI: Reconfigure quick settings tiles
 
 Change-Id: I743f52ef3a95db0ca2c02ae973faa4629e41885d
 ---

patches_platform_personal/frameworks_base/0018-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch

@@ -1,7 +1,7 @@
-From a536944a4e71fc775d76f92267ea61f6c49e089e Mon Sep 17 00:00:00 2001
+From 7b901ace4b384da0a0df89c08d9088e83a9f6f2a Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Tue, 29 Jun 2021 22:57:01 +0000
-Subject: [PATCH 16/17] UI: Relax requirement for HINT_SUPPORTS_DARK_TEXT
+Subject: [PATCH 18/19] UI: Relax requirement for HINT_SUPPORTS_DARK_TEXT
 
 I decide what's good enough for a wallpaper!
 

patches_platform_personal/frameworks_base/0019-UI-Remove-privacy-dot-padding.patch

@@ -1,7 +1,7 @@
-From 79e652d4979ca20448434f643f1373044f42ce2a Mon Sep 17 00:00:00 2001
+From 0a817f70313c950e3662f2c64b2d5c35d6a8b14d Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Tue, 19 Oct 2021 12:09:34 +0000
-Subject: [PATCH 17/17] UI: Remove privacy dot padding
+Subject: [PATCH 19/19] UI: Remove privacy dot padding
 
 Change-Id: I5d2e2b3e36f027b4348a83030d4b4d3c4f0209d1
 ---

patches_platform_personal/packages_apps_Nfc/0001-NfcService-Disable-NFC-by-default.patch

@@ -0,0 +1,26 @@
+From 99b3533fe66a7bdc71dd6c63c4ba6c75e2ef2082 Mon Sep 17 00:00:00 2001
+From: Daniel Micay <danielmicay@gmail.com>
+Date: Sat, 6 Jun 2015 10:40:51 -0400
+Subject: [PATCH] NfcService: Disable NFC by default
+
+Change-Id: Ibe6abec7fa84c6fde476b8a083f57a3f61b50909
+---
+ src/com/android/nfc/NfcService.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
+index 3facdeeb..878b7e21 100644
+--- a/src/com/android/nfc/NfcService.java
++++ b/src/com/android/nfc/NfcService.java
+@@ -133,7 +133,7 @@ public class NfcService implements DeviceHostListener {
+     public static final String PREF = "NfcServicePrefs";
+ 
+     static final String PREF_NFC_ON = "nfc_on";
+-    static final boolean NFC_ON_DEFAULT = true;
++    static final boolean NFC_ON_DEFAULT = false;
+     static final String PREF_NDEF_PUSH_ON = "ndef_push_on";
+     static final boolean NDEF_PUSH_ON_DEFAULT = false;
+     static final String PREF_SECURE_NFC_ON = "secure_nfc_on";
+-- 
+2.25.1
+

patches_platform_personal/vendor_lineage/0001-build-Integrate-prop-modifications-2-2.patch

@@ -1,4 +1,4 @@
-From 7a76da8c2ef814eddc37fe3a2756ba2af6984aec Mon Sep 17 00:00:00 2001
+From 0fe6a88f7b0c999a1ebadf73a34a563a13e53809 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 20 Jun 2021 09:09:15 +0000
 Subject: [PATCH 1/4] build: Integrate prop modifications (2/2)

patches_platform_personal/vendor_lineage/0002-build-Remove-Stk-2-2.patch

@@ -1,4 +1,4 @@
-From bef1ea091cc0765fcd7eca1e9e41147abea407d1 Mon Sep 17 00:00:00 2001
+From 67d42211bfea6d4c988da090d1ea767011d1599d Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 16 Oct 2021 00:41:07 +0000
 Subject: [PATCH 2/4] build: Remove Stk (2/2)

patches_platform_personal/vendor_lineage/0003-vendor_lineage-Ignore-neverallows.-again.patch

@@ -1,4 +1,4 @@
-From 24a7525c5f58f94423f052b772949a4344bc89ee Mon Sep 17 00:00:00 2001
+From d8dfe72301f3dd75905565e8764a25c3fc1277a4 Mon Sep 17 00:00:00 2001
 From: AndyCGYan <GeForce8800Ultra@gmail.com>
 Date: Mon, 1 Jul 2019 07:03:04 +0000
 Subject: [PATCH 3/4] vendor_lineage: Ignore neverallows... again

patches_platform_personal/vendor_lineage/0004-vendor_lineage-Personal-theme-as-SRO.patch

@@ -1,4 +1,4 @@
-From b304d258198c2b7e4b481e9803a8463bb0cf395d Mon Sep 17 00:00:00 2001
+From 74e74e9646c3d61f4e287abc3e4deb18b2b2ddb8 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 9 Apr 2022 02:48:55 +0000
 Subject: [PATCH 4/4] vendor_lineage: Personal theme as SRO
@@ -89,10 +89,10 @@ Change-Id: I43164b7a4145616d162c6b4b4b84d1953cb483cc
  create mode 100644 overlay/personal/packages/inputmethods/LatinIME/java/res/drawable/ic_launcher_foreground.xml
 
 diff --git a/config/common.mk b/config/common.mk
-index e9e0c2d5..9687b647 100644
+index 234815e9..ab093bd1 100644
 --- a/config/common.mk
 +++ b/config/common.mk
-@@ -188,10 +188,13 @@ endif
+@@ -185,10 +185,13 @@ endif
  PRODUCT_DEXPREOPT_SPEED_APPS += \
      SystemUI
  
@@ -107,7 +107,7 @@ index e9e0c2d5..9687b647 100644
 +    vendor/lineage/overlay/personal
  
  PRODUCT_PACKAGES += \
-     TrebuchetOverlay
+     NetworkStackOverlay \
 diff --git a/overlay/personal/packages/apps/AudioFX/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/AudioFX/res/drawable/ic_launcher_background.xml
 new file mode 100644
 index 00000000..9a30966d

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

@@ -1,4 +1,4 @@
-From 3c980fc355795a371b4d93199e66654c240b0c3a Mon Sep 17 00:00:00 2001
+From d868a17f49b0ad23190584302f9143f97838fc66 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/34] Fallback to stupid autobrightness if brightness values

patches_treble_phh/platform_frameworks_base/0002-Relax-requirement-for-visible-flag-to-sdcards.patch

@@ -1,4 +1,4 @@
-From 42f5b7c6772d99fb710543d8ab63e0212de4e082 Mon Sep 17 00:00:00 2001
+From d64bd7b4890a55791ea90865f1deaf254c7e3050 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 02/34] Relax requirement for visible flag to sdcards
@@ -13,10 +13,10 @@ Change-Id: Ia616671c03562d1eadaff5531a5c708a62d7ad3a
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
-index ec58b1701694..40b9a18f0fb3 100644
+index 85f74e3ee169..5e4b1791d13f 100644
 --- a/services/core/java/com/android/server/StorageManagerService.java
 +++ b/services/core/java/com/android/server/StorageManagerService.java
-@@ -1583,7 +1583,8 @@ class StorageManagerService extends IStorageManager.Stub
+@@ -1584,7 +1584,8 @@ class StorageManagerService extends IStorageManager.Stub
  
              // Adoptable public disks are visible to apps, since they meet
              // public API requirement of being in a stable location.

patches_treble_phh/platform_frameworks_base/0003-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch

@@ -1,4 +1,4 @@
-From b7b1812fc9b262415e4557ee4e9438b707f864c7 Mon Sep 17 00:00:00 2001
+From a988be93b01593f0c5935fc3721d670d89d204a4 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 03/34] Don't crash if there is IR HAL is not declared

patches_treble_phh/platform_frameworks_base/0004-Show-APN-Settings-for-CDMA-carriers.patch

@@ -1,4 +1,4 @@
-From 09c628a3bab752f9dab961dd262a6e6a7d899aa3 Mon Sep 17 00:00:00 2001
+From 65cec5e3c685f532e9cecfa1ce60daa6c0904f6d 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 04/34] Show APN Settings for CDMA carriers

patches_treble_phh/platform_frameworks_base/0005-Re-order-services-so-that-it-works-even-without-qtag.patch

@@ -1,4 +1,4 @@
-From 12a577a737a326dbd46bbc80795fbacd5dbf49ff Mon Sep 17 00:00:00 2001
+From e07fe9fc854adf856b859d375a36602ab26e8686 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 05/34] Re-order services so that it works even without qtaguid

patches_treble_phh/platform_frameworks_base/0006-Support-samsung-Pie-and-Q-light-hal.patch

@@ -1,4 +1,4 @@
-From 0fbf86d42d82889abd274f819ccd9f43e15e873c Mon Sep 17 00:00:00 2001
+From e9a61603187104ad4fa407ff2a9380e7e5c61e29 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 06/34] Support samsung Pie and Q light hal

patches_treble_phh/platform_frameworks_base/0007-Add-support-for-samsung-touch-physical-and-hover-pro.patch

@@ -1,4 +1,4 @@
-From 6e0b073e00185711c140252a1e178a91ba307716 Mon Sep 17 00:00:00 2001
+From 2879bc6eb47ed4fccd526265419a10531cda9810 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 07/34] Add support for samsung touch, physical and hover

patches_treble_phh/platform_frameworks_base/0008-Always-allow-overriding-the-number-of-work-profiles.patch

@@ -1,4 +1,4 @@
-From a1921c5aab9f324070cb606cd510850580e5cce8 Mon Sep 17 00:00:00 2001
+From fadc8c0f53b132cb4d59c499e720ac9589644543 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 08/34] Always allow overriding the number of work profiles
@@ -9,10 +9,10 @@ Change-Id: I6eb09aa71663c6fbe7563e3038bffcabdba0ff6a
  1 file changed, 2 insertions(+), 6 deletions(-)
 
 diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
-index 826370006dca..925ab6e6b77f 100644
+index f4680a0db37f..ffffbb5fa2a5 100644
 --- a/services/core/java/com/android/server/pm/UserManagerService.java
 +++ b/services/core/java/com/android/server/pm/UserManagerService.java
-@@ -5825,12 +5825,8 @@ public class UserManagerService extends IUserManager.Stub {
+@@ -5867,12 +5867,8 @@ public class UserManagerService extends IUserManager.Stub {
       */
      private static int getMaxUsersOfTypePerParent(UserTypeDetails userTypeDetails) {
          final int defaultMax = userTypeDetails.getMaxAllowedPerParent();

patches_treble_phh/platform_frameworks_base/0009-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch

@@ -1,4 +1,4 @@
-From ce490f85085dc545995d8251e422e930c55e3584 Mon Sep 17 00:00:00 2001
+From 5940d2811c5e417567f51f52e39fef2ef0cfe7cb 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 09/34] HOME deserves to wake-up devices just as well as back

patches_treble_phh/platform_frameworks_base/0010-Some-devices-have-proximity-sensor-reporting-NaN-as-.patch

@@ -1,4 +1,4 @@
-From 571da6c4146d34bf006fe8aa32e00c2f6f1c46e5 Mon Sep 17 00:00:00 2001
+From 7a1992147135709e696ddacf527c11b943297773 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 10/34] Some devices have proximity sensor reporting NaN as max

patches_treble_phh/platform_frameworks_base/0011-Fix-brightness-range-not-being-complete-on-Samsung-d.patch

@@ -1,4 +1,4 @@
-From 3bc662b68a1064b756cb302c0f73c71f6cceb94c Mon Sep 17 00:00:00 2001
+From 4085095a3f48ae1793e1b785cdb9d6011271ab16 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 11/34] Fix brightness range not being complete on Samsung

patches_treble_phh/platform_frameworks_base/0012-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch

@@ -1,4 +1,4 @@
-From db2f66125bf0093215cfd37633865e5bf55bd84f Mon Sep 17 00:00:00 2001
+From eb11b5a219f1fa6bc08fcf357a602dd27e9a7b26 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 12/34] Re-implement fnmatch-like behaviour for RRO java-side

patches_treble_phh/platform_frameworks_base/0013-Make-rounded-corners-padding-overridable-with-persis.patch

@@ -1,4 +1,4 @@
-From 903e15083b4607878f016ea87a65a36cc845c044 Mon Sep 17 00:00:00 2001
+From c4aa097340cc70ef21ad22b76fb3ae38a3ee4a28 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 6 Dec 2020 12:20:08 +0100
 Subject: [PATCH 13/34] Make rounded corners padding overridable with
@@ -12,18 +12,18 @@ Change-Id: I481c1c8849b2f22a7cdfb2896a6d3c2e7e3b44d9
  3 files changed, 14 insertions(+), 6 deletions(-)
 
 diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
-index 22bbb79734e1..ec31c4cd942b 100644
+index a16f300ae782..5d3539b66141 100644
 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
 +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
-@@ -22,6 +22,7 @@ import android.content.res.Configuration;
+@@ -23,6 +23,7 @@ import android.content.res.Configuration;
  import android.content.res.Resources;
  import android.graphics.Color;
  import android.graphics.Rect;
 +import android.os.SystemProperties;
+ import android.provider.AlarmClock;
  import android.util.AttributeSet;
  import android.util.Pair;
- import android.view.DisplayCutout;
+@@ -265,8 +266,10 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu
-@@ -253,8 +254,10 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu
  
          mConfigShowBatteryEstimate = resources.getBoolean(R.bool.config_showBatteryEstimateQSBH);
  

patches_treble_phh/platform_frameworks_base/0014-Remove-useless-notification-about-console-service-be.patch

@@ -1,4 +1,4 @@
-From 28c5d8d82b0335a4c637b5684ef1f4d27b11abac Mon Sep 17 00:00:00 2001
+From e3816ed577ea5de7ef648b3bb2ac7f36865f2363 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 14/34] Remove useless notification about "console" service
@@ -9,7 +9,7 @@ Subject: [PATCH 14/34] Remove useless notification about "console" service
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
-index f5103df80d6a..86299c2938fd 100644
+index a32aa6d895ef..38553b8a5b46 100644
 --- a/services/core/java/com/android/server/am/ActivityManagerService.java
 +++ b/services/core/java/com/android/server/am/ActivityManagerService.java
 @@ -4802,7 +4802,7 @@ public class ActivityManagerService extends IActivityManager.Stub

patches_treble_phh/platform_frameworks_base/0015-Revert-Remove-unused-SystemProperties.set.patch

@@ -1,4 +1,4 @@
-From 4665e03509959f366534406fb4cfdf28d8232082 Mon Sep 17 00:00:00 2001
+From 588545dc3524fd8b824a3fb01ef243622321c208 Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Wed, 16 Dec 2020 21:24:12 +0800
 Subject: [PATCH 15/34] Revert "Remove unused SystemProperties.set"

patches_treble_phh/platform_frameworks_base/0016-TelephonyManager-bring-back-getNetworkClass.patch

@@ -1,4 +1,4 @@
-From f81875d580a5451a6ad846e9f7b214af394fca10 Mon Sep 17 00:00:00 2001
+From 4df8c7577fedd865b55c2295434239ee0dbbff1b Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Wed, 16 Dec 2020 13:46:15 +0800
 Subject: [PATCH 16/34] TelephonyManager: bring back getNetworkClass()

patches_treble_phh/platform_frameworks_base/0017-TelephonyManager-add-API-annotations-for-setTelephon.patch

@@ -1,4 +1,4 @@
-From 9cfd0056138cd06fc983d40c51ee0af4b7d898e5 Mon Sep 17 00:00:00 2001
+From bc076be0c3a79fc6224671ddd6ccd96ec9f6eb9d Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Wed, 16 Dec 2020 21:26:45 +0800
 Subject: [PATCH 17/34] TelephonyManager: add API annotations for

patches_treble_phh/platform_frameworks_base/0018-Fix-Wakelock-issue.patch

@@ -1,4 +1,4 @@
-From b8d27a58aba6540dd1ae28b395ed0057f378ebac Mon Sep 17 00:00:00 2001
+From 5462fd810d54e1c5a667108a2f4a8bf976d4a79e Mon Sep 17 00:00:00 2001
 From: Alberto Ponces <ponces26@gmail.com>
 Date: Tue, 2 Feb 2021 10:20:51 +0000
 Subject: [PATCH 18/34] Fix Wakelock issue

patches_treble_phh/platform_frameworks_base/0019-Automatically-detect-pick-up-sensor-so-that-an-overl.patch

@@ -1,4 +1,4 @@
-From 1a2afede98bcc9875f9a13c34db17c1354ce47c2 Mon Sep 17 00:00:00 2001
+From 5df88a2b154172be5181c24b9752228a82702783 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 19/34] Automatically detect pick up sensor, so that an overlay

patches_treble_phh/platform_frameworks_base/0020-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch

@@ -1,4 +1,4 @@
-From af7e41ec724143b04785f4660830d3beca00a67d Mon Sep 17 00:00:00 2001
+From 01c3ade97f81ef4d37c45ab64400b6e30cd4b7e8 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 20/34] Catch broken mainBuiltInDisplayCutoutRectApproximation

patches_treble_phh/platform_frameworks_base/0021-backlight-Fix-backlight-control-on-Galaxy-S9.patch

@@ -1,4 +1,4 @@
-From 63f14179ce66d6d90e4f0c761ce65aea9990edf0 Mon Sep 17 00:00:00 2001
+From 096f798dfb570627261dcf02ab0f916e4f5f73ed 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 21/34] backlight: Fix backlight control on Galaxy S9(+)

patches_treble_phh/platform_frameworks_base/0022-Add-support-for-app-signature-spoofing.patch

@@ -1,4 +1,4 @@
-From cbe318400deeffacb90598fe09b3219bc99cce12 Mon Sep 17 00:00:00 2001
+From b76625a80fbf00f2a2d96ad6189ccabd362a0d48 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Sat, 16 Oct 2021 05:27:57 -0700
 Subject: [PATCH 22/34] Add support for app signature spoofing
@@ -105,7 +105,7 @@ index 166d6abd1809..cba87ff17600 100644
      <string name="permlab_statusBar">disable or modify status bar</string>
      <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
 diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
-index 243c0c9c14e2..2e50e2e91ef2 100644
+index d579f816f821..280f58c4d571 100644
 --- a/services/core/java/com/android/server/pm/PackageManagerService.java
 +++ b/services/core/java/com/android/server/pm/PackageManagerService.java
 @@ -3330,6 +3330,29 @@ public class PackageManagerService extends IPackageManager.Stub

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

@@ -1,4 +1,4 @@
-From 0211bab53d095a751cdbe0bd670429c8ffca5a10 Mon Sep 17 00:00:00 2001
+From ebb1d26475a1347ec3281259804505c481dc41a3 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/34] Revert "Switch long-press power behavior in AOSP."
@@ -9,7 +9,7 @@ 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 07367aee8f5c..e502765617af 100644
+index a7d55479d2c3..13a0a3935691 100644
 --- a/core/res/res/values/config.xml
 +++ b/core/res/res/values/config.xml
 @@ -978,7 +978,7 @@

patches_treble_phh/platform_frameworks_base/0024-Reduce-the-size-of-udfps-enroll-progress-bar.-Some-d.patch

@@ -1,4 +1,4 @@
-From c28cb3664b5d40ed44f676fe1e00b5123483f1b8 Mon Sep 17 00:00:00 2001
+From 8312bb7305d41026396b5f70351148a4fbe4cc74 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 24/34] Reduce the size of udfps enroll progress bar. Some

patches_treble_phh/platform_frameworks_base/0025-Add-UDFPS-support-for-various-devices.patch

@@ -1,4 +1,4 @@
-From 2198ae080c58104b05afe5be31276444e3c766ec Mon Sep 17 00:00:00 2001
+From 8258b7d636f3e676b2c047da13d0fa9c235c6e6a Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 19 Dec 2021 17:08:22 -0500
 Subject: [PATCH 25/34] Add UDFPS support for various devices

patches_treble_phh/platform_frameworks_base/0026-Dynamically-resize-boot-animation-to-match-screen-si.patch

@@ -1,4 +1,4 @@
-From c693acbc7bbf03fa4791aea1334cd7e2c91f22cf Mon Sep 17 00:00:00 2001
+From 5e4cc754dfb9b71e06bac0b73cc29f008ee0d57e Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 20 Dec 2021 15:01:41 -0500
 Subject: [PATCH 26/34] Dynamically resize boot animation to match screen size
@@ -9,10 +9,10 @@ Change-Id: I54e49fc6b8c670103852e212d1416e27ff976205
  1 file changed, 20 insertions(+)
 
 diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp
-index 6c8cab7783b6..e4335cc03c23 100644
+index f7cd1c6d78eb..2185c7d271a8 100644
 --- a/cmds/bootanimation/BootAnimation.cpp
 +++ b/cmds/bootanimation/BootAnimation.cpp
-@@ -583,6 +583,26 @@ status_t BootAnimation::readyToRun() {
+@@ -600,6 +600,26 @@ status_t BootAnimation::readyToRun() {
      mFlingerSurface = s;
      mTargetInset = -1;
  

patches_treble_phh/platform_frameworks_base/0027-Once-we-integrate-Samsung-Power-hal-in-libpowermanag.patch

@@ -1,4 +1,4 @@
-From 7fe680986fa9203326f7ba806f8aea809b9da568 Mon Sep 17 00:00:00 2001
+From e17ae08c41c9064e1da7b687e5486c9c07d35ad8 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 27/34] Once we integrate Samsung Power hal in libpowermanager,

patches_treble_phh/platform_frameworks_base/0028-Add-persist.sys.phh.ultrasonic_udfps-property-to-dis.patch

@@ -1,4 +1,4 @@
-From 195b5e1fcbd7d6b50661e442594d879466aa70dc Mon Sep 17 00:00:00 2001
+From f366679ea5887cd203d5b4d29fb795cd2543ba89 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 3 Mar 2022 09:15:32 -0500
 Subject: [PATCH 28/34] Add persist.sys.phh.ultrasonic_udfps property to

patches_treble_phh/platform_frameworks_base/0029-Allow-128bits-SHA1-IPSec-keys.-This-is-required-to-i.patch

@@ -1,4 +1,4 @@
-From 01e72e754b9f7189a9d0a3784613c4f647eaba3e Mon Sep 17 00:00:00 2001
+From 2fd08e98799a1469deb6f61070e12fddfab280e9 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 3 Mar 2022 09:17:17 -0500
 Subject: [PATCH 29/34] Allow 128bits SHA1 IPSec keys. This is required to

patches_treble_phh/platform_frameworks_base/0030-Fix-FOD-on-ZF8.patch

@@ -1,4 +1,4 @@
-From 64c4108f091f8a3749c5d43cd1bcbd4919c10bde Mon Sep 17 00:00:00 2001
+From 0c1b219e52a064ef990fbdc500c7709aa79e0726 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 4 Mar 2022 19:26:53 -0500
 Subject: [PATCH 30/34] Fix FOD on ZF8

patches_treble_phh/platform_frameworks_base/0031-Allow-disabling-of-fingerprint-cleanups-needed-on-so.patch

@@ -1,4 +1,4 @@
-From b5b9e2e933acf5eb85fcbabc9809e46a15ea472f Mon Sep 17 00:00:00 2001
+From c0d0888889c949f6b01dd2dac65134a9588a9281 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 31/34] Allow disabling of fingerprint cleanups, needed on some

patches_treble_phh/platform_frameworks_base/0032-Switch-FOD-to-WHITE.patch

@@ -1,4 +1,4 @@
-From 7c9b59bc486787484262f180bce4a4b06e7e55df Mon Sep 17 00:00:00 2001
+From 2551df4bbbdb4115814e8173ab66e1b9b03f235a Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 2 May 2022 18:02:25 -0400
 Subject: [PATCH 32/34] Switch FOD to WHITE

patches_treble_phh/platform_frameworks_base/0033-Support-samsung-ultrasonic-udfps.patch

@@ -1,4 +1,4 @@
-From 22702d6ae549ab2268e4de57a48e078bd0d86eff Mon Sep 17 00:00:00 2001
+From 468b0844436f210b2be35dc4ff54ef1168e663b2 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 2 May 2022 18:02:40 -0400
 Subject: [PATCH 33/34] Support samsung ultrasonic udfps

patches_treble_phh/platform_frameworks_base/0034-Allow-FOD-color-to-be-customized-with-persist.sys.ph.patch

@@ -1,4 +1,4 @@
-From 3cc1c4d087c4a7c0de08d6aa07a8fe92fbf9e121 Mon Sep 17 00:00:00 2001
+From 4f98ca808f05a1603a53b08d88101fb24d947534 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 9 Jun 2022 14:08:46 -0400
 Subject: [PATCH 34/34] Allow FOD color to be customized with

patches_treble_phh/platform_system_vold/0001-Allow-deletion-of-symlink.patch

@@ -1,4 +1,4 @@
-From 990be9e3d37ce43afb37303b3503f0999bc82ca2 Mon Sep 17 00:00:00 2001
+From c4f1b9d1e0fecc819f41781aab3e5251b0bd0bb1 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 17 Feb 2018 19:39:38 +0100
 Subject: [PATCH 1/7] Allow deletion of symlink
@@ -9,10 +9,10 @@ Change-Id: I9731895f88729072297f753088583aabbe6990f4
  1 file changed, 1 insertion(+)
 
 diff --git a/FsCrypt.cpp b/FsCrypt.cpp
-index 04def5c4..c7de48e1 100644
+index 09dcf818..2ca58947 100644
 --- a/FsCrypt.cpp
 +++ b/FsCrypt.cpp
-@@ -315,6 +315,7 @@ static bool prepare_dir(const std::string& dir, mode_t mode, uid_t uid, gid_t gi
+@@ -323,6 +323,7 @@ static bool prepare_dir(const std::string& dir, mode_t mode, uid_t uid, gid_t gi
  static bool destroy_dir(const std::string& dir) {
      LOG(DEBUG) << "Destroying: " << dir;
      if (rmdir(dir.c_str()) != 0 && errno != ENOENT) {

patches_treble_phh/platform_system_vold/0002-Support-Samsung-s-implementation-of-exfat-called-sdf.patch

@@ -1,4 +1,4 @@
-From c31e214cb0f52671514b06ebc6b4e03bddf491bf Mon Sep 17 00:00:00 2001
+From cc8870fbad8382da092438af78381fac9bbee251 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 20 Aug 2018 22:37:54 +0200
 Subject: [PATCH 2/7] Support Samsung's implementation of exfat, called sdfat

patches_treble_phh/platform_system_vold/0003-Sony-has-texfat-exfat-fs.patch

@@ -1,4 +1,4 @@
-From 457e5c667aa50a8e944a5a20dadb6e0c4cefd7b4 Mon Sep 17 00:00:00 2001
+From abc668333338ec0ee2c8a4042551eea0a924eccc Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 28 Jan 2020 00:27:17 +0100
 Subject: [PATCH 3/7] Sony has `texfat` exfat fs

patches_treble_phh/platform_system_vold/0004-Failing-to-create-facedata-shouldn-t-be-fatal.patch

@@ -1,4 +1,4 @@
-From 5684e411afc3cdcf5e66e9bade31fde768c3373b Mon Sep 17 00:00:00 2001
+From 75a4589a6a6bbde9b1273c64dce37ab80d5342a0 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 7 Mar 2020 14:49:09 +0100
 Subject: [PATCH 4/7] Failing to create facedata shouldn't be fatal

patches_treble_phh/platform_system_vold/0005-Every-voldmanaged-storage-is-adoptable.patch

@@ -1,4 +1,4 @@
-From 37b7e342b023af7f1c39335ab61e64e446057234 Mon Sep 17 00:00:00 2001
+From d414bcc51b7527764055b20776cb71ec85580106 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 11 Mar 2020 14:02:35 +0100
 Subject: [PATCH 5/7] Every voldmanaged storage is adoptable
@@ -8,11 +8,11 @@ Subject: [PATCH 5/7] Every voldmanaged storage is adoptable
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/main.cpp b/main.cpp
-index 1f85fb53..52aa896d 100644
+index dc63caef..3af0dcf3 100644
 --- a/main.cpp
 +++ b/main.cpp
-@@ -257,7 +257,7 @@ static int process_config(VolumeManager* vm, VoldConfigs* configs) {
+@@ -263,7 +263,7 @@ static int process_config(VolumeManager* vm, VoldConfigs* configs) {
-             std::string nickname(entry.label);
+             int partnum = entry.partnum;
              int flags = 0;
  
 -            if (entry.is_encryptable()) {

patches_treble_phh/platform_system_vold/0006-Log-support-for-exfat-texfat-FS-driver-names.patch

@@ -1,24 +1,23 @@
-From 02318d958b630413efe73d0454a277f1b9d8e020 Mon Sep 17 00:00:00 2001
+From 968689281ef36e9de7743419137eba72c3472803 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 24 Nov 2021 15:50:30 -0500
 Subject: [PATCH 6/7] Log support for exfat/texfat FS driver names
 
 Change-Id: I5ae38741374b25b84595a9eae9bdda7afe2cac05
 ---
- main.cpp | 4 +++-
+ main.cpp | 3 ++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/main.cpp b/main.cpp
-index 52aa896d..86e0aa52 100644
+index 3af0dcf3..05b2db62 100644
 --- a/main.cpp
 +++ b/main.cpp
-@@ -69,7 +69,9 @@ int main(int argc, char** argv) {
+@@ -71,7 +71,8 @@ int main(int argc, char** argv) {
-     LOG(DEBUG) << "Detected support for:"
                 << (android::vold::IsFilesystemSupported("ext4") ? " ext4" : "")
                 << (android::vold::IsFilesystemSupported("f2fs") ? " f2fs" : "")
+                << (android::vold::IsFilesystemSupported("ntfs") ? " ntfs" : "")
 -               << (android::vold::IsFilesystemSupported("vfat") ? " vfat" : "");
 +               << (android::vold::IsFilesystemSupported("vfat") ? " vfat" : "")
-+               << (android::vold::IsFilesystemSupported("exfat") ? " exfat" : "")
 +               << (android::vold::IsFilesystemSupported("texfat") ? " texfat" : "");
  
      VolumeManager* vm;

patches_treble_phh/platform_system_vold/0007-Don-t-unmount-rw-system.sh-binds.patch

@@ -1,4 +1,4 @@
-From 9612422f1e17dffdf5ed00c4c3abd1c2f3a17656 Mon Sep 17 00:00:00 2001
+From aecee9a897b803b4e65fcd21357c76226e8c4e4c Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 29 Nov 2021 17:49:13 -0500
 Subject: [PATCH 7/7] Don't unmount rw-system.sh binds
@@ -9,10 +9,10 @@ Change-Id: If9132c21defa8b09879b79a70794c5275d6852d0
  1 file changed, 1 insertion(+)
 
 diff --git a/VolumeManager.cpp b/VolumeManager.cpp
-index 2697f672..d592c7f5 100644
+index 036c313f..70f33e38 100644
 --- a/VolumeManager.cpp
 +++ b/VolumeManager.cpp
-@@ -957,6 +957,7 @@ int VolumeManager::unmountAll() {
+@@ -962,6 +962,7 @@ int VolumeManager::unmountAll() {
      while ((mentry = getmntent(fp)) != NULL) {
          auto test = std::string(mentry->mnt_dir);
          if ((StartsWith(test, "/mnt/") &&

patches_treble_prerequisite/frameworks_base/0001-Squashed-revert-of-LOS-UDFPS-changes.patch

@@ -1,4 +1,4 @@
-From fbb1939f6ab28ce541cde5edfe442bfbc212c131 Mon Sep 17 00:00:00 2001
+From 0ef5fe793afdf7128618f4b5a286572fbc449c48 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 13 Mar 2022 09:51:36 +0000
 Subject: [PATCH 1/2] Squashed revert of LOS UDFPS changes
@@ -51,14 +51,13 @@ z&)mfH)S%SFl*+=BsWw1Ge4Z|jAr-fh5*U~o7?>FtSQ!{^cTT<plwt66^>bP0l+XkK
 D@OB!I
 
 diff --git a/packages/SystemUI/res/values/lineage_config.xml b/packages/SystemUI/res/values/lineage_config.xml
-index ff40c892ddb8..926acda7fa31 100644
+index 6c92a4fb2a3c..910a55d0f347 100644
 --- a/packages/SystemUI/res/values/lineage_config.xml
 +++ b/packages/SystemUI/res/values/lineage_config.xml
-@@ -24,16 +24,4 @@
+@@ -25,18 +25,6 @@
-          the sensor embedded in the power key and listening all the time
           causes a poor experience. -->
      <bool name="config_fingerprintWakeAndUnlock">true</bool>
--
+ 
 -    <!-- Color of the UDFPS pressed view -->
 -    <color name="config_udfpsColor">#ffffffff</color>
 -
@@ -70,7 +69,10 @@ index ff40c892ddb8..926acda7fa31 100644
 -
 -    <!-- Udfps HBM provider class name -->
 -    <string name="config_udfpsHbmProviderComponent">com.android.systemui.biometrics.DummyUdfpsHbmProvider</string>
- </resources>
+-
+     <!-- Doze: does the double tap sensor need a proximity check? -->
+     <bool name="doze_double_tap_proximity_check">false</bool>
+ 
 diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java
 index fb5a948c6716..fd37b3509a4e 100644
 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java

patches_treble_prerequisite/frameworks_base/0002-Revert-Biometrics-Allow-disabling-of-fingerprint-cle.patch

@@ -1,4 +1,4 @@
-From e590f003166adccf2aa739f86138d10054415371 Mon Sep 17 00:00:00 2001
+From 8195faf19170c8b02acb4ed964227f8e0446459c Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Fri, 10 Jun 2022 21:33:47 +0800
 Subject: [PATCH 2/2] Revert "Biometrics: Allow disabling of fingerprint