Changes for December 2021

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

@@ -1,7 +1,7 @@
-From 458abb420f0dc2d9df421c9c81d203f2e420241c Mon Sep 17 00:00:00 2001
+From 5c49797b6d93903bdfc4a6938eb18657f3525570 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Thu, 5 Apr 2018 10:01:19 +0800
-Subject: [PATCH 01/21] Disable vendor mismatch warning
+Subject: [PATCH 01/22] Disable vendor mismatch warning
 
 Change-Id: Ieb8fe91e2f02462f074312ed0f4885d183e9780b
 ---
@@ -9,10 +9,10 @@ Change-Id: Ieb8fe91e2f02462f074312ed0f4885d183e9780b
  1 file changed, 2 insertions(+), 14 deletions(-)
 
 diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
-index f3ba56a03aef..f831b10f0ddc 100644
+index 08f3b1a8c6e0..d0387cc38d3d 100644
 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
 +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
-@@ -5493,20 +5493,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
+@@ -5499,20 +5499,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
                  }
  
                  if (!Build.isBuildConsistent()) {

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

@@ -1,7 +1,7 @@
-From cb50f98e9a0aca5ae5a2a4227ebdb9c957c16ac4 Mon Sep 17 00:00:00 2001
+From f4af00e6769797999721cbfe4673a7f2f0c76278 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 02/21] UI: Adjust default navbar layouts
+Subject: [PATCH 02/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/0003-UI-Disable-left-seascape-navigation-bar-optionally.patch

@@ -1,7 +1,7 @@
-From 86eedab915fadd671299755f597e1f6e1d1b08f9 Mon Sep 17 00:00:00 2001
+From 07a09e5d704b6971a5c061ac65bb7d765e368dec Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Fri, 9 Mar 2018 15:41:26 +0800
-Subject: [PATCH 03/21] UI: Disable left (seascape) navigation bar optionally
+Subject: [PATCH 03/22] UI: Disable left (seascape) navigation bar optionally
 
 Toggle this behaviour with property "persist.ui.seascape.disable"
 
@@ -45,10 +45,10 @@ index f1e1366404a2..f43bef8532b8 100644
          for (int i = 0; i < group.getChildCount(); i++) {
              final View child = group.getChildAt(i);
 diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java
-index 73d31bf7e0c8..a070942cc76a 100644
+index d0457b08aa34..d165552d5ce8 100644
 --- a/services/core/java/com/android/server/wm/DisplayPolicy.java
 +++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
-@@ -2334,9 +2334,10 @@ public class DisplayPolicy {
+@@ -2352,9 +2352,10 @@ public class DisplayPolicy {
      @NavigationBarPosition
      int navigationBarPosition(int displayWidth, int displayHeight, int displayRotation) {
          if (navigationBarCanMove() && displayWidth > displayHeight) {

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

@@ -1,7 +1,7 @@
-From 127d469f088affc27bf44ce16a43e938a313631d Mon Sep 17 00:00:00 2001
+From 58f4875f7b157bf408bd770a4131d5ee0c98f7da 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 04/21] UI: Disable wallpaper zoom
+Subject: [PATCH 04/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 dd535da6d7bd..7e42418e06c8 100644
+index b7dfd49b7b78..08940c03b095 100644
 --- a/core/res/res/values/config.xml
 +++ b/core/res/res/values/config.xml
-@@ -4747,7 +4747,7 @@
+@@ -4768,7 +4768,7 @@
      <string name="config_customMediaSessionPolicyProvider"></string>
  
      <!-- The max scale for the wallpaper when it's zoomed in -->

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

@@ -1,7 +1,7 @@
-From 4aa1829873f1f8f855fc2bb32f37c5dfd343d9cd Mon Sep 17 00:00:00 2001
+From 88c071a7385821219dbb90bc8475bece813e84c9 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 05/21] UI: Increase default status bar height
+Subject: [PATCH 05/22] UI: Increase default status bar height
 
 Change-Id: Ibbcf63159e19bb2bb2b1094ea07ab85917630b07
 ---
@@ -9,7 +9,7 @@ Change-Id: Ibbcf63159e19bb2bb2b1094ea07ab85917630b07
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml
-index de7a1175b4a3..8d56e94458db 100644
+index a666a5b4b796..b62a785cd69f 100644
 --- a/core/res/res/values/dimens.xml
 +++ b/core/res/res/values/dimens.xml
 @@ -43,7 +43,7 @@

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

@@ -1,7 +1,7 @@
-From 2fff33790ba845ec3045497a4f3679cc8fb89a5e Mon Sep 17 00:00:00 2001
+From af017461178d08dcd0999b76d800e1e4f773c09b 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 06/21] UI: Revive navbar layout tuning via sysui_nav_bar
+Subject: [PATCH 06/22] UI: Revive navbar layout tuning via sysui_nav_bar
  tunable
 
 Google keeps fixing what ain't broken.

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

@@ -1,7 +1,7 @@
-From 0b204ff8b577160aed587cff1d9d7b60c78c6b1d Mon Sep 17 00:00:00 2001
+From 3da8e7d5f61c024dd70a311f9b67622f419c07a0 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 07/21] UI: Use SNAP_FIXED_RATIO for multi-window globally
+Subject: [PATCH 07/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 7e42418e06c8..b723eb64dc6a 100644
+index 08940c03b095..1319c26bb1be 100644
 --- a/core/res/res/values/config.xml
 +++ b/core/res/res/values/config.xml
-@@ -3515,7 +3515,7 @@
+@@ -3529,7 +3529,7 @@
               1 - 3 snap targets: fixed ratio, 1:1, (1 - fixed ratio)
               2 - 1 snap target: 1:1
      -->

patches_platform/frameworks_base/0008-UI-Unblock-alarm-status-bar-icon.patch

@@ -1,7 +1,7 @@
-From 9f0eafb52cf46793f29714979fabe9d245df530f Mon Sep 17 00:00:00 2001
+From 186e9e99567c3961a63535ae2b04aa172cfc1734 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Thu, 14 Oct 2021 15:45:24 +0000
-Subject: [PATCH 08/21] UI: Unblock alarm status bar icon
+Subject: [PATCH 08/22] UI: Unblock alarm status bar icon
 
 That's very Zen of you, Google...
 
@@ -24,10 +24,10 @@ index 6a171ceff1ed..2c1321f1c013 100644
          mDarkIconManager.setBlockList(mBlockedIcons);
          mStatusBarIconController.addIconGroup(mDarkIconManager);
 diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
-index b9df71304b3c..4d6886714120 100644
+index f9c6ebbd26e3..7b4dc47a7b48 100644
 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
 +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
-@@ -210,7 +210,6 @@ public class KeyguardStatusBarView extends RelativeLayout implements
+@@ -206,7 +206,6 @@ public class KeyguardStatusBarView extends RelativeLayout implements
      // Set hidden status bar items
      private void loadBlockList() {
          Resources r = getResources();

patches_platform/frameworks_base/0009-core-Remove-default-aspect-ratio-limit-for-old-apps.patch

@@ -1,7 +1,7 @@
-From 366d61fb371f01453f0d46ac21927752b787b71f Mon Sep 17 00:00:00 2001
+From 1ec1cdc8f12227b0612d258ee110432ed954dde1 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Tue, 3 Nov 2020 22:38:49 -0800
-Subject: [PATCH 09/21] core: Remove default aspect ratio limit for old apps
+Subject: [PATCH 09/22] core: Remove default aspect ratio limit for old apps
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

patches_platform/frameworks_base/0010-SystemUI-Always-refresh-power-menu-on-UI-mode-change.patch

@@ -1,7 +1,7 @@
-From 3139b5f6c75f2d76640bd7c10fd7ab5d4ecd6f7e Mon Sep 17 00:00:00 2001
+From c1d673a010c19018d37ec21c2bbed09480c4dce9 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Tue, 5 Oct 2021 21:01:15 -0700
-Subject: [PATCH 10/21] SystemUI: Always refresh power menu on UI mode change
+Subject: [PATCH 10/22] SystemUI: Always refresh power menu on UI mode change
 
 This is necessary for reliably theming the global actions dialog with
 dynamic colors and adapting it to light/dark themes.
@@ -15,10 +15,10 @@ Change-Id: Id6f6623096ed231e841ca3794b47f8a0ab54dae6
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java
-index 06e74821869e..b0333f3c4463 100644
+index 9ada54b9ef6f..1ae3b31fd836 100644
 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java
 +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java
-@@ -689,7 +689,7 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene
+@@ -703,7 +703,7 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene
      @Override
      public void onUiModeChanged() {
          mContext.getTheme().applyStyle(mContext.getThemeResId(), true);

patches_platform/frameworks_base/0011-SystemUI-Use-Monet-colors-for-power-menu.patch

@@ -1,7 +1,7 @@
-From d06024052d975a00ebbc90dfe0e25479773ca0c4 Mon Sep 17 00:00:00 2001
+From 314462d52502de4c850b3e657bdca280679188e1 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Sat, 9 Oct 2021 14:39:38 -0700
-Subject: [PATCH 11/21] SystemUI: Use Monet colors for power menu
+Subject: [PATCH 11/22] SystemUI: Use Monet colors for power menu
 
 It's odd that the power menu doesn't use Monet colors, unlike most of
 System UI. This makes it feel more integrated with the rest of the
@@ -30,7 +30,7 @@ index b98694e2fae7..3a6b62dfe1c8 100644
 +    <color name="global_actions_lite_emergency_icon">@*android:color/accent_device_default_dark</color>
  </resources>
 diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml
-index 2260d2175268..87523686bb2a 100644
+index f539b0cf68a1..9ea915c1cb3f 100644
 --- a/packages/SystemUI/res/values/colors.xml
 +++ b/packages/SystemUI/res/values/colors.xml
 @@ -53,11 +53,11 @@

patches_platform/frameworks_base/0012-Revert-Make-QS-always-use-dark-theme-colors.patch

@@ -1,7 +1,7 @@
-From ca37991b2e96c287dfdd2bbc34d968a88a488fa1 Mon Sep 17 00:00:00 2001
+From d6a215d67f767fe6a793dd66f5bf8dcd02f48d57 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Wed, 6 Oct 2021 18:40:30 -0700
-Subject: [PATCH 12/21] Revert "Make QS always use dark theme colors"
+Subject: [PATCH 12/22] Revert "Make QS always use dark theme colors"
 
 This reverts commit d62f7249f9e3222da95ecf6816601c408aac6be5.
 
@@ -15,7 +15,7 @@ Change-Id: Iac4c96ccb3845812ca3df820bf27dc533816f72e
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/packages/SystemUI/res/layout/quick_qs_status_icons.xml b/packages/SystemUI/res/layout/quick_qs_status_icons.xml
-index 5b9ca1b26158..bbd3e47a568f 100644
+index 42a7c895ff84..27514617fb23 100644
 --- a/packages/SystemUI/res/layout/quick_qs_status_icons.xml
 +++ b/packages/SystemUI/res/layout/quick_qs_status_icons.xml
 @@ -24,7 +24,7 @@
@@ -25,10 +25,10 @@ index 5b9ca1b26158..bbd3e47a568f 100644
 -    android:theme="@style/Theme.SystemUI.QuickSettings.Header">
 +    android:theme="@style/QSHeaderTheme">
  
-     <com.android.systemui.statusbar.policy.Clock
+     <LinearLayout
-         android:id="@+id/clock"
+         android:id="@+id/clock_container"
 diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
-index 51eabf60385e..504a06cfd9ba 100644
+index 93d60cce2915..e592fe2dd630 100644
 --- a/packages/SystemUI/res/values/styles.xml
 +++ b/packages/SystemUI/res/values/styles.xml
 @@ -395,7 +395,7 @@
@@ -40,7 +40,7 @@ index 51eabf60385e..504a06cfd9ba 100644
          <item name="lightIconTheme">@style/QSIconTheme</item>
          <item name="darkIconTheme">@style/QSIconTheme</item>
          <item name="android:colorError">@*android:color/error_color_material_dark</item>
-@@ -484,7 +484,7 @@
+@@ -486,7 +486,7 @@
          <item name="singleToneColor">@color/dark_mode_qs_icon_color_single_tone</item>
      </style>
  

patches_platform/frameworks_base/0013-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch

@@ -1,7 +1,7 @@
-From 1f1db9627fe3962525d13db733e1171fd0207a53 Mon Sep 17 00:00:00 2001
+From 1ed0fb3e67d9d1f41435e7e60b801837a83c2c64 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Wed, 6 Oct 2021 18:41:11 -0700
-Subject: [PATCH 13/21] Revert "Do not re-inflate QS and SB when
+Subject: [PATCH 13/22] Revert "Do not re-inflate QS and SB when
  CONFIG_UI_MODE"
 
 This reverts commit 8a40ff855b86bc86e23367017002289920855a4e.

patches_platform/frameworks_base/0014-SystemUI-Follow-light-dark-theme-in-quick-settings.patch

@@ -1,7 +1,7 @@
-From 92ab25604e1dcf584f0790b3f1eb8f8d40e8b753 Mon Sep 17 00:00:00 2001
+From c0aadaca1ab833a13ecacc48cf5c458427f8f6b4 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Mon, 11 Oct 2021 19:24:58 -0700
-Subject: [PATCH 14/21] SystemUI: Follow light/dark theme in quick settings
+Subject: [PATCH 14/22] SystemUI: Follow light/dark theme in quick settings
 
 Android 12's dual-tone style where the quick settings panel is always
 dark makes the light theme look like a second-class citizen. Pure black
@@ -82,7 +82,7 @@ index 860d23b11439..8f12b95ed4f6 100644
              </shape>
          </item>
 diff --git a/packages/SystemUI/res/values-night/styles.xml b/packages/SystemUI/res/values-night/styles.xml
-index 461505f12ce6..c1d2ca23de31 100644
+index ffcc3a821d36..a9fa9f3f9fde 100644
 --- a/packages/SystemUI/res/values-night/styles.xml
 +++ b/packages/SystemUI/res/values-night/styles.xml
 @@ -24,6 +24,18 @@
@@ -105,7 +105,7 @@ index 461505f12ce6..c1d2ca23de31 100644
          <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
          <item name="android:textColor">?android:attr/textColorPrimary</item>
 diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
-index 504a06cfd9ba..5d230e522636 100644
+index e592fe2dd630..a5ed039bd3fd 100644
 --- a/packages/SystemUI/res/values/styles.xml
 +++ b/packages/SystemUI/res/values/styles.xml
 @@ -398,12 +398,12 @@
@@ -125,7 +125,7 @@ index 504a06cfd9ba..5d230e522636 100644
          <item name="android:itemTextAppearance">@style/Control.MenuItem</item>
      </style>
  
-@@ -617,7 +617,7 @@
+@@ -619,7 +619,7 @@
  
      <style name="QSCustomizeToolbar" parent="@*android:style/Widget.DeviceDefault.Toolbar">
          <item name="android:textColor">?android:attr/textColorPrimary</item>
@@ -163,10 +163,10 @@ index 222539d49526..da7c63ff15a3 100644
      private val colorUnavailable = Utils.applyAlpha(UNAVAILABLE_ALPHA, colorInactive)
  
 diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
-index 7d25aeef6f98..2e3d5bbcc4af 100644
+index 27c129ad34c5..6bdf82a60e40 100644
 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
 +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
-@@ -690,7 +690,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
+@@ -692,7 +692,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
                  mNotificationsAlpha = behindAlpha;
                  mNotificationsTint = behindTint;
                  mBehindAlpha = 1;
@@ -176,7 +176,7 @@ index 7d25aeef6f98..2e3d5bbcc4af 100644
                  mBehindAlpha = behindAlpha;
                  if (mState == ScrimState.SHADE_LOCKED) {
 diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java
-index 2c0de629de8a..066d3e2f94c3 100644
+index 15b8c67fd4ba..577e33c3c8d6 100644
 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java
 +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java
 @@ -88,7 +88,7 @@ public enum ScrimState {
@@ -250,7 +250,7 @@ index 2c0de629de8a..066d3e2f94c3 100644
              }
          }
      },
-@@ -442,4 +442,4 @@ public enum ScrimState {
+@@ -468,4 +468,4 @@ public enum ScrimState {
      public void setClipQsScrim(boolean clipsQsScrim) {
          mClipQsScrim = clipsQsScrim;
      }

patches_platform/frameworks_base/0015-SystemUI-Initialize-QS-tiles-in-inactive-state.patch

@@ -1,7 +1,7 @@
-From 25186642a61614d05440da0ee6d217821a9bf200 Mon Sep 17 00:00:00 2001
+From a49d127bf72839cdbeb1bea6e1b7e21612ae91a9 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Mon, 11 Oct 2021 19:25:02 -0700
-Subject: [PATCH 15/21] SystemUI: Initialize QS tiles in inactive state
+Subject: [PATCH 15/22] SystemUI: Initialize QS tiles in inactive state
 
 Now that the QS fragment is recreated when changing the UI mode (so that
 it follows light/dark themes), all tiles flash with active color briefly

patches_platform/frameworks_base/0016-SystemUI-Add-dual-tone-light-and-dark-themes-for-QS.patch

@@ -1,7 +1,7 @@
-From 8b5cdeea2207623ae90fbb7dfa7707c91c70d33d Mon Sep 17 00:00:00 2001
+From 798b251cd278e00d214e99f4d35bdd81140e973b Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Mon, 11 Oct 2021 19:25:08 -0700
-Subject: [PATCH 16/21] SystemUI: Add dual-tone light and dark themes for QS
+Subject: [PATCH 16/22] SystemUI: Add dual-tone light and dark themes for QS
 
 Google's dual-tone QS design where the notification panel has a
 semantically higher elevation adds depth to the notification+QS shade,
@@ -80,7 +80,7 @@ index 1571fab66a5b..0683c20a4a4c 100644
          <item name="alertDialogTheme">@style/Theme.DeviceDefault.Dialog.Alert</item>
          <item name="forceDarkAllowed">false</item>
 diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
-index 5d230e522636..a03e9ea89342 100644
+index a5ed039bd3fd..bb258ab18f82 100644
 --- a/packages/SystemUI/res/values/styles.xml
 +++ b/packages/SystemUI/res/values/styles.xml
 @@ -402,7 +402,7 @@
@@ -93,7 +93,7 @@ index 5d230e522636..a03e9ea89342 100644
          <item name="android:itemTextAppearance">@style/Control.MenuItem</item>
      </style>
 diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
-index 2e3d5bbcc4af..89e178117393 100644
+index 6bdf82a60e40..cc1c8e6255b8 100644
 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
 +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
 @@ -186,6 +186,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
@@ -112,7 +112,7 @@ index 2e3d5bbcc4af..89e178117393 100644
      }
  
      /**
-@@ -849,7 +851,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
+@@ -851,7 +853,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
                      && !mBlankScreen;
  
              mScrimInFront.setColors(mColors, animateScrimInFront);
@@ -121,7 +121,7 @@ index 2e3d5bbcc4af..89e178117393 100644
              mNotificationsScrim.setColors(mColors, animateScrimNotifications);
  
              dispatchBackScrimState(mScrimBehind.getViewAlpha());
-@@ -1205,11 +1207,20 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
+@@ -1207,11 +1209,20 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
          if (mScrimBehind == null) return;
          int background = Utils.getColorAttr(mScrimBehind.getContext(),
                  android.R.attr.colorBackgroundFloating).getDefaultColor();

patches_platform/frameworks_base/0017-SystemUI-Remove-nav-bar-background-in-QS-customizer.patch

@@ -1,7 +1,7 @@
-From db01ad5d34519b5bd3d4c68f195b69de43d8bf3e Mon Sep 17 00:00:00 2001
+From 02806d68e92827a0799395338d3b29c055e176ef Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Mon, 11 Oct 2021 19:25:11 -0700
-Subject: [PATCH 17/21] SystemUI: Remove nav bar background in QS customizer
+Subject: [PATCH 17/22] SystemUI: Remove nav bar background in QS customizer
 
 This looks outdated, since most apps are edge-to-edge nowadays.
 

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

@@ -1,7 +1,7 @@
-From c351a05332f409038c1b007706e010556d267b45 Mon Sep 17 00:00:00 2001
+From 22f30f47048335c6a64a35ce68eafc640bfb40af Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Tue, 5 Oct 2021 21:01:50 -0700
-Subject: [PATCH 18/21] Paint: Enable subpixel text positioning by default
+Subject: [PATCH 18/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/0019-SystemUI-Fix-QS-status-font-weight-mismatch-in-dark-.patch

@@ -1,7 +1,7 @@
-From 999b53f49d6b0a4c5d5fd123a04686d35118cee0 Mon Sep 17 00:00:00 2001
+From 00373ab57fc28c8f1e5320748879d99b30d49112 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Tue, 5 Oct 2021 21:02:12 -0700
-Subject: [PATCH 19/21] SystemUI: Fix QS status font weight mismatch in dark
+Subject: [PATCH 19/22] SystemUI: Fix QS status font weight mismatch in dark
  mode
 
 Text in the QS status bar is medium in light mode and regular in dark
@@ -13,7 +13,7 @@ Change-Id: Ic6e5dc547d4ded9d231f88f6cac3e1e9f8483d5e
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/packages/SystemUI/res/values-night/styles.xml b/packages/SystemUI/res/values-night/styles.xml
-index c1d2ca23de31..5f35afb6c731 100644
+index a9fa9f3f9fde..3fd6f9cc5454 100644
 --- a/packages/SystemUI/res/values-night/styles.xml
 +++ b/packages/SystemUI/res/values-night/styles.xml
 @@ -37,7 +37,7 @@

patches_platform/frameworks_base/0020-SystemUI-Expose-legacy-Wi-Fi-and-cellular-data-QS-ti.patch

@@ -1,7 +1,7 @@
-From b7ffdcec4fa6b192198cff5d143d9fb9ef5ed4f2 Mon Sep 17 00:00:00 2001
+From 7850ab773ef48f6fddb166e1af10fce56ba06648 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Sat, 16 Oct 2021 03:27:23 -0700
-Subject: [PATCH 20/21] SystemUI: Expose legacy Wi-Fi and cellular data QS
+Subject: [PATCH 20/22] SystemUI: Expose legacy Wi-Fi and cellular data QS
  tiles
 
 We'll still use Android 12's unified internet settings and the Internet

patches_platform/frameworks_base/0021-SystemUI-Allow-Wi-Fi-cell-tiles-to-co-exist-with-pro.patch

@@ -1,7 +1,7 @@
-From 48d242260887d95b592b8796fce1176d334394d0 Mon Sep 17 00:00:00 2001
+From 6ec18b7fe383ba54de08df6d6d76b74361491ddd Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Mon, 25 Oct 2021 19:32:33 -0700
-Subject: [PATCH 21/21] SystemUI: Allow Wi-Fi/cell tiles to co-exist with
+Subject: [PATCH 21/22] SystemUI: Allow Wi-Fi/cell tiles to co-exist with
  provider model
 
 The dedicated Wi-Fi/cellular data QS tiles are partially working now
@@ -24,10 +24,10 @@ Change-Id: I10af134b35dfabdb9275f1aca8ca8512e1db6d27
  4 files changed, 37 insertions(+), 58 deletions(-)
 
 diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java
-index 7cb1421e3f0f..aa917d9ec397 100644
+index cc9e7485dcff..4bf8053017f1 100644
 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java
 +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java
-@@ -245,7 +245,7 @@ public class InternetTile extends QSTileImpl<SignalState> {
+@@ -255,7 +255,7 @@ public class InternetTile extends QSTileImpl<SignalState> {
                  Log.d(TAG, "setWifiIndicators: " + indicators);
              }
              mWifiInfo.mEnabled = indicators.enabled;
@@ -36,7 +36,7 @@ index 7cb1421e3f0f..aa917d9ec397 100644
                  return;
              }
              mWifiInfo.mConnected = indicators.qsIcon.visible;
-@@ -265,7 +265,7 @@ public class InternetTile extends QSTileImpl<SignalState> {
+@@ -275,7 +275,7 @@ public class InternetTile extends QSTileImpl<SignalState> {
              if (DEBUG) {
                  Log.d(TAG, "setMobileDataIndicators: " + indicators);
              }
@@ -110,10 +110,10 @@ index 43781f3941ba..cf89cabf6ab9 100644
          }
      }
 diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
-index ef2ca985858d..39fa68cab281 100644
+index eeea699a0b74..4a25d1bd7661 100644
 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
 +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
-@@ -58,10 +58,11 @@ public interface NetworkController extends CallbackController<SignalCallback>, D
+@@ -59,10 +59,11 @@ public interface NetworkController extends CallbackController<SignalCallback>, D
          public String description;
          public boolean isTransient;
          public String statusLabel;
@@ -126,7 +126,7 @@ index ef2ca985858d..39fa68cab281 100644
              this.enabled = enabled;
              this.statusIcon = statusIcon;
              this.qsIcon = qsIcon;
-@@ -70,6 +71,7 @@ public interface NetworkController extends CallbackController<SignalCallback>, D
+@@ -71,6 +72,7 @@ public interface NetworkController extends CallbackController<SignalCallback>, D
              this.description = description;
              this.isTransient = isTransient;
              this.statusLabel = statusLabel;
@@ -134,7 +134,7 @@ index ef2ca985858d..39fa68cab281 100644
          }
  
          @Override
-@@ -83,6 +85,7 @@ public interface NetworkController extends CallbackController<SignalCallback>, D
+@@ -84,6 +86,7 @@ public interface NetworkController extends CallbackController<SignalCallback>, D
                  .append(",description=").append(description)
                  .append(",isTransient=").append(isTransient)
                  .append(",statusLabel=").append(statusLabel)
@@ -142,7 +142,7 @@ index ef2ca985858d..39fa68cab281 100644
                  .append(']').toString();
          }
      }
-@@ -104,12 +107,13 @@ public interface NetworkController extends CallbackController<SignalCallback>, D
+@@ -105,12 +108,13 @@ public interface NetworkController extends CallbackController<SignalCallback>, D
          public int subId;
          public boolean roaming;
          public boolean showTriangle;
@@ -157,7 +157,7 @@ index ef2ca985858d..39fa68cab281 100644
              this.statusIcon = statusIcon;
              this.qsIcon = qsIcon;
              this.statusType = statusType;
-@@ -123,6 +127,7 @@ public interface NetworkController extends CallbackController<SignalCallback>, D
+@@ -124,6 +128,7 @@ public interface NetworkController extends CallbackController<SignalCallback>, D
              this.subId = subId;
              this.roaming = roaming;
              this.showTriangle = showTriangle;
@@ -165,7 +165,7 @@ index ef2ca985858d..39fa68cab281 100644
          }
  
          @Override
-@@ -141,6 +146,7 @@ public interface NetworkController extends CallbackController<SignalCallback>, D
+@@ -142,6 +147,7 @@ public interface NetworkController extends CallbackController<SignalCallback>, D
                  .append(",subId=").append(subId)
                  .append(",roaming=").append(roaming)
                  .append(",showTriangle=").append(showTriangle)

patches_platform/frameworks_base/0022-Fix-QS-clock-being-white-on-light-theme.patch

@@ -0,0 +1,72 @@
+From 00463f495ad23afddbf5bc0b4c227e63d09bc8e4 Mon Sep 17 00:00:00 2001
+From: SagarMakhar <sagarmakhar@gmail.com>
+Date: Sat, 6 Nov 2021 13:16:24 +0000
+Subject: [PATCH 22/22] Fix QS clock being white on light theme
+
+Steps to reproduce without this commit:
+- Turn off dark theme
+- Play a song and wait for media player to show in QS
+- Confirm clock text color is white
+
+Signed-off-by: SagarMakhar <sagarmakhar@gmail.com>
+---
+ .../systemui/qs/QuickStatusBarHeaderController.java | 13 -------------
+ 1 file changed, 13 deletions(-)
+
+diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeaderController.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeaderController.java
+index 18d6e646b007..7aa668440b4b 100644
+--- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeaderController.java
++++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeaderController.java
+@@ -22,10 +22,8 @@ import android.view.View.OnClickListener;
+ 
+ import androidx.annotation.NonNull;
+ 
+-import com.android.internal.colorextraction.ColorExtractor;
+ import com.android.internal.logging.UiEventLogger;
+ import com.android.systemui.R;
+-import com.android.systemui.colorextraction.SysuiColorExtractor;
+ import com.android.systemui.demomode.DemoMode;
+ import com.android.systemui.demomode.DemoModeController;
+ import com.android.systemui.plugins.ActivityStarter;
+@@ -83,9 +81,6 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader
+     private final String mMicSlot;
+     private final String mLocationSlot;
+ 
+-    private SysuiColorExtractor mColorExtractor;
+-    private ColorExtractor.OnColorsChangedListener mOnColorsChangedListener;
+-
+     private PrivacyItemController.Callback mPICCallback = new PrivacyItemController.Callback() {
+         @Override
+         public void onPrivacyItemsChanged(@NonNull List<PrivacyItem> privacyItems) {
+@@ -135,7 +130,6 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader
+             QuickQSPanelController quickQSPanelController,
+             QSCarrierGroupController.Builder qsCarrierGroupControllerBuilder,
+             PrivacyLogger privacyLogger,
+-            SysuiColorExtractor colorExtractor,
+             PrivacyDialogController privacyDialogController,
+             QSExpansionPathInterpolator qsExpansionPathInterpolator,
+             FeatureFlags featureFlags,
+@@ -168,12 +162,6 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader
+ 
+         mIconManager = new StatusBarIconController.TintedIconManager(mIconContainer, featureFlags);
+         mDemoModeReceiver = new ClockDemoModeReceiver(mClockView);
+-        mColorExtractor = colorExtractor;
+-        mOnColorsChangedListener = (extractor, which) -> {
+-            final boolean lightTheme = mColorExtractor.getNeutralColors().supportsDarkText();
+-            mClockView.onColorsChanged(lightTheme);
+-        };
+-        mColorExtractor.addOnColorsChangedListener(mOnColorsChangedListener);
+ 
+         mCameraSlot = getResources().getString(com.android.internal.R.string.status_bar_camera);
+         mMicSlot = getResources().getString(com.android.internal.R.string.status_bar_microphone);
+@@ -223,7 +211,6 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader
+ 
+     @Override
+     protected void onViewDetached() {
+-        mColorExtractor.removeOnColorsChangedListener(mOnColorsChangedListener);
+         mPrivacyChip.setOnClickListener(null);
+         mStatusBarIconController.removeIconGroup(mIconManager);
+         mQSCarrierGroupController.setOnSingleCarrierChangedListener(null);
+-- 
+2.25.1
+

patches_platform/packages_apps_Settings/9999-TEMP-Settings-Hack-in-LiveDisplay-entrypoint.patch

@@ -1,26 +1,18 @@
-From 29dda55886a296b913d358f292e67ac6d149830e Mon Sep 17 00:00:00 2001
+From 6e0b68e9e9da6bcb33eac9e91402a9479419bb86 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Tue, 26 Oct 2021 08:03:39 +0000
-Subject: [PATCH] [TEMP] Settings: Hack in LiveDisplay entrypoint
+Subject: [PATCH] Settings: Hack in LiveDisplay entrypoint
 
 Change-Id: Icec153e3d9203bba8bb5b000ecf537397058b349
 ---
- res/xml/display_settings.xml | 5 +++++
+ res/xml/display_settings.xml | 4 ++++
- 1 file changed, 5 insertions(+)
+ 1 file changed, 4 insertions(+)
 
 diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
-index c48dcbcaef..fa5d3cc77e 100644
+index 7bd370816e..9cf7afe0a5 100644
 --- a/res/xml/display_settings.xml
 +++ b/res/xml/display_settings.xml
-@@ -16,6 +16,7 @@
+@@ -86,6 +86,10 @@
- 
- <PreferenceScreen
-     xmlns:android="http://schemas.android.com/apk/res/android"
-+    xmlns:lineage="http://schemas.android.com/apk/res/lineageos.platform"
-     xmlns:settings="http://schemas.android.com/apk/res-auto"
-     android:key="display_settings_screen"
-     android:title="@string/display_settings"
-@@ -85,6 +86,10 @@
      <PreferenceCategory
          android:title="@string/category_name_color">
  

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

@@ -1,4 +1,4 @@
-From 7a633a53d8e20e2d976597a332bf5ba855ec1f75 Mon Sep 17 00:00:00 2001
+From 8613949607345b954525b24dedc843f5039ac781 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] vendor_lineage: Log privapp-permissions whitelist violations
@@ -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 2fe9cb01..7d971bba 100644
+index 9cc39324..fcf13b2b 100644
 --- a/config/common.mk
 +++ b/config/common.mk
-@@ -70,9 +70,9 @@ PRODUCT_COPY_FILES += \
+@@ -78,9 +78,9 @@ PRODUCT_COPY_FILES += \
  PRODUCT_COPY_FILES += \
-     vendor/lineage/config/permissions/org.lineageos.android.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/org.lineageos.android.xml
+     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
@@ -26,5 +26,5 @@ index 2fe9cb01..7d971bba 100644
  # Include AOSP audio files
  include vendor/lineage/config/aosp_audio.mk
 -- 
-2.17.1
+2.25.1
 

patches_platform/vendor_partner_gms/0001-SearchLauncher-Adapt-to-Trebuchet.patch

@@ -0,0 +1,49 @@
+From c4eac79c4f34e34e793f19e50d97a74daa05ec69 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Tue, 30 Nov 2021 12:58:00 +0000
+Subject: [PATCH] SearchLauncher: Adapt to Trebuchet
+
+---
+ apps/SearchLauncher/Android.mk          | 4 ++--
+ apps/SearchLauncher/AndroidManifest.xml | 3 ++-
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/apps/SearchLauncher/Android.mk b/apps/SearchLauncher/Android.mk
+index a9f182a..6b90364 100644
+--- a/apps/SearchLauncher/Android.mk
++++ b/apps/SearchLauncher/Android.mk
+@@ -20,7 +20,7 @@ include $(BUILD_PREBUILT)
+ include $(CLEAR_VARS)
+ 
+ # Relative path for Launcher3 directory
+-LAUNCHER_PATH := ../../../../packages/apps/Launcher3
++LAUNCHER_PATH := ../../../../packages/apps/Trebuchet
+ 
+ LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib
+ LOCAL_STATIC_JAVA_LIBRARIES := lib_launcherClient
+@@ -59,7 +59,7 @@ include $(BUILD_PACKAGE)
+ include $(CLEAR_VARS)
+ 
+ # Relative path for Launcher3 directory
+-LAUNCHER_PATH := ../../../../packages/apps/Launcher3
++LAUNCHER_PATH := ../../../../packages/apps/Trebuchet
+ 
+ LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib
+ LOCAL_STATIC_JAVA_LIBRARIES := \
+diff --git a/apps/SearchLauncher/AndroidManifest.xml b/apps/SearchLauncher/AndroidManifest.xml
+index d5ffded..a9b5597 100644
+--- a/apps/SearchLauncher/AndroidManifest.xml
++++ b/apps/SearchLauncher/AndroidManifest.xml
+@@ -55,7 +55,8 @@
+         android:label="@string/derived_app_name"
+         android:largeHeap="@bool/config_largeHeap"
+         android:restoreAnyVersion="true"
+-        android:supportsRtl="true" >
++        android:supportsRtl="true"
++        tools:replace="android:icon" >
+ 
+         <activity
+             android:name="com.android.searchlauncher.SearchLauncher"
+-- 
+2.25.1
+

patches_platform_personal/frameworks_base/0001-Add-LineageMonetAccentOverlay.patch

@@ -1,4 +1,4 @@
-From f3d98f8156017d822ffee5a9ecb1a073cd951c45 Mon Sep 17 00:00:00 2001
+From 72efb86a4e4e42b9d20c8d8ac30beb6471f96ad2 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Wed, 27 Oct 2021 14:38:37 +0000
 Subject: [PATCH 01/16] Add LineageMonetAccentOverlay

patches_platform_personal/frameworks_base/0002-Add-MiuiNavbarOverlay.patch

@@ -1,4 +1,4 @@
-From 2f9d2d2ebd0e85061d4c0f3d71245faf489dbf7f Mon Sep 17 00:00:00 2001
+From 131d58227278ec7d36fe16223335368d4674ce46 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 02/16] Add MiuiNavbarOverlay

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

@@ -1,4 +1,4 @@
-From aa00ecce8f9b93b34039ad94d543f780c5a670a7 Mon Sep 17 00:00:00 2001
+From 98145d7967512d9e294c9eaf5b4782efd34a1f8d 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 03/16] Disable cursor drag by default for editable TextViews

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

@@ -1,4 +1,4 @@
-From 13a853a48ad6c807d7d7193b7426ce8cf28267f4 Mon Sep 17 00:00:00 2001
+From 54dcd5497db5593a77aa8c6eacf6b6ed693338cb Mon Sep 17 00:00:00 2001
 From: AndyCGYan <GeForce8800Ultra@gmail.com>
 Date: Fri, 22 Mar 2019 00:41:20 +0800
 Subject: [PATCH 04/16] Disable FP lockouts

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

@@ -1,4 +1,4 @@
-From 6daf65e81a4f18bc0b1418281ad021fef9bc59e5 Mon Sep 17 00:00:00 2001
+From ae4b40705428d23abf321050a64e7793c591ae2b 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 05/16] Keyguard: Adjust clock style
@@ -60,7 +60,7 @@ index 7e3c87b24f07..58a1734aad22 100644
 +    <dimen name="below_clock_padding_start_icons">22dp</dimen>
  </resources>
 diff --git a/packages/SystemUI/res-keyguard/values/styles.xml b/packages/SystemUI/res-keyguard/values/styles.xml
-index 72b027af1bf6..6bfca3ece20e 100644
+index 098b7e8dedbe..86f053535ee6 100644
 --- a/packages/SystemUI/res-keyguard/values/styles.xml
 +++ b/packages/SystemUI/res-keyguard/values/styles.xml
 @@ -123,8 +123,6 @@
@@ -73,7 +73,7 @@ index 72b027af1bf6..6bfca3ece20e 100644
  
      <style name="TextAppearance.Keyguard.Secondary">
 diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
-index a03e9ea89342..285dd4766cab 100644
+index bb258ab18f82..f03f14d3316c 100644
 --- a/packages/SystemUI/res/values/styles.xml
 +++ b/packages/SystemUI/res/values/styles.xml
 @@ -343,7 +343,7 @@

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

@@ -1,4 +1,4 @@
-From 6ec7695af3b3811a4acbad3c8b4b0f3763ae2c68 Mon Sep 17 00:00:00 2001
+From 2f8ba4aa72d1c8941f1f6060a0c3a11b179d9447 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 06/16] Keyguard: Hide padlock unless UDFPS is in use
@@ -11,10 +11,10 @@ Change-Id: Ie91e80ca5c6637a51a8acc72fb28cd6ac2a7abb6
  1 file changed, 7 insertions(+), 22 deletions(-)
 
 diff --git a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
-index a41997ce3107..b27e1256ea30 100644
+index 52ebf2fa09d0..0ed36b4fa949 100644
 --- a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
 +++ b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
-@@ -254,32 +254,17 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
+@@ -259,32 +259,17 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
              return;
          }
  

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

@@ -1,4 +1,4 @@
-From 5df4e88ca6df56e938457cc992e74f2a5ca03c47 Mon Sep 17 00:00:00 2001
+From 9e81c9791a5c6fae799bf8d916ed70b62ea23f13 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 07/16] Keyguard: Never switch to large clock

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

@@ -1,4 +1,4 @@
-From 2dedbf09b293ee2081ce65ccd52e49c839dc0885 Mon Sep 17 00:00:00 2001
+From adc13dccc4a4a1f0c59f6d53630d8cd48210b7de 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 08/16] Keyguard: Refine indication text
@@ -14,17 +14,18 @@ Change-Id: Ib771c35610f712a1de34736e817bcfe616ac37d8
  6 files changed, 16 insertions(+), 8 deletions(-)
 
 diff --git a/packages/SystemUI/res-keyguard/values/styles.xml b/packages/SystemUI/res-keyguard/values/styles.xml
-index 6bfca3ece20e..54e5b8511b57 100644
+index 86f053535ee6..b03c87af3059 100644
 --- a/packages/SystemUI/res-keyguard/values/styles.xml
 +++ b/packages/SystemUI/res-keyguard/values/styles.xml
-@@ -137,7 +137,5 @@
+@@ -137,8 +137,6 @@
          <item name="android:textSize">14sp</item>
          <item name="android:maxLines">1</item>
          <item name="android:textColor">?attr/wallpaperTextColor</item>
 -        <item name="android:shadowColor">@color/keyguard_shadow_color</item>
 -        <item name="android:shadowRadius">?attr/shadowRadius</item>
      </style>
- </resources>
+ 
+     <style name="TextAppearance.Keyguard.BottomArea.Button">
 diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
 index 8dbd59d42ab7..68cba51e07fa 100644
 --- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml
@@ -38,10 +39,10 @@ index 8dbd59d42ab7..68cba51e07fa 100644
              android:paddingEnd="@dimen/keyguard_indication_text_padding"
              android:textAppearance="@style/TextAppearance.Keyguard.BottomArea"
 diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
-index 78db2a8a3485..b5c96a4df1a1 100644
+index c231afc41953..1485f3a936ca 100644
 --- a/packages/SystemUI/res/values/dimens.xml
 +++ b/packages/SystemUI/res/values/dimens.xml
-@@ -923,7 +923,7 @@
+@@ -920,7 +920,7 @@
      <dimen name="keyguard_lock_width">42dp</dimen>
      <dimen name="keyguard_lock_padding">20dp</dimen>
  
@@ -51,10 +52,10 @@ index 78db2a8a3485..b5c96a4df1a1 100644
  
      <!-- The text size for battery level -->
 diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java
-index 2d215e0f1f62..0c5870d6b6bf 100644
+index a424674ed252..b2af483bb76e 100644
 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java
 +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java
-@@ -183,12 +183,22 @@ public class KeyguardIndicationRotateTextViewController extends
+@@ -182,12 +182,22 @@ public class KeyguardIndicationRotateTextViewController extends
      }
  
      /**
@@ -79,14 +80,14 @@ index 2d215e0f1f62..0c5870d6b6bf 100644
       * Immediately show the passed indication type and schedule the next indication to show.
       * Will re-add this indication to be re-shown after all other indications have been
 diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
-index 1c933505172f..cad5cdaec533 100644
+index 8a397199dc84..f2df767db567 100644
 --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
 +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
-@@ -432,12 +432,11 @@ public class KeyguardIndicationController {
+@@ -433,12 +433,11 @@ public class KeyguardIndicationController {
      }
  
      private void updateResting() {
--        if (mRestingIndication != null
+-        if (!TextUtils.isEmpty(mRestingIndication)
 -                && !mRotateTextViewController.hasIndications()) {
 +        if (!mRotateTextViewController.hasIndications()) {
              mRotateTextViewController.updateIndication(
@@ -98,12 +99,12 @@ index 1c933505172f..cad5cdaec533 100644
                              .build(),
                      false);
 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 f1cde8a9be7a..10037fc93d75 100644
+index a5b5f1cbf1e7..df981c4e3129 100644
 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java
 +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java
-@@ -40,7 +40,7 @@ import java.util.LinkedList;
+@@ -49,7 +49,7 @@ public class KeyguardIndicationTextView extends TextView {
- public class KeyguardIndicationTextView extends TextView {
+     private static int sButtonStyleId = R.style.TextAppearance_Keyguard_BottomArea_Button;
-     private static final long MSG_MIN_DURATION_MILLIS_DEFAULT = 1500;
+ 
      private long mNextAnimationTime = 0;
 -    private boolean mAnimationsEnabled = true;
 +    private boolean mAnimationsEnabled = false;

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

@@ -1,27 +1,38 @@
-From 2b6af85f83905c848949f6c2f657849aa6224588 Mon Sep 17 00:00:00 2001
+From c7a8da0bbddfb96af36f8c62caef774a027ed4a0 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 09/16] Keyguard/UI: Fix status bar / quick settings margins
  and paddings
 
+Last revised on 2021/12/10, targeting s-qpr1
+
+The way I think SB/QS margins/paddings should work:
+- Devices with left notch: [notch_definition][status_bar_padding_start][content]...[content][status_bar_padding_end][rounded_corner_content_padding]
+- Devices with center or no notch: [rounded_corner_content_padding][status_bar_padding_start][content]...[content][status_bar_padding_end][rounded_corner_content_padding]
+Key point being:
+- SB (including keyguard) and QS should always act uniformly
+- Notch definition should only be the notch itself, without additional padding
+- Instead, these paddings should be covered by status_bar_padding_{start|end}
+As a result, below changes have been made:
 - Change keyguard_carrier_text_margin into a padding
 - Link keyguard paddings to status_bar_padding_{start|end}
 - Add status_bar_padding_{start|end} to quick settings header
 - Remove several unnecessary margins and paddings
+- Animate padding for new QS clock in s-qpr1
 
 Change-Id: Ic91fa398813e1907297bb0892c444d96405950e7
 ---
- packages/SystemUI/res/layout/keyguard_status_bar.xml  |  2 +-
+ .../res/layout/keyguard_status_bar.xml        |  2 +-
- .../SystemUI/res/layout/quick_qs_status_icons.xml     |  5 -----
+ .../res/layout/quick_qs_status_icons.xml      |  6 --
- .../layout/quick_status_bar_header_date_privacy.xml   | 11 +++++------
+ .../quick_status_bar_header_date_privacy.xml  |  5 +-
- packages/SystemUI/res/values-sw600dp/dimens.xml       |  6 ------
+ .../SystemUI/res/values-sw600dp/dimens.xml    |  6 --
- packages/SystemUI/res/values/dimens.xml               |  6 +++---
+ packages/SystemUI/res/values/dimens.xml       |  6 +-
- .../com/android/systemui/qs/QuickStatusBarHeader.java |  8 +++-----
+ .../systemui/qs/QuickStatusBarHeader.java     | 61 +++++++++++++------
- .../statusbar/phone/KeyguardStatusBarView.java        | 11 -----------
+ .../phone/KeyguardStatusBarView.java          |  7 ---
- 7 files changed, 12 insertions(+), 37 deletions(-)
+ 7 files changed, 47 insertions(+), 46 deletions(-)
 
 diff --git a/packages/SystemUI/res/layout/keyguard_status_bar.xml b/packages/SystemUI/res/layout/keyguard_status_bar.xml
-index eb7638233efd..249689f211af 100644
+index 850b01717308..054db34023af 100644
 --- a/packages/SystemUI/res/layout/keyguard_status_bar.xml
 +++ b/packages/SystemUI/res/layout/keyguard_status_bar.xml
 @@ -62,7 +62,7 @@
@@ -34,7 +45,7 @@ index eb7638233efd..249689f211af 100644
          android:gravity="center_vertical"
          android:ellipsize="marquee"
 diff --git a/packages/SystemUI/res/layout/quick_qs_status_icons.xml b/packages/SystemUI/res/layout/quick_qs_status_icons.xml
-index bbd3e47a568f..f6d07363ec84 100644
+index 27514617fb23..ada85c137600 100644
 --- a/packages/SystemUI/res/layout/quick_qs_status_icons.xml
 +++ b/packages/SystemUI/res/layout/quick_qs_status_icons.xml
 @@ -21,7 +21,6 @@
@@ -45,10 +56,10 @@ index bbd3e47a568f..f6d07363ec84 100644
      android:clickable="false"
      android:focusable="true"
      android:theme="@style/QSHeaderTheme">
-@@ -31,10 +30,7 @@
+@@ -39,10 +38,7 @@
+             android:id="@+id/clock"
              android:layout_width="wrap_content"
              android:layout_height="match_parent"
-         android:minWidth="48dp"
 -            android:minHeight="48dp"
              android:gravity="center_vertical|start"
 -            android:paddingStart="@dimen/status_bar_left_clock_starting_padding"
@@ -56,7 +67,15 @@ index bbd3e47a568f..f6d07363ec84 100644
              android:singleLine="true"
              android:textAppearance="@style/TextAppearance.QS.Status" />
  
-@@ -43,7 +39,6 @@
+@@ -50,7 +46,6 @@
+             android:id="@+id/date_clock"
+             android:layout_width="wrap_content"
+             android:layout_height="match_parent"
+-            android:layout_marginStart="@dimen/status_bar_left_clock_end_padding"
+             android:gravity="center_vertical|start"
+             android:singleLine="true"
+             android:textAppearance="@style/TextAppearance.QS.Status"
+@@ -64,7 +59,6 @@
          android:layout_width="0dp"
          android:layout_height="match_parent"
          android:layout_weight="1"
@@ -65,10 +84,10 @@ index bbd3e47a568f..f6d07363ec84 100644
          android:layout_marginStart="8dp"
          android:layout_gravity="end|center_vertical"
 diff --git a/packages/SystemUI/res/layout/quick_status_bar_header_date_privacy.xml b/packages/SystemUI/res/layout/quick_status_bar_header_date_privacy.xml
-index bff93a99258a..f00abf50fba0 100644
+index b1e8c386fe21..cff67718bc47 100644
 --- a/packages/SystemUI/res/layout/quick_status_bar_header_date_privacy.xml
 +++ b/packages/SystemUI/res/layout/quick_status_bar_header_date_privacy.xml
-@@ -25,16 +25,15 @@
+@@ -25,14 +25,12 @@
      android:gravity="center"
      android:layout_gravity="top"
      android:orientation="horizontal"
@@ -82,26 +101,18 @@ index bff93a99258a..f00abf50fba0 100644
          android:layout_height="match_parent"
 -        android:minHeight="48dp"
          android:layout_weight="1"
--        android:gravity="center_vertical|start" >
+         android:gravity="center_vertical|start" >
-+        android:gravity="center_vertical|start"
-+        android:paddingStart="@dimen/status_bar_padding_start" >
  
-         <com.android.systemui.statusbar.policy.DateView
+@@ -76,7 +74,6 @@
-             android:id="@+id/date"
-@@ -69,9 +68,9 @@
          android:id="@+id/privacy_container"
          android:layout_width="0dp"
          android:layout_height="match_parent"
 -        android:minHeight="48dp"
          android:layout_weight="1"
--        android:gravity="center_vertical|end" >
+         android:gravity="center_vertical|end" >
-+        android:gravity="center_vertical|end"
-+        android:paddingEnd="@dimen/status_bar_padding_end" >
- 
-     <include layout="@layout/ongoing_privacy_chip" />
  
 diff --git a/packages/SystemUI/res/values-sw600dp/dimens.xml b/packages/SystemUI/res/values-sw600dp/dimens.xml
-index da80b85b38bf..59a55d3a1197 100644
+index 0a34dfd71c7e..3d590d752a7b 100644
 --- a/packages/SystemUI/res/values-sw600dp/dimens.xml
 +++ b/packages/SystemUI/res/values-sw600dp/dimens.xml
 @@ -53,9 +53,6 @@
@@ -125,10 +136,10 @@ index da80b85b38bf..59a55d3a1197 100644
      <dimen name="screen_pinning_request_width">400dp</dimen>
      <!-- Screen pinning request bottom button circle widths -->
 diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
-index b5c96a4df1a1..775c25bd3b25 100644
+index 1485f3a936ca..b3941ff7f82b 100644
 --- a/packages/SystemUI/res/values/dimens.xml
 +++ b/packages/SystemUI/res/values/dimens.xml
-@@ -450,7 +450,7 @@
+@@ -449,7 +449,7 @@
      <dimen name="system_icons_super_container_margin_start">16dp</dimen>
  
      <!-- Margin end of the system icons super container when the avatar is missing. -->
@@ -137,7 +148,7 @@ index b5c96a4df1a1..775c25bd3b25 100644
  
      <!-- Width for the notification panel and related windows -->
      <dimen name="match_parent">-1px</dimen>
-@@ -871,7 +871,7 @@
+@@ -868,7 +868,7 @@
      <dimen name="kg_framed_avatar_size">32dp</dimen>
  
      <!-- Margin on the left side of the carrier text on Keyguard -->
@@ -146,7 +157,7 @@ index b5c96a4df1a1..775c25bd3b25 100644
  
      <!-- Margin on the left side of the battery % in the header. -->
      <dimen name="header_battery_margin_expanded">6dp</dimen>
-@@ -880,7 +880,7 @@
+@@ -877,7 +877,7 @@
      <dimen name="header_battery_margin_keyguard">6dp</dimen>
  
      <!-- Margin on the right side of the system icon group on Keyguard. -->
@@ -156,45 +167,142 @@ index b5c96a4df1a1..775c25bd3b25 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 8cbfefcb4fea..d8dde9cab7ef 100644
+index a5150000f47c..8ef433c7af17 100644
 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
 +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
-@@ -386,7 +386,9 @@ public class QuickStatusBarHeader extends FrameLayout {
+@@ -88,6 +88,10 @@ public class QuickStatusBarHeader extends FrameLayout {
+     private QSExpansionPathInterpolator mQSExpansionPathInterpolator;
+ 
+     private int mRoundedCornerPadding = 0;
++    private int mStatusBarPaddingStart;
++    private int mStatusBarPaddingEnd;
++    private int mHeaderPaddingLeft;
++    private int mHeaderPaddingRight;
+     private int mWaterfallTopInset;
+     private int mCutOutPaddingLeft;
+     private int mCutOutPaddingRight;
+@@ -99,6 +103,8 @@ public class QuickStatusBarHeader extends FrameLayout {
+     private List<String> mRssiIgnoredSlots;
+     private boolean mIsSingleCarrier;
+ 
++    private boolean mHasLeftCutout;
++    private boolean mHasRightCutout;
+     private boolean mHasCenterCutout;
+     private boolean mConfigShowBatteryEstimate;
+ 
+@@ -240,6 +246,11 @@ public class QuickStatusBarHeader extends FrameLayout {
+             mRoundedCornerPadding = resources.getDimensionPixelSize(
+                     R.dimen.rounded_corner_content_padding);
+ 
++        mStatusBarPaddingStart = resources.getDimensionPixelSize(
++                R.dimen.status_bar_padding_start);
++        mStatusBarPaddingEnd = resources.getDimensionPixelSize(
++                R.dimen.status_bar_padding_end);
++
+         int qsOffsetHeight = resources.getDimensionPixelSize(
+                 com.android.internal.R.dimen.quick_qs_offset_height);
+ 
+@@ -320,6 +331,9 @@ public class QuickStatusBarHeader extends FrameLayout {
+                 .addFloat(mDateView, "alpha", 0, 0, 1)
+                 .addFloat(mClockDateView, "alpha", 1, 0, 0)
+                 .addFloat(mQSCarriers, "alpha", 0, 1)
++                // Use statusbar paddings when collapsed, align with QS when expanded, and animate translation
++                .addFloat(mClockContainer, "translationX", mHeaderPaddingLeft + mStatusBarPaddingStart, 0)
++                .addFloat(mRightLayout, "translationX", -(mHeaderPaddingRight + mStatusBarPaddingEnd), 0)
+                 .setListener(new TouchAnimator.ListenerAdapter() {
+                     @Override
+                     public void onAnimationAtEnd() {
+@@ -426,8 +440,6 @@ public class QuickStatusBarHeader extends FrameLayout {
+         Pair<Integer, Integer> padding =
                  StatusBarWindowView.paddingNeededForCutoutAndRoundedCorner(
                          cutout, cornerCutoutPadding, -1);
-         mDatePrivacyView.setPadding(padding.first, 0, padding.second, 0);
+-        mDatePrivacyView.setPadding(padding.first, 0, padding.second, 0);
 -        mClockIconsView.setPadding(padding.first, 0, padding.second, 0);
-+        if (cutout == null) {
-+            mDateContainer.setPadding(0, 0, 0, 0);
-+        }
          LinearLayout.LayoutParams datePrivacySeparatorLayoutParams =
                  (LinearLayout.LayoutParams) mDatePrivacySeparator.getLayoutParams();
          LinearLayout.LayoutParams mClockIconsSeparatorLayoutParams =
-@@ -476,10 +478,6 @@ public class QuickStatusBarHeader extends FrameLayout {
+@@ -442,6 +454,12 @@ public class QuickStatusBarHeader extends FrameLayout {
+                 mClockIconsSeparatorLayoutParams.width = 0;
+                 setSeparatorVisibility(false);
+                 mShowClockIconsSeparator = false;
++                if (cornerCutoutPadding.first != 0) {
++                    mHasLeftCutout = true;
++                }
++                if (cornerCutoutPadding.second != 0) {
++                    mHasRightCutout = true;
++                }
+                 mHasCenterCutout = false;
+             } else {
+                 datePrivacySeparatorLayoutParams.width = topCutout.width();
+@@ -449,6 +467,8 @@ public class QuickStatusBarHeader extends FrameLayout {
+                 mClockIconsSeparatorLayoutParams.width = topCutout.width();
+                 mShowClockIconsSeparator = true;
+                 setSeparatorVisibility(mKeyguardExpansionFraction == 0f);
++                mHasLeftCutout = false;
++                mHasRightCutout = false;
+                 mHasCenterCutout = true;
+             }
+         }
+@@ -493,34 +513,37 @@ public class QuickStatusBarHeader extends FrameLayout {
+     private void updateHeadersPadding() {
+         setContentMargins(mDatePrivacyView, 0, 0);
+         setContentMargins(mClockIconsView, 0, 0);
+-        int paddingLeft = 0;
+-        int paddingRight = 0;
+ 
+         FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) getLayoutParams();
++        // Note: these are supposedly notification_side_paddings
+         int leftMargin = lp.leftMargin;
+         int rightMargin = lp.rightMargin;
+ 
+         // The clock might collide with cutouts, let's shift it out of the way.
+-        // We only do that if the inset is bigger than our own padding, since it's nicer to
+-        // align with
+-        if (mCutOutPaddingLeft > 0) {
+-            // if there's a cutout, let's use at least the rounded corner inset
+-            int cutoutPadding = Math.max(mCutOutPaddingLeft, mRoundedCornerPadding);
+-            paddingLeft = Math.max(cutoutPadding - leftMargin, 0);
++        // Margin will be the reference point of paddings/translations
++        // and will have to be subtracted from cutout paddings
++        boolean headerPaddingUpdated = false;
++        int headerPaddingLeft = Math.max(mCutOutPaddingLeft, mRoundedCornerPadding) - leftMargin;
++        if (headerPaddingLeft != mHeaderPaddingLeft) {
++            mHeaderPaddingLeft = headerPaddingLeft;
++            headerPaddingUpdated = true;
+         }
+-        if (mCutOutPaddingRight > 0) {
+-            // if there's a cutout, let's use at least the rounded corner inset
+-            int cutoutPadding = Math.max(mCutOutPaddingRight, mRoundedCornerPadding);
+-            paddingRight = Math.max(cutoutPadding - rightMargin, 0);
++        int headerPaddingRight = Math.max(mCutOutPaddingRight, mRoundedCornerPadding) - rightMargin;
++        if (headerPaddingRight != mHeaderPaddingRight) {
++            mHeaderPaddingRight = headerPaddingRight;
++            headerPaddingUpdated = true;
+         }
+-
+-        mDatePrivacyView.setPadding(paddingLeft,
++        // Update header animator with new paddings
++        if (headerPaddingUpdated) {
++            updateAnimators();
++        }
++        mDatePrivacyView.setPadding(mHeaderPaddingLeft + mStatusBarPaddingStart,
                  mWaterfallTopInset,
-                 paddingRight,
+-                paddingRight,
++                mHeaderPaddingRight + mStatusBarPaddingEnd,
                  0);
 -        mClockIconsView.setPadding(paddingLeft,
--                mWaterfallTopInset,
++        mClockIconsView.setPadding(0,
+                 mWaterfallTopInset,
 -                paddingRight,
--                0);
++                0,
+                 0);
      }
  
-     public void updateEverything() {
 diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
-index 4d6886714120..2ac8b3fe7bdb 100644
+index 7b4dc47a7b48..f3cd8daf8d03 100644
 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
 +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
-@@ -162,23 +162,12 @@ public class KeyguardStatusBarView extends RelativeLayout implements
+@@ -165,14 +165,7 @@ public class KeyguardStatusBarView extends RelativeLayout implements
-         lp.setMarginStart(getResources().getDimensionPixelSize(
-                 R.dimen.system_icons_super_container_margin_start));
-         mSystemIconsContainer.setLayoutParams(lp);
--        mSystemIconsContainer.setPaddingRelative(mSystemIconsContainer.getPaddingStart(),
--                mSystemIconsContainer.getPaddingTop(),
--                getResources().getDimensionPixelSize(R.dimen.system_icons_keyguard_padding_end),
--                mSystemIconsContainer.getPaddingBottom());
- 
-         // Respect font size setting.
          mCarrierLabel.setTextSize(TypedValue.COMPLEX_UNIT_PX,
                  getResources().getDimensionPixelSize(
                          com.android.internal.R.dimen.text_size_small_material));

patches_platform_personal/frameworks_base/0010-Revert-monet-Add-support-for-monet-cam16.patch

@@ -1,4 +1,4 @@
-From d95959a10d6ad02c0e1306f72721f8265d617eae Mon Sep 17 00:00:00 2001
+From 083ce1f8d7cd3baa0aa97940b2d53d0b65ced059 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Tue, 19 Oct 2021 12:11:24 +0000
 Subject: [PATCH 10/16] Revert "monet: Add support for monet (cam16)"

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

@@ -1,4 +1,4 @@
-From 8c6568389f821286e33e7c25c4397178dce4ab7f Mon Sep 17 00:00:00 2001
+From 9acde8c9886310dbbfe63e7cd6f30d4656d66b72 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/16] Revert "Update RAT icons to match Silk design"

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

@@ -1,4 +1,4 @@
-From 89f0089b29765a7ea10524941bca9f96f2a18715 Mon Sep 17 00:00:00 2001
+From 2377ef0cd6f3fb4abd5038b84c5bf785035ce738 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/16] UI: Always render windows into cutouts
@@ -55,10 +55,10 @@ index 32e43ca4e56c..18c28ae674f9 100644
      }
  
 diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java
-index a070942cc76a..32abd1e60714 100644
+index 10b36fe67daf..2a1817269446 100644
 --- a/services/core/java/com/android/server/wm/DisplayPolicy.java
 +++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
-@@ -1604,7 +1604,7 @@ public class DisplayPolicy {
+@@ -1616,7 +1616,7 @@ public class DisplayPolicy {
              pf.set((fl & FLAG_LAYOUT_IN_SCREEN) == 0 ? attached.getFrame() : df);
          }
  

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

@@ -1,4 +1,4 @@
-From 8d9b3153dd998145a4fa6a60e84bc68fa08e5321 Mon Sep 17 00:00:00 2001
+From cb0906eadc39915aae89e82b32905fc1e3925359 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/16] UI: Kill rounded corners in notification scrim
@@ -11,10 +11,10 @@ Change-Id: I09ed59e0e658ebd512a9d02a8ef3edfe2c9888da
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
-index 775c25bd3b25..e5c875c6bc2f 100644
+index b3941ff7f82b..140043673612 100644
 --- a/packages/SystemUI/res/values/dimens.xml
 +++ b/packages/SystemUI/res/values/dimens.xml
-@@ -760,7 +760,7 @@
+@@ -757,7 +757,7 @@
      <item name="keyguard_clock_line_spacing_scale_burmese" type="dimen" format="float">1</item>
  
      <item name="scrim_behind_alpha" format="float" type="dimen">0.62</item>

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

@@ -1,4 +1,4 @@
-From e385463bdbb1849425d9ad30fa21be9e30d447d8 Mon Sep 17 00:00:00 2001
+From f81da8f238f0ddf872ce900bade1783482bac0cb 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/16] UI: Reconfigure power menu items
@@ -11,10 +11,10 @@ Change-Id: I32cca6e2c6bb64d891efee959127edf7c0802cbc
  1 file changed, 5 deletions(-)
 
 diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
-index b723eb64dc6a..6fe30556c175 100644
+index 1319c26bb1be..e294223c9066 100644
 --- a/core/res/res/values/config.xml
 +++ b/core/res/res/values/config.xml
-@@ -2947,13 +2947,8 @@
+@@ -2961,13 +2961,8 @@
           "logout" =  Logout the current user
           -->
      <string-array translatable="false" name="config_globalActionsList">

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

@@ -1,4 +1,4 @@
-From f4685622ff415207ed23426469d02e7f6d37e362 Mon Sep 17 00:00:00 2001
+From 48705c6c69f2f3f6c8e8005b3c9b50883fe178d4 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 15/16] UI: Relax requirement for HINT_SUPPORTS_DARK_TEXT

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

@@ -1,4 +1,4 @@
-From 9f69e2fc32d18a880be11c22c7044417095794e0 Mon Sep 17 00:00:00 2001
+From 934dfff90102f46f097c5912ab9994d6796d9c63 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 16/16] UI: Remove privacy dot padding
@@ -9,10 +9,10 @@ Change-Id: I5d2e2b3e36f027b4348a83030d4b4d3c4f0209d1
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
-index e5c875c6bc2f..1431e32fe7bf 100644
+index 140043673612..51d4ffbc2d49 100644
 --- a/packages/SystemUI/res/values/dimens.xml
 +++ b/packages/SystemUI/res/values/dimens.xml
-@@ -1271,7 +1271,7 @@
+@@ -1265,7 +1265,7 @@
      <dimen name="ongoing_appops_chip_max_width">76dp</dimen>
      <dimen name="ongoing_appops_dot_diameter">6dp</dimen>
      <!--  Total minimum padding to enforce to ensure that the dot can always show  -->

patches_treble/build_make/0001-Remove-init.vndk-nodef.rc.patch

@@ -0,0 +1,76 @@
+From ff787114856cc9ccb057cf524e7089f7aed558cc Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Wed, 8 Dec 2021 07:04:53 +0000
+Subject: [PATCH] Remove init.vndk-nodef.rc
+
+This partially reverts "Deprecate VNDK-lite support from Legacy GSI".
+
+Paired with https://github.com/LineageOS/android_system_core/commit/0b265e35ddf42638fa807f5349a10c40e3d46446, it kicks permissive devices into bootloader.
+Given that GSI+permissive won't ever be a Lineage official scenario, revert this only on our side.
+Thanks @Kethen for the insight!
+
+Change-Id: I7c14fe5229e953f620bb225fa5c981752d0ac5f9
+---
+ target/product/gsi/Android.mk         | 12 ------------
+ target/product/gsi/init.gsi.rc        |  2 --
+ target/product/gsi/init.vndk-nodef.rc |  3 ---
+ target/product/gsi_release.mk         |  3 +--
+ 4 files changed, 1 insertion(+), 19 deletions(-)
+ delete mode 100644 target/product/gsi/init.vndk-nodef.rc
+
+diff --git a/target/product/gsi/Android.mk b/target/product/gsi/Android.mk
+index cb4fdcb33..f2c0f212c 100644
+--- a/target/product/gsi/Android.mk
++++ b/target/product/gsi/Android.mk
+@@ -228,15 +228,3 @@ LOCAL_SYSTEM_EXT_MODULE := true
+ LOCAL_MODULE_RELATIVE_PATH := init
+ 
+ include $(BUILD_PREBUILT)
+-
+-
+-include $(CLEAR_VARS)
+-LOCAL_MODULE := init.vndk-nodef.rc
+-LOCAL_LICENSE_KINDS := legacy_restricted
+-LOCAL_LICENSE_CONDITIONS := restricted
+-LOCAL_SRC_FILES := $(LOCAL_MODULE)
+-LOCAL_MODULE_CLASS := ETC
+-LOCAL_SYSTEM_EXT_MODULE := true
+-LOCAL_MODULE_RELATIVE_PATH := init
+-
+-include $(BUILD_PREBUILT)
+diff --git a/target/product/gsi/init.gsi.rc b/target/product/gsi/init.gsi.rc
+index f48284322..c6faba78d 100644
+--- a/target/product/gsi/init.gsi.rc
++++ b/target/product/gsi/init.gsi.rc
+@@ -1,5 +1,3 @@
+ #
+ # Android init script for GSI required initialization
+ #
+-
+-import /system/system_ext/etc/init/init.vndk-${ro.vndk.version:-nodef}.rc
+diff --git a/target/product/gsi/init.vndk-nodef.rc b/target/product/gsi/init.vndk-nodef.rc
+deleted file mode 100644
+index efeef117b..000000000
+--- a/target/product/gsi/init.vndk-nodef.rc
++++ /dev/null
+@@ -1,3 +0,0 @@
+-on early-init
+-    # Must define BOARD_VNDK_VERSION
+-    exec - root -- /system/bin/reboot bootloader
+diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk
+index d924d0bc1..5c3e10de7 100644
+--- a/target/product/gsi_release.mk
++++ b/target/product/gsi_release.mk
+@@ -59,8 +59,7 @@ PRODUCT_PACKAGES += com.android.apex.cts.shim.v1_with_prebuilts.flattened
+ # GSI specific tasks on boot
+ PRODUCT_PACKAGES += \
+     gsi_skip_mount.cfg \
+-    init.gsi.rc \
+-    init.vndk-nodef.rc \
++    init.gsi.rc
+ 
+ # Support additional P, Q and R VNDK packages
+ PRODUCT_EXTRA_VNDK_VERSIONS := 28 29 30
+-- 
+2.25.1
+

patches_treble/build_make/0001-build-Don-t-handle-apns-conf.patch

@@ -1,46 +0,0 @@
-From 3b33cbc0f0f6642bcb609a3d88e516452147debe Mon Sep 17 00:00:00 2001
-From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
-Date: Mon, 5 Oct 2020 01:51:46 +0000
-Subject: [PATCH] build: Don't handle apns-conf
-
-Leave it to vendor/lineage instead
-
-Change-Id: I51fb1436ee0ee2e33b20ca0810b69e827f3f34dc
----
- target/product/aosp_product.mk        | 7 -------
- target/product/full_base_telephony.mk | 5 -----
- 2 files changed, 12 deletions(-)
-
-diff --git a/target/product/aosp_product.mk b/target/product/aosp_product.mk
-index b41c35fb7..bdaa57aac 100644
---- a/target/product/aosp_product.mk
-+++ b/target/product/aosp_product.mk
-@@ -37,10 +37,3 @@ PRODUCT_PACKAGES += \
-     PhotoTable \
-     preinstalled-packages-platform-aosp-product.xml \
-     WallpaperPicker \
--
--# Telephony:
--#   Provide a APN configuration to GSI product
--ifeq ($(LINEAGE_BUILD),)
--PRODUCT_COPY_FILES += \
--    device/sample/etc/apns-full-conf.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/apns-conf.xml
--endif
-diff --git a/target/product/full_base_telephony.mk b/target/product/full_base_telephony.mk
-index e4f5a162b..5470ad2be 100644
---- a/target/product/full_base_telephony.mk
-+++ b/target/product/full_base_telephony.mk
-@@ -26,10 +26,5 @@ PRODUCT_VENDOR_PROPERTIES := \
- PRODUCT_COPY_FILES := \
-     frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml
- 
--ifeq ($(LINEAGE_BUILD),)
--PRODUCT_COPY_FILES += \
--    device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
--endif
--
- $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
- $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony.mk)
--- 
-2.25.1
-

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

@@ -1,22 +1,24 @@
-From defdefa842a5673bac917c9f5c2508aece8eebb8 Mon Sep 17 00:00:00 2001
+From d884ed740455da2dc943c14b7c2c41b5a2236c74 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/4] treble: Lineage-ify
 
 Squash of:
-- Revert "Update lineage.mk for LineageOS 16.0"
+- Proper target names
 - Remove fsck SELinux labels
 - treble: Add overlay-lineage
 - treble: Don't specify config_wallpaperCropperPackage
 - treble: Don't handle apns-conf
+
+Change-Id: I25eee7a3804f335430a447ae1424402d7e37851b
 ---
  base-pre.mk                                   |  3 -
  base.mk                                       | 16 ++--
- lineage.mk                                    |  1 +
+ generate.sh                                   |  3 +
  .../lineage/res/res/values/config.xml         | 81 +++++++++++++++++++
  .../base/core/res/res/values/config.xml       |  1 -
  sepolicy/file_contexts                        |  3 -
- 6 files changed, 91 insertions(+), 14 deletions(-)
+ 6 files changed, 93 insertions(+), 14 deletions(-)
  create mode 100644 overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
 
 diff --git a/base-pre.mk b/base-pre.mk
@@ -28,7 +30,7 @@ index 6a317e4..e69de29 100644
 -PRODUCT_COPY_FILES += \
 -	device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
 diff --git a/base.mk b/base.mk
-index 3697c49..0bd6bf0 100644
+index 3655b72..ce99bcc 100644
 --- a/base.mk
 +++ b/base.mk
 @@ -8,12 +8,14 @@ PRODUCT_COPY_FILES := \
@@ -65,15 +67,20 @@ index 3697c49..0bd6bf0 100644
  
  #VNDK config files
  PRODUCT_COPY_FILES += \
-diff --git a/lineage.mk b/lineage.mk
+diff --git a/generate.sh b/generate.sh
-index 172bb01..f6315b9 100644
+index b9647b9..66a48a6 100644
---- a/lineage.mk
+--- a/generate.sh
-+++ b/lineage.mk
++++ b/generate.sh
-@@ -1,3 +1,4 @@
+@@ -65,6 +65,9 @@ for part in a ab;do
- $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
+ 				fi
-+$(call inherit-product, device/lineage/sepolicy/common/sepolicy.mk)
+ 
- -include vendor/lineage/build/core/config.mk
+ 				target="treble_${arch}_${part_suffix}${apps_suffix}${su_suffix}"
- -include vendor/lineage/build/core/apicheck.mk
++				if [ "$1" == "lineage" ];then
++					target="lineage_${target}"
++				fi
+ 
+ 				baseArch="$arch"
+ 				if [ "$arch" = "a64" ];then
 diff --git a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml b/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
 new file mode 100644
 index 0000000..8df673a

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

@@ -1,4 +1,4 @@
-From 0edf02638abc9086f1c5b9264e2429c1bd0fc7eb Mon Sep 17 00:00:00 2001
+From 0150110fafdb657a9074b484be4d7e4e1dd50c95 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/4] treble: Set BOARD_EXT4_SHARE_DUP_BLOCKS explicitly

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

@@ -1,4 +1,4 @@
-From 5be43b2a36ba7aefef95e5b3dc624a1d6c8d3e4d Mon Sep 17 00:00:00 2001
+From 882eaf34cd14cbf1c9617498f0318bcaffca8632 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/4] treble: Set TARGET_NO_KERNEL_OVERRIDE

patches_treble/device_phh_treble/0004-add-offline-charger-sepolicy.patch

@@ -1,4 +1,4 @@
-From 4a99143b5d49cf82a20f3057d26e7775de6db7d6 Mon Sep 17 00:00:00 2001
+From 53e8034ca13a7e82beeba0f92d75495836ec0061 Mon Sep 17 00:00:00 2001
 From: Victor Bo <bvoid@yandex.ru>
 Date: Tue, 15 Sep 2020 21:26:45 -0400
 Subject: [PATCH 4/4] add offline charger sepolicy

patches_treble_phh/platform_frameworks_av/0001-Fix-BT-in-call-on-CAF-devices.patch

@@ -1,7 +1,7 @@
-From e280efe7945437b9295600f3ade73deb978284eb Mon Sep 17 00:00:00 2001
+From 4c452bb5ff1f23279efa5200c1c9b04d563bed8f 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 01/19] Fix BT in-call on CAF devices
+Subject: [PATCH 01/18] Fix BT in-call on CAF devices
 
 See https://github.com/phhusson/treble_experimentations/issues/374
 
@@ -127,5 +127,5 @@ index 84ed6567b2..9a857ff091 100644
  
      for (const xmlNode *children = cur->xmlChildrenNode; children != NULL;
 -- 
-2.29.2
+2.25.1
 

patches_treble_phh/platform_frameworks_av/0002-Add-partial-cam-id-is-hardcoded-support-for-Asus-ZF6.patch

@@ -1,7 +1,7 @@
-From f12a643ff63c4d54bb5d50a0a9d62d518b5db470 Mon Sep 17 00:00:00 2001
+From 8ee7ce7f56c8f45288e9a0135a8ee20f18d79b57 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 02/19] Add (partial, cam id is hardcoded) support for Asus ZF6
+Subject: [PATCH 02/18] Add (partial, cam id is hardcoded) support for Asus ZF6
  motor camera
 
 Change-Id: Iea6e1370780a1d16f728748d1d948d092532d8fe
@@ -90,5 +90,5 @@ index bc2e3479bc..b58c41e115 100644
      // Client functionality
  
 -- 
-2.29.2
+2.25.1
 

patches_treble_phh/platform_frameworks_av/0003-audiopolicy-try-again-with-trimmed-audio-port-name-i.patch

@@ -1,7 +1,7 @@
-From ee73ef44e02af6f673e83a8810fe9ea88dc2c821 Mon Sep 17 00:00:00 2001
+From 307bf28e8863d55291bb52cf5724fa0f541adfcd Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Thu, 23 Jan 2020 11:13:43 +0800
-Subject: [PATCH 03/19] audiopolicy: try again with trimmed audio port name if
+Subject: [PATCH 03/18] audiopolicy: try again with trimmed audio port name if
  not found
 
 * In Spreadtrum BSP, some audio routes may contain ports with extra
@@ -51,5 +51,5 @@ index 9a857ff091..d919951007 100644
                  ALOGE("%s: no source found with name=%s", __func__, devTag);
                  return BAD_VALUE;
 -- 
-2.29.2
+2.25.1
 

patches_treble_phh/platform_frameworks_av/0004-There-are-three-SCO-devices.-Fallback-from-one-to-th.patch

@@ -1,7 +1,7 @@
-From 8c442bfb93e93c8ea4e7a6de03ea7b5e42369f11 Mon Sep 17 00:00:00 2001
+From be6b7ba5a52fda8a3dba06e4b58cf7f91b1f166e 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 04/19] There are three SCO devices. Fallback from one to the
+Subject: [PATCH 04/18] There are three SCO devices. Fallback from one to the
  others if needed
 
 Change-Id: I414dcb6b154855c00cb8520b23dc1069827864b2
@@ -42,5 +42,5 @@ index 3a143b0058..565defc203 100644
  }
  
 -- 
-2.29.2
+2.25.1
 

patches_treble_phh/platform_frameworks_av/0005-Add-persist.sys.phh.samsung.camera_ids-property-to-a.patch

@@ -1,7 +1,7 @@
-From 7541559278b514f14a4f2f8a5f775996ee1e5e68 Mon Sep 17 00:00:00 2001
+From 9e9c10692262d752934e2343dfe76b0582c23601 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 05/19] Add persist.sys.phh.samsung.camera_ids property to
+Subject: [PATCH 05/18] Add persist.sys.phh.samsung.camera_ids property to
  access hidden Samsung cameras
 
 Change-Id: I2c7bf535272acc28ed2277e96c78ddd28a0b4593
@@ -76,5 +76,5 @@ index 4f2b878d26..d11ad8d766 100644
          ALOGE("%s: Transaction error in getting camera ID list from provider '%s': %s",
                  __FUNCTION__, mProviderName.c_str(), linked.description().c_str());
 -- 
-2.29.2
+2.25.1
 

patches_treble_phh/platform_frameworks_av/0006-Add-a-property-to-force-camera-timestamp-source.patch

@@ -1,7 +1,7 @@
-From 274f3141e9dc93dde02a81a1889cd76b14860251 Mon Sep 17 00:00:00 2001
+From 13f93488d8f5f2ebf9e350cd9f0f0cc0f7e8313d 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 06/19] Add a property to force camera timestamp source
+Subject: [PATCH 06/18] 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
@@ -41,5 +41,5 @@ index fd645c7a72..4a6a922c43 100644
      }
  
 -- 
-2.29.2
+2.25.1
 

patches_treble_phh/platform_frameworks_av/0007-FIH-devices-Fix-Earpiece-audio-output.patch

@@ -1,7 +1,7 @@
-From 6d40f84ff32e4c1f50f794890790d6159132ba4e Mon Sep 17 00:00:00 2001
+From ccc5945c9b22dd3e96cf8ed602d8fc1697dedb87 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 07/19] FIH devices: Fix "Earpiece" audio output
+Subject: [PATCH 07/18] 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
@@ -83,5 +83,5 @@ index d919951007..abc54ccc24 100644
  }
  
 -- 
-2.29.2
+2.25.1
 

patches_treble_phh/platform_frameworks_av/0008-No-longer-make-re-assigning-legacy-audio-groups-fata.patch

@@ -1,9 +1,9 @@
-From ed83392795ee1511619cb8d81160e6feecdcb7f9 Mon Sep 17 00:00:00 2001
+From 4babf9d2e8c5169cabe185b99bce89e0ccfa1b9b 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 08/19] [audiopolicy] No longer make re-assigning legacy audio
+Subject: [PATCH 08/18] No longer make re-assigning legacy audio groups fatal.
- groups fatal. Mi9 declares AUDIO_STREAM_PATCH and AUDIO_STREAM_REROUTING
+ Mi9 declares AUDIO_STREAM_PATCH and AUDIO_STREAM_REROUTING which is defined
- which is defined by framework too
+ by framework too
 
 Change-Id: I794fe22d63a8af705be4f5f09b9879ecaab3eae5
 ---
@@ -28,5 +28,5 @@ index 150a9a8e4f..740eab288c 100644
              }
              addSupportedAttributesToGroup(group, volumeGroup, strategy);
 -- 
-2.29.2
+2.25.1
 

patches_treble_phh/platform_frameworks_av/0009-Add-persist.sys.phh.disable_a2dp_offload-property-to.patch

@@ -1,7 +1,7 @@
-From 55f69fe9965419355d26e7b5a2bb9975eef0f23c Mon Sep 17 00:00:00 2001
+From cfc4fa6db350285e5a6ab87735e9252a1c070509 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 25 May 2020 21:26:54 +0200
-Subject: [PATCH 09/19] Add persist.sys.phh.disable_a2dp_offload property to
+Subject: [PATCH 09/18] Add persist.sys.phh.disable_a2dp_offload property to
  force a2dp offload
 
 Change-Id: Id474540c33c594cc4010a1a398d82bff8aadaeea
@@ -12,7 +12,7 @@ Change-Id: Id474540c33c594cc4010a1a398d82bff8aadaeea
  3 files changed, 197 insertions(+), 7 deletions(-)
 
 diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
-index 1aa18485f9..f9365cacc9 100644
+index 1e64538d89..2923575327 100644
 --- a/media/libstagefright/ACodec.cpp
 +++ b/media/libstagefright/ACodec.cpp
 @@ -1183,6 +1183,9 @@ status_t ACodec::configureOutputBuffersFromNativeWindow(
@@ -322,5 +322,5 @@ index c73c17d1e4..314de7889b 100644
          { "STRATEGY_CALL_ASSISTANT", STRATEGY_CALL_ASSISTANT },
      };
 -- 
-2.29.2
+2.25.1
 

patches_treble_phh/platform_frameworks_av/0010-Make-camera-IDs-filter-out-optional.patch

@@ -1,7 +1,7 @@
-From c461aa6104426d270e1297a1e2d6213fb4c34297 Mon Sep 17 00:00:00 2001
+From 5f2eb5d0a7224f6f466de35c9eeed3ae5a4dbf5e 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 10/19] Make camera IDs filter-out optional
+Subject: [PATCH 10/18] 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.
@@ -26,5 +26,5 @@ index d11ad8d766..ab5ddd12d0 100644
      }
      auto sortFunc =
 -- 
-2.29.2
+2.25.1
 

patches_treble_phh/platform_frameworks_av/0011-Fix-AAC-decoder-failing-to-instantiate.patch

@@ -1,37 +0,0 @@
-From 91e653004e622132574610017e855056358d8f6c Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sat, 6 Mar 2021 19:15:24 -0500
-Subject: [PATCH 11/19] Fix AAC decoder failing to instantiate
-
-This has been caused by I50fcc5ef35cb7e96592c2267652228b5fa074ba9
-Non-Android 11 vendors won't provide those calls, and will thus fail.
----
- media/libstagefright/ACodec.cpp | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
-index f9365cacc9..52ca1955e8 100644
---- a/media/libstagefright/ACodec.cpp
-+++ b/media/libstagefright/ACodec.cpp
-@@ -5405,9 +5405,7 @@ status_t ACodec::getPortFormat(OMX_U32 portIndex, sp<AMessage> &notify) {
-                             err = mOMXNode->getParameter(
-                                     (OMX_INDEXTYPE)OMX_IndexParamAudioAndroidAacDrcPresentation,
-                                     &presentation, sizeof(presentation));
--                            if (err != OK) {
--                                return err;
--                            }
-+                            if (err == OK) {
-                             notify->setInt32("aac-encoded-target-level",
-                                              presentation.nEncodedTargetLevel);
-                             notify->setInt32("aac-drc-cut-level", presentation.nDrcCut);
-@@ -5420,6 +5418,7 @@ status_t ACodec::getPortFormat(OMX_U32 portIndex, sp<AMessage> &notify) {
-                             notify->setInt32("aac-drc-album-mode", presentation.nDrcAlbumMode);
-                             notify->setInt32("aac-drc-output-loudness",
-                                              presentation.nDrcOutputLoudness);
-+			    }
-                         }
-                     }
-                     break;
--- 
-2.29.2
-

patches_treble_phh/platform_frameworks_av/0011-Support-Samsung-R-multi-cams.patch

@@ -1,7 +1,7 @@
-From 80e55073914af5719060ef1c6b1f3bddfb6b7b5f Mon Sep 17 00:00:00 2001
+From 2f93928141323d08cba2f10517c4338d3af0ef59 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 12/19] Support Samsung R multi-cams
+Subject: [PATCH 11/18] Support Samsung R multi-cams
 
 Change-Id: If46f385e8dd16185cbf37ab083e6a1242e1d1555
 ---
@@ -63,5 +63,5 @@ index ab5ddd12d0..c08bcb9ce2 100644
      else
          ret = interface->getCameraIdList(cb);
 -- 
-2.29.2
+2.25.1
 

patches_treble_phh/platform_frameworks_av/0012-Don-t-crash-on-unknown-audio-devices.patch

@@ -1,7 +1,7 @@
-From 0b33dc520b09f9ad74005280920f561356333f99 Mon Sep 17 00:00:00 2001
+From fe8421d437012b5909d3dae6dec2969e67260826 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 13/19] [audiopolicy] Don't crash on unknown audio devices
+Subject: [PATCH 12/18] Don't crash on unknown audio devices
 
 Change-Id: I2df8d88f742da6a84aa8888cdf19de25444de919
 ---
@@ -22,5 +22,5 @@ index c6db471c8c..a76da4569b 100644
                                      "extension type",
                                      reinterpret_cast<const char*>(attachedDevice.get()));
 -- 
-2.29.2
+2.25.1
 

patches_treble_phh/platform_frameworks_av/0013-Reenable-STRATEGY_ROUTING.-This-is-a-leftover-of-tri.patch

@@ -1,7 +1,7 @@
-From f9a6347168b123aa485e642fa0c63eaef0be0d30 Mon Sep 17 00:00:00 2001
+From d3d598ad4f8d22fefd4248e9fc04fb77c2800ace Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 28 Mar 2021 14:47:52 +0200
-Subject: [PATCH 14/19] Reenable STRATEGY_ROUTING. This is a leftover of tries
+Subject: [PATCH 13/18] Reenable STRATEGY_ROUTING. This is a leftover of tries
  of 587b198, wrongly commited in 20f869
 
 ---
@@ -22,5 +22,5 @@ index 314de7889b..c73c17d1e4 100644
          { "STRATEGY_CALL_ASSISTANT", STRATEGY_CALL_ASSISTANT },
      };
 -- 
-2.29.2
+2.25.1
 

patches_treble_phh/platform_frameworks_av/0014-Use-a-fake-volume-policy-when-none-has-been-found.patch

@@ -1,7 +1,7 @@
-From 3fe99a1ab087bfc46cd4c1f190239fe422435a7f Mon Sep 17 00:00:00 2001
+From f150ef9a8d0776fbd2123662aac7315ba7bd48de 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 15/19] Use a fake volume policy when none has been found
+Subject: [PATCH 14/18] 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.
@@ -33,5 +33,5 @@ index 81e803fa7f..340eb1b358 100644
          ALOGE("No readable audio policy config file found");
          return BAD_VALUE;
 -- 
-2.29.2
+2.25.1
 

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

@@ -1,7 +1,7 @@
-From ed52289663535821829ebdd1241471d72e0f9d2f Mon Sep 17 00:00:00 2001
+From 244b0d93a9a1c3d2425b50c11f5c1abf310d21f9 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/19] Not all sources in a route are valid. Dont ignore the
+Subject: [PATCH 15/18] Not all sources in a route are valid. Dont ignore the
  whole route because of one broken source
 
 Change-Id: If8a51740e71bef3a4738262ad7b43a337b0ec36d
@@ -23,5 +23,5 @@ index a76da4569b..2ff11ddbab 100644
                  return BAD_VALUE;
              } else if (source == NULL) {
 -- 
-2.29.2
+2.25.1
 

patches_treble_phh/platform_frameworks_av/0016-When-aux-cameras-are-enabled-ignore-system-only-came.patch

@@ -1,7 +1,7 @@
-From 3db998a6d6224eda055820b23ff7db1e3b49b555 Mon Sep 17 00:00:00 2001
+From f69403f665a91492fcfd5d2afe52b8e88c903b85 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 17/19] When aux cameras are enabled, ignore "system only"
+Subject: [PATCH 16/18] When aux cameras are enabled, ignore "system only"
  camera flag (it shouldnt be q security issue since secure cameras are listed
  otherwise)
 
@@ -31,5 +31,5 @@ index c08bcb9ce2..5a68fe8cc9 100644
      }
      return SystemCameraKind::PUBLIC;
 -- 
-2.29.2
+2.25.1
 

patches_treble_phh/platform_frameworks_av/0017-APM-Restore-R-and-Q-behavior-respectively-for-teleph.patch

@@ -1,7 +1,7 @@
-From 29a38afa10725fefa574fa46e63d6f0e93b62952 Mon Sep 17 00:00:00 2001
+From 2140c752c78511852fef8fe2320d62ff88fb4a6c Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Tue, 19 Oct 2021 21:16:55 -0400
-Subject: [PATCH 18/19] APM: Restore R and Q behavior respectively for
+Subject: [PATCH 17/18] APM: Restore R and Q behavior respectively for
  telephony audio
 
 This conditionally reverts part of 51c9cc (S) and afd4ce (R) when the
@@ -102,5 +102,5 @@ index 98f96d1951..e8b19091d5 100644
          HwAudioOutputCollection mHwOutputs;
          SourceClientCollection mAudioSources;
 -- 
-2.29.2
+2.25.1
 

patches_treble_phh/platform_frameworks_av/0018-Revert-Remove-support-for-audio-HAL-V2-from-the-fram.patch

@@ -1,7 +1,7 @@
-From 9f4bc135f5863b4da0a3092db56dee499be6c2a7 Mon Sep 17 00:00:00 2001
+From e7f31e63f87dd23e421645783a672ce00e9f1122 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/19] Revert "Remove support for audio HAL V2 from the
+Subject: [PATCH 18/18] Revert "Remove support for audio HAL V2 from the
  framework"
 
 This reverts commit cbf517f837f7bf8a59f3ff8aa1e0e3e19612e251.
@@ -69,5 +69,5 @@ index a2c6e8aeba..4e360be7e8 100644
      name: "libaudiohal@4.0",
      defaults: ["libaudiohal_default"],
 -- 
-2.29.2
+2.25.1
 

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

@@ -1,4 +1,4 @@
-From cca2f852f59bc76fb4228c44a5c58a39cb0f3bba Mon Sep 17 00:00:00 2001
+From ed69eff0e245bc8a8b7c3334b5c30323a09dbfc3 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/24] Fallback to stupid autobrightness if brightness values
@@ -14,7 +14,7 @@ Change-Id: Ieb679b34239013a5e31b34cb010b12febd9ef6d9
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/services/core/java/com/android/server/display/DisplayDeviceConfig.java b/services/core/java/com/android/server/display/DisplayDeviceConfig.java
-index 4c9d0f2691b3..4ad21835c1ad 100644
+index 2ae5cbbbf24b..9cd8dc663cfa 100644
 --- a/services/core/java/com/android/server/display/DisplayDeviceConfig.java
 +++ b/services/core/java/com/android/server/display/DisplayDeviceConfig.java
 @@ -172,7 +172,12 @@ public class DisplayDeviceConfig {

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

@@ -1,4 +1,4 @@
-From c11becc169cecb489e6bc3e75f7eb42af349aa3b Mon Sep 17 00:00:00 2001
+From c3bc53d43b9c4789bab8c532c44cc6f423810801 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/24] 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 69c29269b7a9..72d37655c1e5 100644
+index 8727932a87f7..f58f952d19e2 100644
 --- a/services/core/java/com/android/server/StorageManagerService.java
 +++ b/services/core/java/com/android/server/StorageManagerService.java
-@@ -1579,7 +1579,8 @@ class StorageManagerService extends IStorageManager.Stub
+@@ -1582,7 +1582,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 1660aee7805afa51f230552fb8724f86f27c1129 Mon Sep 17 00:00:00 2001
+From 9dda80f5f617988755425931377956386d70a703 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/24] 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 4796112133b072b8e4a2d05ace920c6a38a065d7 Mon Sep 17 00:00:00 2001
+From 639661b3368671a56a3a2b114d6ffb5c1e6ee95f 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/24] Show APN Settings for CDMA carriers
@@ -8,10 +8,10 @@ Subject: [PATCH 04/24] Show APN Settings for CDMA carriers
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
-index 72ad23b8edb1..1b35fe483eb4 100644
+index 45fd7a3467c4..92d6d9868da6 100644
 --- a/telephony/java/android/telephony/CarrierConfigManager.java
 +++ b/telephony/java/android/telephony/CarrierConfigManager.java
-@@ -5154,7 +5154,7 @@ public class CarrierConfigManager {
+@@ -5283,7 +5283,7 @@ public class CarrierConfigManager {
          sDefaults.putBoolean(KEY_MDN_IS_ADDITIONAL_VOICEMAIL_NUMBER_BOOL, false);
          sDefaults.putBoolean(KEY_OPERATOR_SELECTION_EXPAND_BOOL, true);
          sDefaults.putBoolean(KEY_PREFER_2G_BOOL, true);

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

@@ -1,4 +1,4 @@
-From 1afba32ac67360be35b6e7fe054932532efbbf20 Mon Sep 17 00:00:00 2001
+From a80899cb43a7a0876e2484807dea69c7ddb0b3be 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/24] Re-order services so that it works even without qtaguid
@@ -9,7 +9,7 @@ Change-Id: I0c0f527b3ae151d45c68f7ac6c205da3f34e74df
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
-index 84be7f5809e6..58f7f7dacc6d 100644
+index cfefffcdd2e8..197fed7c8834 100644
 --- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
 +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
 @@ -845,6 +845,10 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {

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

@@ -1,4 +1,4 @@
-From 7bb10322e9b9c0f89ff1f05412c5a1816380c1d6 Mon Sep 17 00:00:00 2001
+From b16ff9568fb76c327e71d32878c6b182a3d8acd4 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/24] 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 7a73ac08b22ed3458e78dd03c2ca373f396d5396 Mon Sep 17 00:00:00 2001
+From 14f642d18be9bb7de7ea4409021880d8ae0c279b 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/24] Add support for samsung touch, physical and hover
@@ -10,10 +10,10 @@ Change-Id: I7a0f8b4665c802140d19197d850b77b2a7ac1865
  1 file changed, 35 insertions(+)
 
 diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
-index abbe13ac260f..7ee297c60539 100644
+index 1224902aa7be..00fab25350dc 100644
 --- a/services/core/java/com/android/server/display/DisplayPowerController.java
 +++ b/services/core/java/com/android/server/display/DisplayPowerController.java
-@@ -1671,6 +1671,27 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+@@ -1700,6 +1700,27 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
                  ? Sensor.TYPE_PROXIMITY : SensorUtils.NO_FALLBACK;
          mProximitySensor = SensorUtils.findSensor(mSensorManager, proxSensor.type, proxSensor.name,
                  fallbackType);
@@ -41,7 +41,7 @@ index abbe13ac260f..7ee297c60539 100644
          if (mProximitySensor != null) {
              mProximityThreshold = Math.min(mProximitySensor.getMaximumRange(),
                      TYPICAL_PROXIMITY_THRESHOLD);
-@@ -2415,6 +2436,20 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+@@ -2465,6 +2486,20 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
          public void onSensorChanged(SensorEvent event) {
              if (mProximitySensorEnabled) {
                  final long time = SystemClock.uptimeMillis();

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

@@ -1,4 +1,4 @@
-From f293d063501c95f9d1bfdcac894544a16ecf56b9 Mon Sep 17 00:00:00 2001
+From 433f76bd4145480f67496d409e01a0f8b235879f 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/24] 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 eff1e3b5377f..66296912ba98 100644
+index 826370006dca..925ab6e6b77f 100644
 --- a/services/core/java/com/android/server/pm/UserManagerService.java
 +++ b/services/core/java/com/android/server/pm/UserManagerService.java
-@@ -5820,12 +5820,8 @@ public class UserManagerService extends IUserManager.Stub {
+@@ -5825,12 +5825,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 e83aa5ea72c3063a337e471db7c39485e23a33a0 Mon Sep 17 00:00:00 2001
+From 2e867d814f8f7675058085aea23b5cb95f8588f9 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/24] 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 7edc52f626f669f0330fc411ceb360a5cd2ed21b Mon Sep 17 00:00:00 2001
+From acf92f0e0d9efaf2453aacb16b58eccb914094c4 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/24] Some devices have proximity sensor reporting NaN as max
@@ -10,10 +10,10 @@ Change-Id: I3c39e3e914a05903c140235702e0480d2d58a612
  1 file changed, 3 insertions(+)
 
 diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
-index 7ee297c60539..759720ba4f71 100644
+index 00fab25350dc..3c49a01e00b4 100644
 --- a/services/core/java/com/android/server/display/DisplayPowerController.java
 +++ b/services/core/java/com/android/server/display/DisplayPowerController.java
-@@ -1695,6 +1695,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+@@ -1724,6 +1724,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
          if (mProximitySensor != null) {
              mProximityThreshold = Math.min(mProximitySensor.getMaximumRange(),
                      TYPICAL_PROXIMITY_THRESHOLD);

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

@@ -1,4 +1,4 @@
-From 1b0ebec45a3cbc0e0a7edb9d3e63c85901c7efbf Mon Sep 17 00:00:00 2001
+From cc5cb64f17283c81d884e75ee38ef6c292d3ca46 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/24] Fix brightness range not being complete on Samsung
@@ -15,10 +15,10 @@ Change-Id: I4d97cbc32490949e83272b81ec6320a5483310b1
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java
-index 6f7a7cf152b8..58b665add2cf 100644
+index f0ebe290c837..76af7630819c 100644
 --- a/services/core/java/com/android/server/power/PowerManagerService.java
 +++ b/services/core/java/com/android/server/power/PowerManagerService.java
-@@ -989,9 +989,11 @@ public final class PowerManagerService extends SystemService
+@@ -993,9 +993,11 @@ public final class PowerManagerService extends SystemService
  
          if (min == INVALID_BRIGHTNESS_IN_CONFIG || max == INVALID_BRIGHTNESS_IN_CONFIG
                  || def == INVALID_BRIGHTNESS_IN_CONFIG) {

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

@@ -1,4 +1,4 @@
-From 6a5b471745545ff85f87d1eb37d7b6310869f403 Mon Sep 17 00:00:00 2001
+From 42ab9d35ed55b576d7e7257a18fd984c79d63b9b 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/24] 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 bd31f40a9c03f568e6dfa1defbe1fb73d8a57a9a Mon Sep 17 00:00:00 2001
+From 2319811d1b5e5055c236807ce0ff8be759056741 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/24] Make rounded corners padding overridable with
@@ -12,7 +12,7 @@ Change-Id: I481c1c8849b2f22a7cdfb2896a6d3c2e7e3b44d9
  3 files changed, 14 insertions(+), 5 deletions(-)
 
 diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
-index 77906abce625..8cbfefcb4fea 100644
+index 84b961e7c48a..a5150000f47c 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,7 +23,7 @@ index 77906abce625..8cbfefcb4fea 100644
  import android.util.AttributeSet;
  import android.util.Pair;
  import android.view.DisplayCutout;
-@@ -219,8 +220,10 @@ public class QuickStatusBarHeader extends FrameLayout {
+@@ -234,8 +235,10 @@ public class QuickStatusBarHeader extends FrameLayout {
  
          mConfigShowBatteryEstimate = resources.getBoolean(R.bool.config_showBatteryEstimateQSBH);
  
@@ -37,7 +37,7 @@ index 77906abce625..8cbfefcb4fea 100644
          int qsOffsetHeight = resources.getDimensionPixelSize(
                  com.android.internal.R.dimen.quick_qs_offset_height);
 diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
-index e272d2713e2a..ed0abcce5b06 100644
+index 788665269edb..f9c6ebbd26e3 100644
 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
 +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
 @@ -30,6 +30,7 @@ import android.graphics.Color;
@@ -48,7 +48,7 @@ index e272d2713e2a..ed0abcce5b06 100644
  import android.util.AttributeSet;
  import android.util.Pair;
  import android.util.TypedValue;
-@@ -200,8 +201,10 @@ public class KeyguardStatusBarView extends RelativeLayout implements
+@@ -196,8 +197,10 @@ public class KeyguardStatusBarView extends RelativeLayout implements
                  R.dimen.display_cutout_margin_consumption);
          mShowPercentAvailable = getContext().getResources().getBoolean(
                  com.android.internal.R.bool.config_battery_percentage_setting_available);

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

@@ -1,4 +1,4 @@
-From 322fd1c3aadbfce8863360ce1e64ff58f00ce24c Mon Sep 17 00:00:00 2001
+From 3e636d6cf6d3f10c5578ba79f8246278b5b1205f 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/24] Remove useless notification about "console" service
@@ -9,7 +9,7 @@ Subject: [PATCH 14/24] 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 953e6e24236f..856ecc7c469d 100644
+index c78d5d538f8d..8739a5913091 100644
 --- a/services/core/java/com/android/server/am/ActivityManagerService.java
 +++ b/services/core/java/com/android/server/am/ActivityManagerService.java
 @@ -4775,7 +4775,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 a274dd1fdc784a82a41ca6eff4acc899fd3adb44 Mon Sep 17 00:00:00 2001
+From b78db2908f199c2ecdbb2c9e8f08cc96c399d986 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/24] Revert "Remove unused SystemProperties.set"
@@ -11,10 +11,10 @@ This reverts commit debb4616ef67f9ed5054eca51ec58592358ff55f.
  1 file changed, 69 insertions(+)
 
 diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
-index 255a61266ebf..7243221f0998 100644
+index 989663406a6b..9d65e6385db3 100644
 --- a/telephony/java/android/telephony/TelephonyManager.java
 +++ b/telephony/java/android/telephony/TelephonyManager.java
-@@ -7405,6 +7405,75 @@ public class TelephonyManager {
+@@ -7406,6 +7406,75 @@ public class TelephonyManager {
          }
      }
  

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

@@ -1,4 +1,4 @@
-From 622df54f19543a5dd66a8446f58ed8818ed7aa6f Mon Sep 17 00:00:00 2001
+From 557bd0cca4cee3c3137cba9035eb254772436eae 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/24] TelephonyManager: bring back getNetworkClass()
@@ -11,7 +11,7 @@ This partially reverts commit c058cac051ab083dc7fb7ea6aa85699110b2e9bf.
  1 file changed, 58 insertions(+)
 
 diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
-index 7243221f0998..674d09c3bfd8 100644
+index 9d65e6385db3..b0c640547e0e 100644
 --- a/telephony/java/android/telephony/TelephonyManager.java
 +++ b/telephony/java/android/telephony/TelephonyManager.java
 @@ -3042,6 +3042,64 @@ public class TelephonyManager {

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

@@ -1,4 +1,4 @@
-From 2cfd2dbee3c7744895d5af492661aad3297f6f97 Mon Sep 17 00:00:00 2001
+From b51669eff63818a15122ee274e50792b2772ecba 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/24] TelephonyManager: add API annotations for
@@ -14,10 +14,10 @@ Subject: [PATCH 17/24] TelephonyManager: add API annotations for
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
-index 674d09c3bfd8..a7f32cb0cd4b 100644
+index b0c640547e0e..c11232326370 100644
 --- a/telephony/java/android/telephony/TelephonyManager.java
 +++ b/telephony/java/android/telephony/TelephonyManager.java
-@@ -7469,7 +7469,7 @@ public class TelephonyManager {
+@@ -7470,7 +7470,7 @@ public class TelephonyManager {
       * @hide
       */
      @UnsupportedAppUsage
@@ -26,7 +26,7 @@ index 674d09c3bfd8..a7f32cb0cd4b 100644
          String propVal = "";
          String p[] = null;
          String prop = SystemProperties.get(property);
-@@ -7523,7 +7523,8 @@ public class TelephonyManager {
+@@ -7524,7 +7524,8 @@ public class TelephonyManager {
       *
       * @hide
       */

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

@@ -1,4 +1,4 @@
-From 10b2cd4edfefad6f2bff633ade040cfa796be8ec Mon Sep 17 00:00:00 2001
+From 9b926fe1972bf2f8139a8a00b2f452d4e3cabdea 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/24] Fix Wakelock issue

patches_treble_phh/platform_frameworks_base/0019-SystemUI-Use-AVCProfileMain-for-screen-recorder.patch

@@ -1,4 +1,4 @@
-From afb9dc934893cffcb4710beac437d0b618277305 Mon Sep 17 00:00:00 2001
+From ec9c979cb9c2399380292d775d068ce596ba855d Mon Sep 17 00:00:00 2001
 From: Arne Coucheron <arco68@gmail.com>
 Date: Thu, 5 Nov 2020 05:38:44 +0100
 Subject: [PATCH 19/24] SystemUI: Use AVCProfileMain for screen recorder
@@ -13,7 +13,7 @@ Change-Id: Iac23480e080edf4300e6f411c3394c0b41030daa
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java b/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java
-index 26781f4ccf09..9a6e657876f0 100644
+index 2133cf63d1c3..6100b6030544 100644
 --- a/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java
 +++ b/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java
 @@ -135,7 +135,7 @@ public class ScreenMediaRecorder {

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

@@ -1,4 +1,4 @@
-From 04ed3039c7f353b57d61436c79676be048ab634c Mon Sep 17 00:00:00 2001
+From e63f6286978d095c26a24253b503c3964db6ab68 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/24] Automatically detect pick up sensor, so that an overlay

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

@@ -1,4 +1,4 @@
-From e512110dd600e59f89408789263a926a47a09d6e Mon Sep 17 00:00:00 2001
+From 69a948909ec0ac6d2fb89fdfeadee0df09437df0 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/24] Catch broken mainBuiltInDisplayCutoutRectApproximation

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

@@ -1,4 +1,4 @@
-From e9eddb9bfbc3d23e6538046cbd006e63ca0a40c1 Mon Sep 17 00:00:00 2001
+From 97d62e3f56c39729d3756166599999216fbc2639 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/24] backlight: Fix backlight control on Galaxy S9(+)

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

@@ -1,4 +1,4 @@
-From 6efec3a6f3f2dfbe89fb7b2b72d24110a94aa2d6 Mon Sep 17 00:00:00 2001
+From 38da0b29efb2577ebd9295a45617160e3caec696 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Sat, 16 Oct 2021 05:27:57 -0700
 Subject: [PATCH 23/24] Add support for app signature spoofing
@@ -56,10 +56,10 @@ index 1de47b548a5c..52c7ea2e1321 100644
      field public static final String MICROPHONE = "android.permission-group.MICROPHONE";
      field public static final String NEARBY_DEVICES = "android.permission-group.NEARBY_DEVICES";
 diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
-index bad79eb13749..e4475497b12e 100644
+index cd6af189a04a..318a7f06494e 100644
 --- a/core/res/AndroidManifest.xml
 +++ b/core/res/AndroidManifest.xml
-@@ -3186,6 +3186,21 @@
+@@ -3189,6 +3189,21 @@
          android:description="@string/permdesc_getPackageSize"
          android:protectionLevel="normal" />
  
@@ -82,7 +82,7 @@ index bad79eb13749..e4475497b12e 100644
           {@link android.content.pm.PackageManager#addPackageToPreferred}
           for details. -->
 diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
-index a99a22009e3b..81ca9b23ae70 100644
+index b58638cc3ade..8cf98fa56bf6 100644
 --- a/core/res/res/values/strings.xml
 +++ b/core/res/res/values/strings.xml
 @@ -880,6 +880,18 @@
@@ -105,10 +105,10 @@ index a99a22009e3b..81ca9b23ae70 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 46b0b600960d..a88e518eb624 100644
+index b77483012ee8..04f55ae83ef0 100644
 --- a/services/core/java/com/android/server/pm/PackageManagerService.java
 +++ b/services/core/java/com/android/server/pm/PackageManagerService.java
-@@ -3299,6 +3299,29 @@ public class PackageManagerService extends IPackageManager.Stub
+@@ -3325,6 +3325,29 @@ public class PackageManagerService extends IPackageManager.Stub
              return result;
          }
  
@@ -138,7 +138,7 @@ index 46b0b600960d..a88e518eb624 100644
          public final PackageInfo generatePackageInfo(PackageSetting ps, int flags, int userId) {
              if (!mUserManager.exists(userId)) return null;
              if (ps == null) {
-@@ -3327,12 +3350,14 @@ public class PackageManagerService extends IPackageManager.Stub
+@@ -3353,12 +3376,14 @@ public class PackageManagerService extends IPackageManager.Stub
                  final int[] gids = (flags & PackageManager.GET_GIDS) == 0 ? EMPTY_INT_ARRAY
                          : mPermissionManager.getGidsForUid(UserHandle.getUid(userId, ps.appId));
                  // Compute granted permissions only if package has requested permissions

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

@@ -1,4 +1,4 @@
-From 3b5b5acf725b96498f7ad7d613c689ab80486a5b Mon Sep 17 00:00:00 2001
+From 4881811426c4f2f28d1f053ef73441c53d1238a5 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 24/24] 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 db43b5b31e7e..8cf90cb4b240 100644
+index 0abeff91e511..b7dfd49b7b78 100644
 --- a/core/res/res/values/config.xml
 +++ b/core/res/res/values/config.xml
 @@ -955,7 +955,7 @@
@@ -19,9 +19,9 @@ index db43b5b31e7e..8cf90cb4b240 100644
 -    <integer name="config_longPressOnPowerBehavior">5</integer>
 +    <integer name="config_longPressOnPowerBehavior">1</integer>
  
-     <!-- Whether the setting to change long press on power behaviour from default to assistant (5)
+     <!-- The time in milliseconds after which a press on power button is considered "long". -->
-          is available in Settings.
+     <integer name="config_longPressOnPowerDurationMs">500</integer>
-@@ -973,7 +973,7 @@
+@@ -987,7 +987,7 @@
              1 - Mute toggle
              2 - Global actions menu
      -->

patches_treble_phh/platform_frameworks_opt_net_ims/0001-Pie-MTK-IMS-calls-static-ImsManager.updateImsService.patch

@@ -0,0 +1,33 @@
+From 5e51de4ac017a91e01dbf5514f433adcdd191e63 Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Sun, 14 Nov 2021 13:47:29 -0500
+Subject: [PATCH] Pie MTK IMS calls static
+ ImsManager.updateImsServiceConfig(Context,int,boolean). Bring it back
+
+Change-Id: I3dd66d436629d37c8ec795df6569736195ae570e
+---
+ src/java/com/android/ims/ImsManager.java | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java
+index 345cbc5..e7e3722 100644
+--- a/src/java/com/android/ims/ImsManager.java
++++ b/src/java/com/android/ims/ImsManager.java
+@@ -1642,6 +1642,14 @@ public class ImsManager implements FeatureUpdates {
+         return true;
+     }
+ 
++    public static void updateImsServiceConfig(Context context, int phoneId, boolean force) {
++        ImsManager mgr = ImsManager.getInstance(context, phoneId);
++        if (mgr != null) {
++            mgr.updateImsServiceConfig();
++        }
++        Rlog.e(TAG, "updateImsServiceConfig: ImsManager null, returning without update.");
++    }
++
+     /**
+      * Push configuration updates to the ImsService implementation.
+      */
+-- 
+2.25.1
+

patches_treble_phh/platform_frameworks_opt_telephony/0001-telephony-forward-port-support-for-forceCognitive.patch

@@ -1,7 +1,7 @@
-From a8df36e780d5dd56d4d2c90be36e3a343abb1e49 Mon Sep 17 00:00:00 2001
+From 2b520b6933e681f69925b6c974742cff29cf47df Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 13 Oct 2019 17:21:31 +0800
-Subject: [PATCH 1/2] telephony: forward-port support for forceCognitive
+Subject: [PATCH 1/3] telephony: forward-port support for forceCognitive
 
 * This is needed on some MTK devices. Android 10 refactored some code,
   so now the "non-persistent/cognitive" filter is relocated to RIL and
@@ -14,7 +14,7 @@ Change-Id: I5e93cbef317b7973e0dc1125cfc3cc576a1cf9fa
  2 files changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/src/java/com/android/internal/telephony/RIL.java b/src/java/com/android/internal/telephony/RIL.java
-index bd71b0b11d..146b26d62f 100644
+index 56c81d1da3..af28bd8f9a 100644
 --- a/src/java/com/android/internal/telephony/RIL.java
 +++ b/src/java/com/android/internal/telephony/RIL.java
 @@ -71,6 +71,7 @@ import android.os.HwBinder;
@@ -24,8 +24,8 @@ index bd71b0b11d..146b26d62f 100644
 +import android.os.SystemProperties;
  import android.os.RemoteException;
  import android.os.SystemClock;
- import android.os.WorkSource;
+ import android.os.SystemProperties;
-@@ -4773,7 +4774,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
+@@ -4829,7 +4830,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
                      for (DataProfile dp : dps) {
                          // For v1.0 to v1.2, we only send data profiles that has the persistent
                          // (a.k.a modem cognitive) bit set to true.
@@ -36,10 +36,10 @@ index bd71b0b11d..146b26d62f 100644
                          }
                      }
 diff --git a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
-index 5bfe15bca7..674789c979 100644
+index 21b8c4f108..2c5ab7d104 100644
 --- a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
 +++ b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
-@@ -2150,8 +2150,9 @@ public class DcTracker extends Handler {
+@@ -2170,8 +2170,9 @@ public class DcTracker extends Handler {
          }
  
          // profile id is only meaningful when the profile is persistent on the modem.
@@ -51,5 +51,5 @@ index 5bfe15bca7..674789c979 100644
              if (profileId == DATA_PROFILE_DEFAULT) {
                  profileId = getApnProfileID(apnContext.getApnType());
 -- 
-2.29.2
+2.25.1
 

patches_treble_phh/platform_frameworks_opt_telephony/0002-Telephony-Don-not-call-onUssdRelease-for-Huawei-RIL.patch

@@ -1,7 +1,7 @@
-From a5a6afc7a7dd2d402960b60b1a7b084b89e67b8c Mon Sep 17 00:00:00 2001
+From d230672d53c64266bcf699d27c8951975f918d3f Mon Sep 17 00:00:00 2001
 From: Artem Borisov <dedsa2002@gmail.com>
 Date: Sat, 10 Nov 2018 17:19:17 +0000
-Subject: [PATCH 2/2] Telephony: Don not call onUssdRelease for Huawei RIL
+Subject: [PATCH 2/3] Telephony: Don not call onUssdRelease for Huawei RIL
 
 Huawei RIL doesn't seem to work properly with USSD_MODE_NW_RELEASE,
 always releasing USSD when it should be finished instead.
@@ -13,10 +13,10 @@ Change-Id: I69faed1c51d4582834879975d6ab13daf7f48ad4
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/src/java/com/android/internal/telephony/GsmCdmaPhone.java b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
-index a034392cee..c82af4c432 100644
+index aebd91659d..de27887da4 100644
 --- a/src/java/com/android/internal/telephony/GsmCdmaPhone.java
 +++ b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
-@@ -2723,7 +2723,11 @@ public class GsmCdmaPhone extends Phone {
+@@ -2745,7 +2745,11 @@ public class GsmCdmaPhone extends Phone {
          if (found != null) {
              // Complete pending USSD
              if (isUssdRelease) {
@@ -30,5 +30,5 @@ index a034392cee..c82af4c432 100644
                  found.onUssdFinishedError();
              } else {
 -- 
-2.29.2
+2.25.1
 

patches_treble_phh/platform_frameworks_opt_telephony/0003-Fix-baseband-being-too-long-to-fit-into-a-91-chars-p.patch

@@ -0,0 +1,27 @@
+From cc77f6e8d407e9aa7c178c014ce7fb2faf23092a Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Mon, 6 Dec 2021 16:28:22 -0500
+Subject: [PATCH 3/3] Fix baseband being too long to fit into a 91 chars
+ property, preventing telephony subsystem from starting
+
+Change-Id: I1762e4a8cc137626be89f350229d6be162bdaf57
+---
+ src/java/com/android/internal/telephony/GsmCdmaPhone.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/java/com/android/internal/telephony/GsmCdmaPhone.java b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
+index de27887da4..be539b6537 100644
+--- a/src/java/com/android/internal/telephony/GsmCdmaPhone.java
++++ b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
+@@ -3038,7 +3038,7 @@ public class GsmCdmaPhone extends Phone {
+                 String version = (String)ar.result;
+                 if (version != null) {
+                     int length = version.length();
+-                    final int MAX_VERSION_LEN = SystemProperties.PROP_VALUE_MAX/2;
++                    final int MAX_VERSION_LEN = SystemProperties.PROP_VALUE_MAX/2 - 2;
+                     TelephonyManager.from(mContext).setBasebandVersionForPhone(getPhoneId(),
+                             length <= MAX_VERSION_LEN ? version
+                                 : version.substring(length - MAX_VERSION_LEN, length));
+-- 
+2.25.1
+

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

@@ -1,7 +1,7 @@
-From a4ae95a2de9f912a4e4aca075a28aa4d0ff886b9 Mon Sep 17 00:00:00 2001
+From 990be9e3d37ce43afb37303b3503f0999bc82ca2 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 2/6] Allow deletion of symlink
+Subject: [PATCH 1/7] Allow deletion of symlink
 
 Change-Id: I9731895f88729072297f753088583aabbe6990f4
 ---
@@ -9,7 +9,7 @@ Change-Id: I9731895f88729072297f753088583aabbe6990f4
  1 file changed, 1 insertion(+)
 
 diff --git a/FsCrypt.cpp b/FsCrypt.cpp
-index 04def5c..c7de48e 100644
+index 04def5c4..c7de48e1 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
@@ -21,5 +21,5 @@ index 04def5c..c7de48e 100644
          return false;
      }
 -- 
-2.29.2
+2.25.1
 

patches_treble_phh/platform_system_vold/0001-Fallback-to-non-rollback-resistant-keys-if-not-avail.patch

@@ -1,54 +0,0 @@
-From 30e1b738f07d636015d0a4f6b4c3fd214b7b474f Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Tue, 5 Oct 2021 16:17:15 -0400
-Subject: [PATCH 1/6] Fallback to non-rollback resistant keys if not available
-
-Boot on Mediatek devices was broken with:
-~ Add ROLLBACK_RESISTANCE tag to key usage
-
-Change-Id: I0ab7103c317c70779dee03dce25ba9c9da1629f4
----
- KeyStorage.cpp | 16 +++++++++++-----
- 1 file changed, 11 insertions(+), 5 deletions(-)
-
-diff --git a/KeyStorage.cpp b/KeyStorage.cpp
-index 93c5c29..ef089ad 100644
---- a/KeyStorage.cpp
-+++ b/KeyStorage.cpp
-@@ -378,12 +378,15 @@ static KeymasterOperation BeginKeymasterOp(Keymaster& keymaster, const std::stri
- static bool encryptWithKeymasterKey(Keymaster& keymaster, const std::string& dir,
-                                     const km::AuthorizationSet& keyParams,
-                                     const KeyBuffer& message, std::string* ciphertext) {
--    km::AuthorizationSet opParams =
-+    auto opParams =
-             km::AuthorizationSetBuilder()
--                    .Authorization(km::TAG_ROLLBACK_RESISTANCE)
-                     .Authorization(km::TAG_PURPOSE, km::KeyPurpose::ENCRYPT);
-+    auto opParamsWithRollback = opParams;
-+    opParamsWithRollback.Authorization(km::TAG_ROLLBACK_RESISTANCE);
-+
-     km::AuthorizationSet outParams;
--    auto opHandle = BeginKeymasterOp(keymaster, dir, keyParams, opParams, &outParams);
-+    auto opHandle = BeginKeymasterOp(keymaster, dir, keyParams, opParamsWithRollback, &outParams);
-+    if (!opHandle) opHandle = BeginKeymasterOp(keymaster, dir, keyParams, opParams, &outParams);
-     if (!opHandle) return false;
-     auto nonceBlob = outParams.GetTagValue(km::TAG_NONCE);
-     if (!nonceBlob) {
-@@ -410,9 +413,12 @@ static bool decryptWithKeymasterKey(Keymaster& keymaster, const std::string& dir
-     auto bodyAndMac = ciphertext.substr(GCM_NONCE_BYTES);
-     auto opParams = km::AuthorizationSetBuilder()
-                             .Authorization(km::TAG_NONCE, nonce)
--                            .Authorization(km::TAG_ROLLBACK_RESISTANCE)
-                             .Authorization(km::TAG_PURPOSE, km::KeyPurpose::DECRYPT);
--    auto opHandle = BeginKeymasterOp(keymaster, dir, keyParams, opParams, nullptr);
-+    auto opParamsWithRollback = opParams;
-+    opParamsWithRollback.Authorization(km::TAG_ROLLBACK_RESISTANCE);
-+
-+    auto opHandle = BeginKeymasterOp(keymaster, dir, keyParams, opParamsWithRollback, nullptr);
-+    if (!opHandle) opHandle = BeginKeymasterOp(keymaster, dir, keyParams, opParams, nullptr);
-     if (!opHandle) return false;
-     if (!opHandle.updateCompletely(bodyAndMac, message)) return false;
-     if (!opHandle.finish(nullptr)) return false;
--- 
-2.29.2
-

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

@@ -1,14 +1,14 @@
-From 07bbca4e931e960e25f714079f176f31ca218b41 Mon Sep 17 00:00:00 2001
+From c31e214cb0f52671514b06ebc6b4e03bddf491bf 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 3/6] Support Samsung's implementation of exfat, called sdfat
+Subject: [PATCH 2/7] Support Samsung's implementation of exfat, called sdfat
 
 ---
  fs/Exfat.cpp | 9 ++++++---
  1 file changed, 6 insertions(+), 3 deletions(-)
 
 diff --git a/fs/Exfat.cpp b/fs/Exfat.cpp
-index 7782dd3..91a4c50 100644
+index 7782dd3b..91a4c50d 100644
 --- a/fs/Exfat.cpp
 +++ b/fs/Exfat.cpp
 @@ -35,7 +35,7 @@ static const char* kFsckPath = "/system/bin/fsck.exfat";
@@ -40,5 +40,5 @@ index 7782dd3..91a4c50 100644
      }
  
 -- 
-2.29.2
+2.25.1
 

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

@@ -1,14 +1,14 @@
-From 33b5d2f1da3e8c775baf042f734c899af68a8a75 Mon Sep 17 00:00:00 2001
+From 457e5c667aa50a8e944a5a20dadb6e0c4cefd7b4 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 4/6] Sony has `texfat` exfat fs
+Subject: [PATCH 3/7] Sony has `texfat` exfat fs
 
 ---
  fs/Exfat.cpp | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/fs/Exfat.cpp b/fs/Exfat.cpp
-index 91a4c50..6c49c10 100644
+index 91a4c50d..6c49c10c 100644
 --- a/fs/Exfat.cpp
 +++ b/fs/Exfat.cpp
 @@ -35,7 +35,11 @@ static const char* kFsckPath = "/system/bin/fsck.exfat";
@@ -34,5 +34,5 @@ index 91a4c50..6c49c10 100644
          return 0;
      }
 -- 
-2.29.2
+2.25.1
 

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

@@ -1,7 +1,7 @@
-From c8c2f84551ba8cf706b5ca1e880f216261f78100 Mon Sep 17 00:00:00 2001
+From 5684e411afc3cdcf5e66e9bade31fde768c3373b 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 5/6] Failing to create facedata shouldn't be fatal
+Subject: [PATCH 4/7] Failing to create facedata shouldn't be fatal
 
 Some Pie vendors create it on their own, so SELinux would deny that
 Also not all devices have face unlock anyway
@@ -12,7 +12,7 @@ See https://github.com/phhusson/treble_experimentations/issues/1119
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/vold_prepare_subdirs.cpp b/vold_prepare_subdirs.cpp
-index e2afb81..de863ff 100644
+index e2afb815..de863ffc 100644
 --- a/vold_prepare_subdirs.cpp
 +++ b/vold_prepare_subdirs.cpp
 @@ -193,7 +193,7 @@ static bool prepare_subdirs(const std::string& volume_uuid, int user_id, int fla
@@ -34,5 +34,5 @@ index e2afb81..de863ff 100644
          }
      }
 -- 
-2.29.2
+2.25.1
 

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

@@ -1,14 +1,14 @@
-From 425cd7837ca789af3eb79e659851b67edb87d431 Mon Sep 17 00:00:00 2001
+From 37b7e342b023af7f1c39335ab61e64e446057234 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 6/6] Every voldmanaged storage is adoptable
+Subject: [PATCH 5/7] Every voldmanaged storage is adoptable
 
 ---
  main.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/main.cpp b/main.cpp
-index 1f85fb5..52aa896 100644
+index 1f85fb53..52aa896d 100644
 --- a/main.cpp
 +++ b/main.cpp
 @@ -257,7 +257,7 @@ static int process_config(VolumeManager* vm, VoldConfigs* configs) {
@@ -21,5 +21,5 @@ index 1f85fb5..52aa896 100644
                  configs->has_adoptable = true;
              }
 -- 
-2.29.2
+2.25.1