Changes for November 2021, syncing up to v400.c

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

@@ -1,4 +1,4 @@
-From d91222a9f7ea6a6455695f6d40adc8566153a1e5 Mon Sep 17 00:00:00 2001
+From 458abb420f0dc2d9df421c9c81d203f2e420241c 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

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

@@ -1,4 +1,4 @@
-From 746c3238391f709acd19f24bdf7ecc97e03621a4 Mon Sep 17 00:00:00 2001
+From cb50f98e9a0aca5ae5a2a4227ebdb9c957c16ac4 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

patches_platform/frameworks_base/0003-UI-Disable-left-seascape-navigation-bar-optionally.patch

@@ -1,4 +1,4 @@
-From d7f67355ac41dec8b9d9cff29c8ea21e1d3f9a22 Mon Sep 17 00:00:00 2001
+From 86eedab915fadd671299755f597e1f6e1d1b08f9 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

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

@@ -1,4 +1,4 @@
-From 1a080754144e0c84b03df538ed9c0ffaaf7e3a0d Mon Sep 17 00:00:00 2001
+From 127d469f088affc27bf44ce16a43e938a313631d 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
@@ -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 db43b5b31e7e..60890561308d 100644
+index dd535da6d7bd..7e42418e06c8 100644
 --- a/core/res/res/values/config.xml
 +++ b/core/res/res/values/config.xml
-@@ -4740,7 +4740,7 @@
+@@ -4747,7 +4747,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,4 +1,4 @@
-From de435b6de11fb025d7003998b87884f5c85cf0ca Mon Sep 17 00:00:00 2001
+From 4aa1829873f1f8f855fc2bb32f37c5dfd343d9cd 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

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

@@ -1,4 +1,4 @@
-From 66fb1d5dbfcb671e779108af3af7d2063423e7db Mon Sep 17 00:00:00 2001
+From 2fff33790ba845ec3045497a4f3679cc8fb89a5e 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

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

@@ -1,4 +1,4 @@
-From ed4137c747881e1db53edaaf7c8e937367eebc77 Mon Sep 17 00:00:00 2001
+From 0b204ff8b577160aed587cff1d9d7b60c78c6b1d 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
@@ -78,7 +78,7 @@ 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 60890561308d..6479e5ed5eed 100644
+index 7e42418e06c8..b723eb64dc6a 100644
 --- a/core/res/res/values/config.xml
 +++ b/core/res/res/values/config.xml
 @@ -3515,7 +3515,7 @@

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

@@ -1,4 +1,4 @@
-From 79a42cc701c4d0f7a0e2f53d89bb9ec76ae1102a Mon Sep 17 00:00:00 2001
+From 9f0eafb52cf46793f29714979fabe9d245df530f 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
@@ -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 6a37890bc59f..c79991314318 100644
+index b9df71304b3c..4d6886714120 100644
 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
 +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
-@@ -207,7 +207,6 @@ public class KeyguardStatusBarView extends RelativeLayout implements
+@@ -210,7 +210,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,4 +1,4 @@
-From 6b97dfc8e8230f118ebfc0b2c6b827b4d8ed2678 Mon Sep 17 00:00:00 2001
+From 366d61fb371f01453f0d46ac21927752b787b71f 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
@@ -23,10 +23,10 @@ Change-Id: Ic415288b24129a634476b5cc01a6f202588f4b89
  2 files changed, 4 insertions(+), 7 deletions(-)
 
 diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
-index 4ff26242dab2..d674b8865f3a 100644
+index 9379a634afa8..6bf772b008a7 100644
 --- a/core/java/android/content/pm/PackageParser.java
 +++ b/core/java/android/content/pm/PackageParser.java
-@@ -4663,10 +4663,8 @@ public class PackageParser {
+@@ -4672,10 +4672,8 @@ public class PackageParser {
       * ratio set.
       */
      private void setMaxAspectRatio(Package owner) {

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

@@ -1,4 +1,4 @@
-From f0dcef06bd03714d7bd2c681ab632e4b15d8b828 Mon Sep 17 00:00:00 2001
+From 3139b5f6c75f2d76640bd7c10fd7ab5d4ecd6f7e 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

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

@@ -1,4 +1,4 @@
-From af4b8268484150b18acdf3acb8362f196b365c68 Mon Sep 17 00:00:00 2001
+From d06024052d975a00ebbc90dfe0e25479773ca0c4 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

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

@@ -1,4 +1,4 @@
-From 2eb0c2c90aa31dea5f17bdd32f00ca6ac5b576d3 Mon Sep 17 00:00:00 2001
+From ca37991b2e96c287dfdd2bbc34d968a88a488fa1 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"

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

@@ -1,4 +1,4 @@
-From 611cf88dc0844c91728f5ee1d5f73488f308701f Mon Sep 17 00:00:00 2001
+From 1f1db9627fe3962525d13db733e1171fd0207a53 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

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

@@ -1,4 +1,4 @@
-From a36b9e02358ad6f3dd12f1a51ca8780e70155573 Mon Sep 17 00:00:00 2001
+From 92ab25604e1dcf584f0790b3f1eb8f8d40e8b753 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
@@ -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 cfcea9684c3b..4c394c0b631d 100644
+index 7d25aeef6f98..2e3d5bbcc4af 100644
 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
 +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
-@@ -675,7 +675,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
+@@ -690,7 +690,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
                  mNotificationsAlpha = behindAlpha;
                  mNotificationsTint = behindTint;
                  mBehindAlpha = 1;
@@ -176,7 +176,7 @@ index cfcea9684c3b..4c394c0b631d 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 06811932ac0c..044f12e9d544 100644
+index 2c0de629de8a..066d3e2f94c3 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 {
@@ -218,8 +218,8 @@ index 06811932ac0c..044f12e9d544 100644
          }
      },
  
-@@ -247,27 +247,27 @@ public enum ScrimState {
+@@ -248,27 +248,27 @@ public enum ScrimState {
-             mAnimateChange = !mLaunchingAffordanceWithPreview;
+             mAnimateChange = !mLaunchingAffordanceWithPreview && !fromAod;
  
              mFrontTint = Color.TRANSPARENT;
 -            mBehindTint = Color.BLACK;
@@ -250,7 +250,7 @@ index 06811932ac0c..044f12e9d544 100644
              }
          }
      },
-@@ -441,4 +441,4 @@ public enum ScrimState {
+@@ -442,4 +442,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,4 +1,4 @@
-From 20c9d29922a48beaa2a5294659a764426e47714d Mon Sep 17 00:00:00 2001
+From 25186642a61614d05440da0ee6d217821a9bf200 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

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

@@ -1,4 +1,4 @@
-From 864e73e5348f9fbb70e81797e874587723b96a7d Mon Sep 17 00:00:00 2001
+From 8b5cdeea2207623ae90fbb7dfa7707c91c70d33d 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
@@ -93,10 +93,10 @@ 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 4c394c0b631d..afcb940a72ae 100644
+index 2e3d5bbcc4af..89e178117393 100644
 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
 +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
-@@ -172,6 +172,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
+@@ -186,6 +186,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
      private UnlockedScreenOffAnimationController mUnlockedScreenOffAnimationController;
  
      private GradientColors mColors;
@@ -104,7 +104,7 @@ index 4c394c0b631d..afcb940a72ae 100644
      private boolean mNeedsDrawableColorUpdate;
  
      private float mScrimBehindAlphaKeyguard = KEYGUARD_SCRIM_ALPHA;
-@@ -270,6 +271,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
+@@ -284,6 +285,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
          });
  
          mColors = new GradientColors();
@@ -112,7 +112,7 @@ index 4c394c0b631d..afcb940a72ae 100644
      }
  
      /**
-@@ -829,7 +831,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
+@@ -849,7 +851,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
                      && !mBlankScreen;
  
              mScrimInFront.setColors(mColors, animateScrimInFront);
@@ -121,7 +121,7 @@ index 4c394c0b631d..afcb940a72ae 100644
              mNotificationsScrim.setColors(mColors, animateScrimNotifications);
  
              dispatchBackScrimState(mScrimBehind.getViewAlpha());
-@@ -1185,11 +1187,20 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
+@@ -1205,11 +1207,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,4 +1,4 @@
-From 9e456e96992024257f6eb7f4bad5fa5aed626ad8 Mon Sep 17 00:00:00 2001
+From db01ad5d34519b5bd3d4c68f195b69de43d8bf3e 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

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

@@ -1,4 +1,4 @@
-From c843d3ca03875d6b9d0bf9add9b59fbdcb1d8a42 Mon Sep 17 00:00:00 2001
+From c351a05332f409038c1b007706e010556d267b45 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

patches_platform/frameworks_base/0019-SystemUI-Fix-QS-status-font-weight-mismatch-in-dark-.patch

@@ -1,4 +1,4 @@
-From 41ed8b60f340207cdeddf7fd4ad53c625be32534 Mon Sep 17 00:00:00 2001
+From 999b53f49d6b0a4c5d5fd123a04686d35118cee0 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

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

@@ -1,4 +1,4 @@
-From dce279f20b8973aa0660d98864c9ad8d56b56514 Mon Sep 17 00:00:00 2001
+From b7ffdcec4fa6b192198cff5d143d9fb9ef5ed4f2 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

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

@@ -1,4 +1,4 @@
-From 0cd11d9386e398392716883c6bdadab65777c8ce Mon Sep 17 00:00:00 2001
+From 48d242260887d95b592b8796fce1176d334394d0 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

patches_platform_personal/frameworks_base/0001-Add-LineageMonetAccentOverlay.patch

@@ -1,4 +1,4 @@
-From 34c2595216ffa9d62322f9a46ba89b195d64ce3c Mon Sep 17 00:00:00 2001
+From f3d98f8156017d822ffee5a9ecb1a073cd951c45 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 7a6b1a77ffc801621c6a5f4dd4eb8d3c158fa877 Mon Sep 17 00:00:00 2001
+From 2f9d2d2ebd0e85061d4c0f3d71245faf489dbf7f 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 03ca85ab7a8d6a8eac9006f3f6b4d9dfa27d9e85 Mon Sep 17 00:00:00 2001
+From aa00ecce8f9b93b34039ad94d543f780c5a670a7 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 deb5aecb8182307e352e82cd5d5484ca1791d42f Mon Sep 17 00:00:00 2001
+From 13a853a48ad6c807d7d7193b7426ce8cf28267f4 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 e8c24265c98c943b220873c85e1607db39cd8142 Mon Sep 17 00:00:00 2001
+From 6daf65e81a4f18bc0b1418281ad021fef9bc59e5 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

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

@@ -1,4 +1,4 @@
-From 925a1d857b5a0f9c76d920caed30bf9e7a69033d Mon Sep 17 00:00:00 2001
+From 6ec7695af3b3811a4acbad3c8b4b0f3763ae2c68 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 509ac8a6d9fe..74b91b708433 100644
+index a41997ce3107..b27e1256ea30 100644
 --- a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
 +++ b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
-@@ -232,31 +232,16 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
+@@ -254,32 +254,17 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
              return;
          }
  
@@ -26,6 +26,7 @@ index 509ac8a6d9fe..74b91b708433 100644
 -            && (!mUdfpsEnrolled || !mRunningFPS);
 -        mShowUnlockIcon = mCanDismissLockScreen && isLockScreen();
 +        mShowUnlockIcon = mCanDismissLockScreen && isLockScreen() && mUdfpsEnrolled;
+         mShowAODFpIcon = mIsDozing && mUdfpsEnrolled && !mRunningFPS;
  
          final CharSequence prevContentDescription = mView.getContentDescription();
 -        if (mShowLockIcon) {

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

@@ -1,4 +1,4 @@
-From eb1da990af3c66a794a3516fd5da21a177779001 Mon Sep 17 00:00:00 2001
+From 5df4e88ca6df56e938457cc992e74f2a5ca03c47 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 4252dd5be9f193c3f25f6771986b868e065b90e7 Mon Sep 17 00:00:00 2001
+From 2dedbf09b293ee2081ce65ccd52e49c839dc0885 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
@@ -6,11 +6,12 @@ Subject: [PATCH 08/16] Keyguard: Refine indication text
 Change-Id: Ib771c35610f712a1de34736e817bcfe616ac37d8
 ---
  packages/SystemUI/res-keyguard/values/styles.xml     |  2 --
+ .../SystemUI/res/layout/keyguard_bottom_area.xml     |  1 +
  packages/SystemUI/res/values/dimens.xml              |  2 +-
  .../KeyguardIndicationRotateTextViewController.java  | 12 +++++++++++-
  .../statusbar/KeyguardIndicationController.java      |  5 ++---
  .../statusbar/phone/KeyguardIndicationTextView.java  |  2 +-
- 5 files changed, 15 insertions(+), 8 deletions(-)
+ 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
@@ -24,8 +25,20 @@ index 6bfca3ece20e..54e5b8511b57 100644
 -        <item name="android:shadowRadius">?attr/shadowRadius</item>
      </style>
  </resources>
+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
++++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
+@@ -36,6 +36,7 @@
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content"
+             android:gravity="center"
++            android:minHeight="48dp"
+             android:paddingStart="@dimen/keyguard_indication_text_padding"
+             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 6ad9ab9a26ec..661a03aa9671 100644
+index 78db2a8a3485..b5c96a4df1a1 100644
 --- a/packages/SystemUI/res/values/dimens.xml
 +++ b/packages/SystemUI/res/values/dimens.xml
 @@ -923,7 +923,7 @@
@@ -66,7 +79,7 @@ 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 503b5c0ee4b0..e49561ff1f45 100644
+index 1c933505172f..cad5cdaec533 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 {

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

@@ -1,4 +1,4 @@
-From 402e431a1bc55508d9d257b7a9baa21d2271feb3 Mon Sep 17 00:00:00 2001
+From 2b6af85f83905c848949f6c2f657849aa6224588 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
@@ -12,13 +12,13 @@ Subject: [PATCH 09/16] Keyguard/UI: Fix status bar / quick settings margins
 Change-Id: Ic91fa398813e1907297bb0892c444d96405950e7
 ---
  packages/SystemUI/res/layout/keyguard_status_bar.xml  |  2 +-
- .../SystemUI/res/layout/quick_qs_status_icons.xml     |  2 --
+ .../SystemUI/res/layout/quick_qs_status_icons.xml     |  5 -----
- .../layout/quick_status_bar_header_date_privacy.xml   |  6 ++++--
+ .../layout/quick_status_bar_header_date_privacy.xml   | 11 +++++------
  packages/SystemUI/res/values-sw600dp/dimens.xml       |  6 ------
  packages/SystemUI/res/values/dimens.xml               |  6 +++---
  .../com/android/systemui/qs/QuickStatusBarHeader.java |  8 +++-----
  .../statusbar/phone/KeyguardStatusBarView.java        | 11 -----------
- 7 files changed, 11 insertions(+), 30 deletions(-)
+ 7 files changed, 12 insertions(+), 37 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
@@ -34,25 +34,53 @@ 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..a9958aac0270 100644
+index bbd3e47a568f..f6d07363ec84 100644
 --- a/packages/SystemUI/res/layout/quick_qs_status_icons.xml
 +++ b/packages/SystemUI/res/layout/quick_qs_status_icons.xml
-@@ -33,8 +33,6 @@
+@@ -21,7 +21,6 @@
+     android:layout_height="@*android:dimen/quick_qs_offset_height"
+     android:clipChildren="false"
+     android:clipToPadding="false"
+-    android:minHeight="48dp"
+     android:clickable="false"
+     android:focusable="true"
+     android:theme="@style/QSHeaderTheme">
+@@ -31,10 +30,7 @@
+         android:layout_width="wrap_content"
+         android:layout_height="match_parent"
          android:minWidth="48dp"
-         android:minHeight="48dp"
+-        android:minHeight="48dp"
          android:gravity="center_vertical|start"
 -        android:paddingStart="@dimen/status_bar_left_clock_starting_padding"
 -        android:paddingEnd="@dimen/status_bar_left_clock_end_padding"
          android:singleLine="true"
          android:textAppearance="@style/TextAppearance.QS.Status" />
  
+@@ -43,7 +39,6 @@
+         android:layout_width="0dp"
+         android:layout_height="match_parent"
+         android:layout_weight="1"
+-        android:minHeight="48dp"
+         android:minWidth="48dp"
+         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..43abaa5a4260 100644
+index bff93a99258a..f00abf50fba0 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
-@@ -34,7 +34,8 @@
+@@ -25,16 +25,15 @@
+     android:gravity="center"
+     android:layout_gravity="top"
+     android:orientation="horizontal"
+-    android:clickable="true"
+-    android:minHeight="48dp">
++    android:clickable="true">
+ 
+     <FrameLayout
+         android:id="@+id/date_container"
+         android:layout_width="0dp"
          android:layout_height="match_parent"
-         android:minHeight="48dp"
+-        android:minHeight="48dp"
          android:layout_weight="1"
 -        android:gravity="center_vertical|start" >
 +        android:gravity="center_vertical|start"
@@ -60,9 +88,11 @@ index bff93a99258a..43abaa5a4260 100644
  
          <com.android.systemui.statusbar.policy.DateView
              android:id="@+id/date"
-@@ -71,7 +72,8 @@
+@@ -69,9 +68,9 @@
+         android:id="@+id/privacy_container"
+         android:layout_width="0dp"
          android:layout_height="match_parent"
-         android:minHeight="48dp"
+-        android:minHeight="48dp"
          android:layout_weight="1"
 -        android:gravity="center_vertical|end" >
 +        android:gravity="center_vertical|end"
@@ -95,7 +125,7 @@ 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 661a03aa9671..879f20ea8328 100644
+index b5c96a4df1a1..775c25bd3b25 100644
 --- a/packages/SystemUI/res/values/dimens.xml
 +++ b/packages/SystemUI/res/values/dimens.xml
 @@ -450,7 +450,7 @@

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

@@ -1,4 +1,4 @@
-From ac9ca429fc99fd2e879567617f52fc15d6b6e33b Mon Sep 17 00:00:00 2001
+From d95959a10d6ad02c0e1306f72721f8265d617eae 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 7628ee0b937931a503ae11d1b6fb4270afbc9cf6 Mon Sep 17 00:00:00 2001
+From 8c6568389f821286e33e7c25c4397178dce4ab7f 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 1ff9c15ea9fa247beb1320f3cc88d066394d6355 Mon Sep 17 00:00:00 2001
+From 89f0089b29765a7ea10524941bca9f96f2a18715 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

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

@@ -1,4 +1,4 @@
-From 3e6c3af43dd9f9c780bb678b0af3485f63255f37 Mon Sep 17 00:00:00 2001
+From 8d9b3153dd998145a4fa6a60e84bc68fa08e5321 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,7 +11,7 @@ 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 879f20ea8328..ad49bf4237b6 100644
+index 775c25bd3b25..e5c875c6bc2f 100644
 --- a/packages/SystemUI/res/values/dimens.xml
 +++ b/packages/SystemUI/res/values/dimens.xml
 @@ -760,7 +760,7 @@

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

@@ -1,4 +1,4 @@
-From 26e5a2cc1640b3de6881d9e02f910765341c146a Mon Sep 17 00:00:00 2001
+From e385463bdbb1849425d9ad30fa21be9e30d447d8 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,7 +11,7 @@ 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 18804e472478..c52fa8427069 100644
+index b723eb64dc6a..6fe30556c175 100644
 --- a/core/res/res/values/config.xml
 +++ b/core/res/res/values/config.xml
 @@ -2947,13 +2947,8 @@

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

@@ -1,4 +1,4 @@
-From b0b4ff2c65c6eb6e5182134db272d5bdf9d0cef0 Mon Sep 17 00:00:00 2001
+From f4685622ff415207ed23426469d02e7f6d37e362 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 14441d096f1442c397d65ee31f962f7a8c861ae3 Mon Sep 17 00:00:00 2001
+From 9f69e2fc32d18a880be11c22c7044417095794e0 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,7 +9,7 @@ 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 ad49bf4237b6..19815aa58acb 100644
+index e5c875c6bc2f..1431e32fe7bf 100644
 --- a/packages/SystemUI/res/values/dimens.xml
 +++ b/packages/SystemUI/res/values/dimens.xml
 @@ -1271,7 +1271,7 @@

patches_treble/system_core/0001-Revert-init-Add-vendor-specific-initialization-hooks.patch

@@ -0,0 +1,184 @@
+From 291265e4179a03a9407ed2e7a7f898be0eb25e00 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sat, 6 Nov 2021 05:43:23 +0000
+Subject: [PATCH 1/4] Revert "init: Add vendor-specific initialization hooks."
+
+This reverts commit e2dc41bcfb140e0119e0f7e34eccfb2335ae7f89.
+---
+ init/Android.bp           |  9 ---------
+ init/NOTICE               | 26 --------------------------
+ init/property_service.cpp |  4 ----
+ init/vendor_init.cpp      | 37 -------------------------------------
+ init/vendor_init.h        | 33 ---------------------------------
+ 5 files changed, 109 deletions(-)
+ delete mode 100644 init/vendor_init.cpp
+ delete mode 100644 init/vendor_init.h
+
+diff --git a/init/Android.bp b/init/Android.bp
+index 69f8815ed..7eeafa24b 100644
+--- a/init/Android.bp
++++ b/init/Android.bp
+@@ -89,14 +89,6 @@ init_host_sources = [
+     "host_init_verifier.cpp",
+ ]
+ 
+-cc_library_static {
+-    name: "vendor_init",
+-    recovery_available: true,
+-    srcs: [
+-        "vendor_init.cpp",
+-    ],
+-}
+-
+ cc_defaults {
+     name: "init_defaults",
+     sanitize: {
+@@ -190,7 +182,6 @@ cc_library_static {
+     defaults: [
+         "init_defaults",
+         "selinux_policy_version",
+-        "vendor_init_defaults",
+     ],
+     srcs: init_common_sources + init_device_sources,
+     generated_sources: [
+diff --git a/init/NOTICE b/init/NOTICE
+index 383d0f541..c5b1efa7a 100644
+--- a/init/NOTICE
++++ b/init/NOTICE
+@@ -188,29 +188,3 @@
+ 
+    END OF TERMS AND CONDITIONS
+ 
+-Copyright (c) 2013, The Linux Foundation. All rights reserved.
+-
+-Redistribution and use in source and binary forms, with or without
+-modification, are permitted provided that the following conditions are
+-met:
+-    * Redistributions of source code must retain the above copyright
+-      notice, this list of conditions and the following disclaimer.
+-    * Redistributions in binary form must reproduce the above
+-      copyright notice, this list of conditions and the following
+-      disclaimer in the documentation and/or other materials provided
+-      with the distribution.
+-    * Neither the name of The Linux Foundation nor the names of its
+-      contributors may be used to endorse or promote products derived
+-      from this software without specific prior written permission.
+-
+-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+diff --git a/init/property_service.cpp b/init/property_service.cpp
+index bc9a29dea..5974065f5 100644
+--- a/init/property_service.cpp
++++ b/init/property_service.cpp
+@@ -73,7 +73,6 @@
+ #include "subcontext.h"
+ #include "system/core/init/property_service.pb.h"
+ #include "util.h"
+-#include "vendor_init.h"
+ 
+ using namespace std::literals;
+ 
+@@ -1097,9 +1096,6 @@ void PropertyLoadBootDefaults() {
+         }
+     }
+ 
+-    // Update with vendor-specific property runtime overrides
+-    vendor_load_properties();
+-
+     property_initialize_ro_product_props();
+     property_initialize_build_id();
+     property_derive_build_fingerprint();
+diff --git a/init/vendor_init.cpp b/init/vendor_init.cpp
+deleted file mode 100644
+index d3fd5ffe2..000000000
+--- a/init/vendor_init.cpp
++++ /dev/null
+@@ -1,37 +0,0 @@
+-/*
+-Copyright (c) 2013, The Linux Foundation. All rights reserved.
+-
+-Redistribution and use in source and binary forms, with or without
+-modification, are permitted provided that the following conditions are
+-met:
+-    * Redistributions of source code must retain the above copyright
+-      notice, this list of conditions and the following disclaimer.
+-    * Redistributions in binary form must reproduce the above
+-      copyright notice, this list of conditions and the following
+-      disclaimer in the documentation and/or other materials provided
+-      with the distribution.
+-    * Neither the name of The Linux Foundation nor the names of its
+-      contributors may be used to endorse or promote products derived
+-      from this software without specific prior written permission.
+-
+-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+- */
+-
+-#include "vendor_init.h"
+-
+-/* init vendor override stubs */
+-
+-__attribute__ ((weak))
+-void vendor_load_properties()
+-{
+-}
+diff --git a/init/vendor_init.h b/init/vendor_init.h
+deleted file mode 100644
+index 9afb449be..000000000
+--- a/init/vendor_init.h
++++ /dev/null
+@@ -1,33 +0,0 @@
+-/*
+-Copyright (c) 2013, The Linux Foundation. All rights reserved.
+-
+-Redistribution and use in source and binary forms, with or without
+-modification, are permitted provided that the following conditions are
+-met:
+-    * Redistributions of source code must retain the above copyright
+-      notice, this list of conditions and the following disclaimer.
+-    * Redistributions in binary form must reproduce the above
+-      copyright notice, this list of conditions and the following
+-      disclaimer in the documentation and/or other materials provided
+-      with the distribution.
+-    * Neither the name of The Linux Foundation nor the names of its
+-      contributors may be used to endorse or promote products derived
+-      from this software without specific prior written permission.
+-
+-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+- */
+-
+-#ifndef __INIT_VENDOR__H__
+-#define __INIT_VENDOR__H__
+-extern void vendor_load_properties(void);
+-#endif /* __INIT_VENDOR__H__ */
+-- 
+2.25.1
+

patches_treble/system_core/0002-Panic-into-recovery-rather-than-bootloader.patch

@@ -1,7 +1,7 @@
-From ed8e7d31d3d96f9ce4f30aa452038d1eb2e9b561 Mon Sep 17 00:00:00 2001
+From 0263909a309cbc35efd586b4aec14e46ed23e2d7 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 4 Sep 2019 21:11:48 +0200
-Subject: [PATCH 1/3] Panic into recovery rather than bootloader
+Subject: [PATCH 2/4] Panic into recovery rather than bootloader
 
 Getting last_kmsg/pstore from bootloader isn't possible for other people
 than the OEM, but we have TWRP to access last_kmsg/pstore

patches_treble/system_core/0003-Restore-sbin-for-Magisk-compatibility.patch

@@ -1,7 +1,7 @@
-From fd8c95c473df2b62fd22ce3711b8ec7cfd2a337b Mon Sep 17 00:00:00 2001
+From e2392f1b2f4afbf783fd6b1b25c2d905828c71f1 Mon Sep 17 00:00:00 2001
 From: Victor Bo <bvoid@yandex.ru>
 Date: Wed, 3 Mar 2021 06:31:17 -0500
-Subject: [PATCH 2/3] Restore /sbin for Magisk compatibility
+Subject: [PATCH 3/4] Restore /sbin for Magisk compatibility
 
 Squash of:
 - Revert "Do not create /sbin"

patches_treble/system_core/0004-fix-offline-charger-v7.patch

@@ -1,7 +1,7 @@
-From 786f091175fad5b95b27e3806f5dd775f992826b Mon Sep 17 00:00:00 2001
+From 1c13959077f9616c050b4ee92420f561b3af6121 Mon Sep 17 00:00:00 2001
 From: Victor Bo <bvoid@yandex.ru>
 Date: Wed, 26 Feb 2020 07:23:44 +0200
-Subject: [PATCH 3/3] fix offline charger v7
+Subject: [PATCH 4/4] fix offline charger v7
 
 	modified:   rootdir/init.rc
 ---