Changes for January 2023, syncing up to 20230104

2023-01-15 13:47:12 +00:00 · 2023-01-15 13:47:12 +00:00 · 800e1a579a
commit 800e1a579a
parent cd68e3dcbc
141 changed files with 57864 additions and 55599 deletions
--- a/patches_platform/frameworks_base/0001-Add-SPenPointerOverlay.patch
+++ b/patches_platform/frameworks_base/0001-Add-SPenPointerOverlay.patch
@ -1,7 +1,7 @@
-From b94084cca9202c12ea41de9f6f23785c818a64c0 Mon Sep 17 00:00:00 2001
+From ae74e74a16845c786042581f0fae8c8685ee5be7 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Thu, 13 Jan 2022 14:22:24 +0000
-Subject: [PATCH 01/12] Add SPenPointerOverlay
+Subject: [PATCH 01/14] Add SPenPointerOverlay

 Toggle this overlay with property "persist.ui.spen.pointer"

--- a/patches_platform/frameworks_base/0002-Disable-FP-lockouts-optionally.patch
+++ b/patches_platform/frameworks_base/0002-Disable-FP-lockouts-optionally.patch
@ -0,0 +1,76 @@
+From 4e591984e8f533e0ad305caf8aa03c60cd9314d0 Mon Sep 17 00:00:00 2001
+From: AndyCGYan <GeForce8800Ultra@gmail.com>
+Date: Fri, 22 Mar 2019 00:41:20 +0800
+Subject: [PATCH 02/14] Disable FP lockouts optionally
+
+Both timed and permanent lockouts - GET THE FUCK OUT
+Now targeting LockoutFramework, introduced in Android 12
+Now controlled by property "persist.sys.fp.lockouts.disable"
+
+Change-Id: I2d4b091f3546d4d7903bfb4d5585629212dc9915
+---
+ .../hidl/LockoutFrameworkImpl.java            | 28 +++++++++++--------
+ 1 file changed, 17 insertions(+), 11 deletions(-)
+
+diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java
+index a0befea8e085..48c4ded9f5ca 100644
+--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java
+@@ -25,6 +25,7 @@ import android.content.Context;
+ import android.content.Intent;
+ import android.content.IntentFilter;
+ import android.os.SystemClock;
+import android.os.SystemProperties;
+ import android.util.Slog;
+ import android.util.SparseBooleanArray;
+ import android.util.SparseIntArray;
+@@ -44,6 +45,7 @@ public class LockoutFrameworkImpl implements LockoutTracker {
+     private static final int MAX_FAILED_ATTEMPTS_LOCKOUT_PERMANENT = 20;
+     private static final long FAIL_LOCKOUT_TIMEOUT_MS = 30 * 1000;
+     private static final String KEY_LOCKOUT_RESET_USER = "lockout_reset_user";
+    private static final String DISABLE_FP_LOCKOUTS_PROPERTY = "persist.sys.fp.lockouts.disable";
+ 
+     private final class LockoutReceiver extends BroadcastReceiver {
+         @Override
+@@ -101,23 +103,27 @@ public class LockoutFrameworkImpl implements LockoutTracker {
+     }
+ 
+     void addFailedAttemptForUser(int userId) {
+-        mFailedAttempts.put(userId, mFailedAttempts.get(userId, 0) + 1);
+-        mTimedLockoutCleared.put(userId, false);
+        if (!SystemProperties.getBoolean(DISABLE_FP_LOCKOUTS_PROPERTY, false)) {
+            mFailedAttempts.put(userId, mFailedAttempts.get(userId, 0) + 1);
+            mTimedLockoutCleared.put(userId, false);
+ 
+-        if (getLockoutModeForUser(userId) != LOCKOUT_NONE) {
+-            scheduleLockoutResetForUser(userId);
+            if (getLockoutModeForUser(userId) != LOCKOUT_NONE) {
+                scheduleLockoutResetForUser(userId);
+            }
+         }
+     }
+ 
+     @Override
+     public @LockoutMode int getLockoutModeForUser(int userId) {
+-        final int failedAttempts = mFailedAttempts.get(userId, 0);
+-        if (failedAttempts >= MAX_FAILED_ATTEMPTS_LOCKOUT_PERMANENT) {
+-            return LOCKOUT_PERMANENT;
+-        } else if (failedAttempts > 0
+-                && !mTimedLockoutCleared.get(userId, false)
+-                && (failedAttempts % MAX_FAILED_ATTEMPTS_LOCKOUT_TIMED == 0)) {
+-            return LOCKOUT_TIMED;
+        if (!SystemProperties.getBoolean(DISABLE_FP_LOCKOUTS_PROPERTY, false)) {
+            final int failedAttempts = mFailedAttempts.get(userId, 0);
+            if (failedAttempts >= MAX_FAILED_ATTEMPTS_LOCKOUT_PERMANENT) {
+                return LOCKOUT_PERMANENT;
+            } else if (failedAttempts > 0
+                    && !mTimedLockoutCleared.get(userId, false)
+                    && (failedAttempts % MAX_FAILED_ATTEMPTS_LOCKOUT_TIMED == 0)) {
+                return LOCKOUT_TIMED;
+            }
+         }
+         return LOCKOUT_NONE;
+     }
+-- 
+2.25.1
+
--- a/patches_platform/frameworks_base/0003-Disable-vendor-mismatch-warning.patch
+++ b/patches_platform/frameworks_base/0003-Disable-vendor-mismatch-warning.patch
@ -1,7 +1,7 @@
-From 5d4c54f6956862135a6066f4c0e322690145cce8 Mon Sep 17 00:00:00 2001
+From 3b4a0dc39f8d03ddac9c45fd3e7fc4577334a645 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 02/12] Disable vendor mismatch warning
+Subject: [PATCH 03/14] 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 43b66d181326..1f0d60cf3a38 100644
+index 01490f029e97..6199267cac0b 100644
 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
 +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
-@@ -5696,20 +5696,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
+@@ -5856,20 +5856,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
                 }
 
                 if (!Build.isBuildConsistent()) {
--- a/patches_platform/frameworks_base/0004-UI-Adjust-default-navbar-layouts.patch
+++ b/patches_platform/frameworks_base/0004-UI-Adjust-default-navbar-layouts.patch
@ -1,7 +1,7 @@
-From 4dc4d1ec5be6658812b82c09d745975674707572 Mon Sep 17 00:00:00 2001
+From becd4bf809789b1d0d53956539d3d452e9f20e5a 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 03/12] UI: Adjust default navbar layouts
+Subject: [PATCH 04/14] UI: Adjust default navbar layouts

 - Slightly tighten nodpi layout
 - Remove sw372dp layout - looks terrible, probably meant for legacy phablets, but most modern phones qualify
@ -45,10 +45,10 @@ index 07b797a32428..000000000000
 -    <string name="config_navBarLayout" translatable="false">left[.25W],back[.5WC];home;recent[.5WC],right[.25W]</string>
 -</resources>
 diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
-index ba31e7f1f1d1..c4625e7e784d 100644
+index d7d88cea2dbc..8a2b88d3cf9a 100644
 --- a/packages/SystemUI/res/values/config.xml
 +++ b/packages/SystemUI/res/values/config.xml
-@@ -307,7 +307,7 @@
+@@ -301,7 +301,7 @@
     </string-array>
 
     <!-- Nav bar button default ordering/layout -->
--- a/patches_platform/frameworks_base/0005-UI-Disable-wallpaper-zoom.patch
+++ b/patches_platform/frameworks_base/0005-UI-Disable-wallpaper-zoom.patch
@ -1,7 +1,7 @@
-From 06c01a490bf6379a8f9d8e4e8499add7a4ea2cbc Mon Sep 17 00:00:00 2001
+From 1d9cba70b8a820933b6e54afef69a72e7e1ab85e 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/12] UI: Disable wallpaper zoom
+Subject: [PATCH 05/14] 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 34b5589bf81f..be2dbc3cd5dc 100644
+index 659d0f37bf05..272df37188bf 100644
 --- a/core/res/res/values/config.xml
 +++ b/core/res/res/values/config.xml
-@@ -5029,7 +5029,7 @@
+@@ -5104,7 +5104,7 @@
     <item name="config_wallpaperMinScale" format="float" type="dimen">1</item>
 
     <!-- The max scale for the wallpaper when it's zoomed in -->
--- a/patches_platform/frameworks_base/0006-UI-Follow-Monet-and-light-dark-theme-in-user-1-icon.patch
+++ b/patches_platform/frameworks_base/0006-UI-Follow-Monet-and-light-dark-theme-in-user-1-icon.patch
@ -1,7 +1,7 @@
-From 202ed6730a9b3182c33ef3d5169ff026ab269a2a Mon Sep 17 00:00:00 2001
+From 4c3587987591a1c4545322b0855ea138e7fd26ce Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 25 Sep 2022 02:20:52 +0000
-Subject: [PATCH 05/12] UI: Follow Monet and light/dark theme in user 1 icon
+Subject: [PATCH 06/14] UI: Follow Monet and light/dark theme in user 1 icon

 Change-Id: I755077c6003c39ddc9428da1defe6a6ddd0e5ff8
 ---
@ -10,7 +10,7 @@ Change-Id: I755077c6003c39ddc9428da1defe6a6ddd0e5ff8
 2 files changed, 2 insertions(+), 1 deletion(-)

 diff --git a/core/res/res/values-night/colors.xml b/core/res/res/values-night/colors.xml
-index 33c9b95c5819..f3531caa47d9 100644
+index ffaccd3ddc57..e2a955b89c77 100644
 --- a/core/res/res/values-night/colors.xml
 +++ b/core/res/res/values-night/colors.xml
@@ -33,6 +33,7 @@
@ -22,7 +22,7 @@ index 33c9b95c5819..f3531caa47d9 100644
     <color name="user_icon_6">#ff4ecde6</color><!-- cyan -->
     <color name="user_icon_7">#fffbbc04</color><!-- yellow -->
 diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml
-index b515abc4000f..87a4bb9da02b 100644
+index d5875f547e91..c7711ed3e493 100644
 --- a/core/res/res/values/colors.xml
 +++ b/core/res/res/values/colors.xml
@@ -174,7 +174,7 @@
--- a/patches_platform/frameworks_base/0007-UI-Increase-default-status-bar-height.patch
+++ b/patches_platform/frameworks_base/0007-UI-Increase-default-status-bar-height.patch
@ -1,7 +1,7 @@
-From 448d7cb6f0689082ec63820f72e8ef221154fcfd Mon Sep 17 00:00:00 2001
+From cd200004d3b59dcb33187a3228a4bdab6b16619b 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 06/12] UI: Increase default status bar height
+Subject: [PATCH 07/14] UI: Increase default status bar height

 Change-Id: Ibbcf63159e19bb2bb2b1094ea07ab85917630b07
 ---
@ -9,7 +9,7 @@ Change-Id: Ibbcf63159e19bb2bb2b1094ea07ab85917630b07
 1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml
-index b754100a3ed6..1851b42c0f3b 100644
+index 2542268a153a..099a6badc034 100644
 --- a/core/res/res/values/dimens.xml
 +++ b/core/res/res/values/dimens.xml
@@ -41,7 +41,7 @@
--- a/patches_platform/frameworks_base/0008-UI-Remove-QS-footer-background.patch
+++ b/patches_platform/frameworks_base/0008-UI-Remove-QS-footer-background.patch
@ -1,25 +1,32 @@
-From 057673be164d2bc9cefbe2161bb8293909e72ae6 Mon Sep 17 00:00:00 2001
+From 6bc225de6c671c50ed045eef9575b0aa2ab5835f Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 25 Sep 2022 02:20:20 +0000
-Subject: [PATCH 07/12] UI: Remove QS footer background
+Subject: [PATCH 08/14] UI: Remove QS footer background

 Change-Id: I68e82e0c5e3eddb2d3f767fe792b1436eae506ef
 ---
- packages/SystemUI/res-keyguard/layout/footer_actions.xml | 1 -
- 1 file changed, 1 deletion(-)
+ packages/SystemUI/res-keyguard/layout/footer_actions.xml | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)

 diff --git a/packages/SystemUI/res-keyguard/layout/footer_actions.xml b/packages/SystemUI/res-keyguard/layout/footer_actions.xml
-index 876f275ab042..497181d9ee03 100644
+index a101c64a48e0..028ab29b8643 100644
 --- a/packages/SystemUI/res-keyguard/layout/footer_actions.xml
 +++ b/packages/SystemUI/res-keyguard/layout/footer_actions.xml
-@@ -24,7 +24,6 @@
+@@ -25,7 +25,6 @@
     android:elevation="@dimen/qs_panel_elevation"
-     android:paddingTop="8dp"
+     android:paddingTop="@dimen/qs_footer_actions_top_padding"
     android:paddingBottom="@dimen/qs_footer_actions_bottom_padding"
 -    android:background="@drawable/qs_footer_actions_background"
-     android:gravity="center_vertical"
+     android:gravity="center_vertical|end"
     android:layout_gravity="bottom"
 >
+@@ -98,4 +97,4 @@
+             android:tint="?androidprv:attr/textColorPrimaryInverse" />
+ 
+     </LinearLayout>
+-</com.android.systemui.qs.FooterActionsView>
+\ No newline at end of file
+</com.android.systemui.qs.FooterActionsView>
 -- 
 2.25.1

--- a/patches_platform/frameworks_base/0009-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch
+++ b/patches_platform/frameworks_base/0009-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch
@ -1,7 +1,7 @@
-From e5ac2b04e10ce9b900e9a3ca0c1c609a26e4aaee Mon Sep 17 00:00:00 2001
+From b421fc2bb853966ede836e09203718dfc8d0cb56 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 19 Mar 2022 09:22:24 +0000
-Subject: [PATCH 08/12] UI: Restore split-screen divider to pre-Sv2 looks
+Subject: [PATCH 09/14] UI: Restore split-screen divider to pre-Sv2 looks

 - Kill rounded corners - where two rectangles collide should be perfectly straight
 - Make it black again - taskbar should mind its own business
@ -26,10 +26,10 @@ index 049980803ee3..cd54ac26a7fd 100644
 +    <item android:color="@android:color/black" />
 +</selector>
 diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java b/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java
-index c94455d9151a..5eedb1fdb824 100644
+index 419e62daf586..229844e42a49 100644
 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java
 +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java
-@@ -138,20 +138,7 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange
+@@ -152,20 +152,7 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange
     }
 
     private int getDividerInsets(Resources resources, Display display) {
--- a/patches_platform/frameworks_base/0010-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch
+++ b/patches_platform/frameworks_base/0010-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch
@ -1,7 +1,7 @@
-From d9518a3ec3b88c36f16d8a7417d1d2c29bec25fc Mon Sep 17 00:00:00 2001
+From 03ed62fb9ce9ce4da4f666f24a9c9c65cc5b9c03 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 09/12] UI: Revive navbar layout tuning via sysui_nav_bar
+Subject: [PATCH 10/14] UI: Revive navbar layout tuning via sysui_nav_bar
 tunable

 Google keeps fixing what ain't broken.
--- a/patches_platform/frameworks_base/0011-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch
+++ b/patches_platform/frameworks_base/0011-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch
@ -1,7 +1,7 @@
-From 1556f8d5c97d6fdec1099d6c587a2cac128d4f97 Mon Sep 17 00:00:00 2001
+From 69581c7e2ab9106877b8c8951244c63c14ea97e4 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 10/12] UI: Use SNAP_FIXED_RATIO for multi-window globally
+Subject: [PATCH 11/14] UI: Use SNAP_FIXED_RATIO for multi-window globally

 Enables multiple snap targets under landscape for phone UI

@ -40,7 +40,7 @@ index 7308dc5882c1..000000000000
 -</resources>
 \ No newline at end of file
 diff --git a/core/res/res/values-sw600dp/config.xml b/core/res/res/values-sw600dp/config.xml
-index d686dd2ea690..03dcf51846dd 100644
+index 34b6a54be493..3921c9edfeac 100644
 --- a/core/res/res/values-sw600dp/config.xml
 +++ b/core/res/res/values-sw600dp/config.xml
@@ -3,16 +3,16 @@
@ -78,10 +78,10 @@ index d686dd2ea690..03dcf51846dd 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 be2dbc3cd5dc..c62cce393ff0 100644
+index 272df37188bf..58cd819b9404 100644
 --- a/core/res/res/values/config.xml
 +++ b/core/res/res/values/config.xml
-@@ -3726,7 +3726,7 @@
+@@ -3790,7 +3790,7 @@
              1 - 3 snap targets: fixed ratio, 1:1, (1 - fixed ratio)
              2 - 1 snap target: 1:1
     -->
--- a/patches_platform/frameworks_base/0012-core-Remove-old-app-target-SDK-dialog.patch
+++ b/patches_platform/frameworks_base/0012-core-Remove-old-app-target-SDK-dialog.patch
@ -1,7 +1,7 @@
-From f7e374407e133b9c53ecfbc9a5dc99a1460b6eb0 Mon Sep 17 00:00:00 2001
+From 5dd8363ed108cb2443fad9e7cd25a3ad54e020b9 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Tue, 3 Nov 2020 22:43:12 -0800
-Subject: [PATCH 11/12] core: Remove old app target SDK dialog
+Subject: [PATCH 12/14] core: Remove old app target SDK dialog

 If an app is old, users should already know that, and there's usually no
 point in warning them about it because they would already be using a
--- a/patches_platform/frameworks_base/0013-Paint-Enable-subpixel-text-positioning-by-default.patch
+++ b/patches_platform/frameworks_base/0013-Paint-Enable-subpixel-text-positioning-by-default.patch
@ -1,7 +1,7 @@
-From 1e6d2e5f957d1a0f497248d1673d9ecaa1a676a3 Mon Sep 17 00:00:00 2001
+From 84e2133ee773923f221a9b9754e4b1ce6bcf5e1a Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Tue, 5 Oct 2021 21:01:50 -0700
-Subject: [PATCH 12/12] Paint: Enable subpixel text positioning by default
+Subject: [PATCH 13/14] 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
--- a/patches_treble_td/platform_frameworks_base/0004-Add-support-for-app-signature-spoofing.patch
+++ b/patches_treble_td/platform_frameworks_base/0004-Add-support-for-app-signature-spoofing.patch
@ -1,7 +1,7 @@
-From b9fdd321006e6cc79697bc6224a60ac330a6e24e Mon Sep 17 00:00:00 2001
+From 8fc6fb99d86c4e4887d49d7bbff571b50b76c73f Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Sat, 16 Oct 2021 05:27:57 -0700
-Subject: [PATCH 04/30] Add support for app signature spoofing
+Subject: [PATCH 14/14] Add support for app signature spoofing

 This is needed by microG GmsCore to pretend to be the official Google
 Play Services package, because client apps check the package signature
@ -58,7 +58,7 @@ index c8a43db2f9c2..277183036c60 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 6e48de5ba31f..cef98d01a44c 100644
+index 1b90803404f7..d1cb6c3241f2 100644
 --- a/core/res/AndroidManifest.xml
 +++ b/core/res/AndroidManifest.xml
@@ -3542,6 +3542,21 @@
@ -84,7 +84,7 @@ index 6e48de5ba31f..cef98d01a44c 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 c6b60f586047..ecf5034f18bb 100644
+index 5763345aba4d..8ffdbdd6f15b 100644
 --- a/core/res/res/values/strings.xml
 +++ b/core/res/res/values/strings.xml
@@ -974,6 +974,18 @@
@ -107,10 +107,10 @@ index c6b60f586047..ecf5034f18bb 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/ComputerEngine.java b/services/core/java/com/android/server/pm/ComputerEngine.java
-index 259ca655d2b9..674b22e28a83 100644
+index 46b7460dff1b..40549962436f 100644
 --- a/services/core/java/com/android/server/pm/ComputerEngine.java
 +++ b/services/core/java/com/android/server/pm/ComputerEngine.java
-@@ -1591,6 +1591,29 @@ public class ComputerEngine implements Computer {
+@@ -1603,6 +1603,29 @@ public class ComputerEngine implements Computer {
         return result;
     }
 
@ -140,7 +140,7 @@ index 259ca655d2b9..674b22e28a83 100644
     public final PackageInfo generatePackageInfo(PackageStateInternal ps,
             @PackageManager.PackageInfoFlagsBits long flags, int userId) {
         if (!mUserManager.exists(userId)) return null;
-@@ -1620,13 +1643,14 @@ public class ComputerEngine implements Computer {
+@@ -1632,13 +1655,14 @@ public class ComputerEngine implements Computer {
             final int[] gids = (flags & PackageManager.GET_GIDS) == 0 ? EMPTY_INT_ARRAY
                     : mPermissionManager.getGidsForUid(UserHandle.getUid(userId, ps.getAppId()));
             // Compute granted permissions only if package has requested permissions
--- a/patches_platform/packages_apps_Trebuchet/0001-Trebuchet-Move-clear-all-button-to-actions-view.patch
+++ b/patches_platform/packages_apps_Trebuchet/0001-Trebuchet-Move-clear-all-button-to-actions-view.patch
@ -1,4 +1,4 @@
-From ff8f6e85177a0bab9c27785c3c0d9a59c4952e49 Mon Sep 17 00:00:00 2001
+From d8f9f479012d522aed7377e5996cf7a5265ea268 Mon Sep 17 00:00:00 2001
 From: Vachounet <vachounet@live.fr>
 Date: Mon, 26 Oct 2020 17:05:18 +0100
 Subject: [PATCH] Trebuchet: Move clear all button to actions view
@ -73,10 +73,10 @@ index 0fda0bf8d4..9a6f5ae062 100644
 \ No newline at end of file
 +</com.android.quickstep.views.OverviewActionsView>
 diff --git a/quickstep/src/com/android/quickstep/fallback/RecentsState.java b/quickstep/src/com/android/quickstep/fallback/RecentsState.java
-index 77db6b79f4..c0b6771e6a 100644
+index 223eba5b95..75f8baed6b 100644
 --- a/quickstep/src/com/android/quickstep/fallback/RecentsState.java
 +++ b/quickstep/src/com/android/quickstep/fallback/RecentsState.java
-@@ -102,7 +102,7 @@ public class RecentsState implements BaseState<RecentsState> {
+@@ -105,7 +105,7 @@ public class RecentsState implements BaseState<RecentsState> {
      * For this state, whether clear all button should be shown.
      */
     public boolean hasClearAllButton() {
@ -86,10 +86,10 @@ index 77db6b79f4..c0b6771e6a 100644
 
     /**
 diff --git a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
-index 306ebd73c8..5b2f544c02 100644
+index bb8506d26f..e8c18f1d45 100644
 --- a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
 +++ b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
-@@ -133,8 +133,7 @@ public class LauncherRecentsView extends RecentsView<BaseQuickstepLauncher, Laun
+@@ -143,8 +143,7 @@ public class LauncherRecentsView extends RecentsView<QuickstepLauncher, Launcher
         super.setOverviewStateEnabled(enabled);
         if (enabled) {
             LauncherState state = mActivity.getStateManager().getState();
@ -100,10 +100,10 @@ index 306ebd73c8..5b2f544c02 100644
         }
     }
 diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
-index 2360396cf7..4a4202ecc6 100644
+index 7ad0e48ccb..e888aa2c74 100644
 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java
 +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
-@@ -103,6 +103,7 @@ import android.view.ViewTreeObserver.OnScrollChangedListener;
+@@ -110,6 +110,7 @@ import android.view.ViewTreeObserver.OnScrollChangedListener;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.animation.Interpolator;
@ -111,7 +111,7 @@ index 2360396cf7..4a4202ecc6 100644
 import android.widget.ListView;
 import android.widget.OverScroller;
 import android.widget.Toast;
-@@ -431,6 +432,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
+@@ -464,6 +465,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     private final RecentsModel mModel;
     private final int mSplitPlaceholderSize;
     private final int mSplitPlaceholderInset;
@ -119,7 +119,7 @@ index 2360396cf7..4a4202ecc6 100644
     private final ClearAllButton mClearAllButton;
     private final Rect mClearAllButtonDeadZoneRect = new Rect();
     private final Rect mTaskViewDeadZoneRect = new Rect();
-@@ -875,6 +877,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
+@@ -911,6 +913,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         mActionsView = actionsView;
         mActionsView.updateHiddenFlags(HIDDEN_NO_TASKS, getTaskViewCount() == 0);
         mSplitSelectStateController = splitController;
@ -127,8 +127,8 @@ index 2360396cf7..4a4202ecc6 100644
 +        mActionClearAllButton.setOnClickListener(this::dismissAllTasks);
     }
 
-     public SplitSelectStateController getSplitPlaceholder() {
-@@ -1194,7 +1198,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
+     public SplitSelectStateController getSplitSelectController() {
+@@ -1230,7 +1234,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
      * button fully visible, center page is Clear All button.
      */
     public boolean isClearAllHidden() {
--- a/patches_platform_personal/frameworks_base/0001-Add-MiuiNavbarOverlay.patch
+++ b/patches_platform_personal/frameworks_base/0001-Add-MiuiNavbarOverlay.patch
@ -1,4 +1,4 @@
-From 891ef49e6fd43f36ef564a79fc8a485ee456caa0 Mon Sep 17 00:00:00 2001
+From cfdeeceda335538663684b6a3d7bc7c2ad25eaf9 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 20 Jun 2021 03:39:32 +0000
 Subject: [PATCH 01/21] Add MiuiNavbarOverlay
@ -29,7 +29,7 @@ Change-Id: I0e6791abc3c9521d7dc612df2fec2b041affe7e9
 create mode 100644 packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_recent_darkmode.png

 diff --git a/packages/overlays/Android.mk b/packages/overlays/Android.mk
-index 36ec11af3068..c5ee8556b75a 100644
+index 69641e69a9f2..1efc296d9689 100644
 --- a/packages/overlays/Android.mk
 +++ b/packages/overlays/Android.mk
@@ -26,6 +26,7 @@ LOCAL_REQUIRED_MODULES := \
--- a/patches_platform_personal/frameworks_base/0002-Disable-Bluetooth-by-default.patch
+++ b/patches_platform_personal/frameworks_base/0002-Disable-Bluetooth-by-default.patch
@ -1,4 +1,4 @@
-From aa57f00821e0ec7ee6fc38a20bb4f86f83d74d94 Mon Sep 17 00:00:00 2001
+From 8c24a74eb289bdf3abeed57d490ccf1073f14677 Mon Sep 17 00:00:00 2001
 From: Hikari-no-Tenshi <kyryljan.serhij@gmail.com>
 Date: Thu, 30 Jan 2020 22:20:54 +0200
 Subject: [PATCH 02/21] Disable Bluetooth by default
--- a/patches_platform_personal/frameworks_base/0003-Disable-cursor-drag-by-default-for-editable-TextView.patch
+++ b/patches_platform_personal/frameworks_base/0003-Disable-cursor-drag-by-default-for-editable-TextView.patch
@ -1,4 +1,4 @@
-From 99dcde5dd0b72aa0e1c3efa37176db236135d252 Mon Sep 17 00:00:00 2001
+From c15f13abb5819da69fc6906d30f8507fd27f1e4b 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/21] Disable cursor drag by default for editable TextViews
--- a/patches_platform_personal/frameworks_base/0004-Disable-FP-lockouts.patch
+++ b/patches_platform_personal/frameworks_base/0004-Disable-FP-lockouts.patch
@ -1,47 +0,0 @@
-From 63879a514c40c02d119950d347ff00c7420f23e3 Mon Sep 17 00:00:00 2001
-From: AndyCGYan <GeForce8800Ultra@gmail.com>
-Date: Fri, 22 Mar 2019 00:41:20 +0800
-Subject: [PATCH 04/21] Disable FP lockouts
-
-Both timed and permanent lockouts - GET THE FUCK OUT
-Now targeting LockoutFramework, introduced in Android 12
-
-Change-Id: I2d4b091f3546d4d7903bfb4d5585629212dc9915
---
- .../fingerprint/hidl/LockoutFrameworkImpl.java  | 17 +----------------
- 1 file changed, 1 insertion(+), 16 deletions(-)
-
-diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java
-index a0befea8e085..325e1fcecc2b 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java
-+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java
-@@ -100,25 +100,10 @@ public class LockoutFrameworkImpl implements LockoutTracker {
-         mLockoutResetCallback.onLockoutReset(userId);
-     }
- 
-    void addFailedAttemptForUser(int userId) {
-        mFailedAttempts.put(userId, mFailedAttempts.get(userId, 0) + 1);
-        mTimedLockoutCleared.put(userId, false);
-
-        if (getLockoutModeForUser(userId) != LOCKOUT_NONE) {
-            scheduleLockoutResetForUser(userId);
-        }
-    }
-+    void addFailedAttemptForUser(int userId) {}
- 
-     @Override
-     public @LockoutMode int getLockoutModeForUser(int userId) {
-        final int failedAttempts = mFailedAttempts.get(userId, 0);
-        if (failedAttempts >= MAX_FAILED_ATTEMPTS_LOCKOUT_PERMANENT) {
-            return LOCKOUT_PERMANENT;
-        } else if (failedAttempts > 0
-                && !mTimedLockoutCleared.get(userId, false)
-                && (failedAttempts % MAX_FAILED_ATTEMPTS_LOCKOUT_TIMED == 0)) {
-            return LOCKOUT_TIMED;
-        }
-         return LOCKOUT_NONE;
-     }
- 
-- 
-2.25.1
-
--- a/patches_platform_personal/frameworks_base/0004-Disable-RESTRICTED-bucket-toast.patch
+++ b/patches_platform_personal/frameworks_base/0004-Disable-RESTRICTED-bucket-toast.patch
@ -1,7 +1,7 @@
-From 560136af642a5155d82571b96afd62b55e89cffd Mon Sep 17 00:00:00 2001
+From 89c3645edd918789933549bf9be38ea7a7cd1184 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 3 Jul 2022 00:08:42 +0000
-Subject: [PATCH 05/21] Disable "RESTRICTED bucket" toast
+Subject: [PATCH 04/21] Disable "RESTRICTED bucket" toast

 Change-Id: I20a328d3c77962f3a6095bfca42d0b165a093ce8
 ---
@ -9,10 +9,10 @@ Change-Id: I20a328d3c77962f3a6095bfca42d0b165a093ce8
 1 file changed, 1 insertion(+), 19 deletions(-)

 diff --git a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
-index 9e3e3553c125..ec43489d70e4 100644
+index 5d9f3357125a..49d3c8de7b80 100644
 --- a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
 +++ b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
-@@ -1738,25 +1738,7 @@ public class AppStandbyController
+@@ -1759,25 +1759,7 @@ public class AppStandbyController
                         .noteRestrictionAttempt(packageName, userId, elapsedRealtime, reason);
 
                 if (isForcedByUser) {
--- a/patches_platform_personal/frameworks_base/0005-Keyguard-Adjust-clock-style.patch
+++ b/patches_platform_personal/frameworks_base/0005-Keyguard-Adjust-clock-style.patch
@ -1,50 +1,25 @@
-From 051a47e9e9e79b7897658a2ac5f5f9d56fa24e6c Mon Sep 17 00:00:00 2001
+From 3eb0073c25efb72c691cf8058385ebb74259ccac 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 06/21] Keyguard: Adjust clock style
+Subject: [PATCH 05/21] Keyguard: Adjust clock style

 Thinner font, less padding and unintrusive colors

 Change-Id: I21e5d5bf37d724e75ebce4cd89349e0cc4dfc910
 ---
- .../SystemUI/res-keyguard/layout/keyguard_clock_switch.xml | 7 ++++---
 .../SystemUI/res-keyguard/layout/keyguard_slice_view.xml    | 2 +-
 packages/SystemUI/res-keyguard/values/dimens.xml            | 6 +++---
 packages/SystemUI/res-keyguard/values/styles.xml            | 2 --
 packages/SystemUI/res/layout/keyguard_status_bar.xml        | 2 +-
 packages/SystemUI/res/values/styles.xml                     | 4 ++--
- .../src/com/android/keyguard/AnimatableClockView.kt        | 2 +-
- 7 files changed, 12 insertions(+), 13 deletions(-)
+ packages/SystemUI/shared/res/layout/clock_default_large.xml | 1 +
+ packages/SystemUI/shared/res/layout/clock_default_small.xml | 2 +-
+ packages/SystemUI/shared/res/values/colors.xml              | 5 +++++
+ .../android/systemui/shared/clocks/AnimatableClockView.kt   | 2 +-
+ .../android/systemui/shared/clocks/DefaultClockProvider.kt  | 4 ++--
+ 10 files changed, 17 insertions(+), 13 deletions(-)
+ create mode 100644 packages/SystemUI/shared/res/values/colors.xml

-diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml
-index 87a9825af1cb..93e827ac540e 100644
--- a/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml
-+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml
-@@ -38,10 +38,10 @@
-             android:layout_gravity="start"
-             android:gravity="start"
-             android:textSize="@dimen/clock_text_size"
-            android:fontFamily="@font/clock"
-+            android:fontFamily="sans-serif-thin"
-             android:elegantTextHeight="false"
-             android:singleLine="true"
-            android:fontFeatureSettings="pnum"
-+            android:fontFeatureSettings="tnum"
-             chargeAnimationDelay="350"
-             dozeWeight="200"
-             lockScreenWeight="400"
-@@ -60,9 +60,10 @@
-             android:layout_gravity="center"
-             android:gravity="center_horizontal"
-             android:textSize="@dimen/large_clock_text_size"
-            android:fontFamily="@font/clock"
-+            android:fontFamily="sans-serif-thin"
-             android:typeface="monospace"
-             android:elegantTextHeight="false"
-+            android:fontFeatureSettings="tnum"
-             chargeAnimationDelay="200"
-             dozeWeight="200"
-             lockScreenWeight="400"
 diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml
 index 7c5dbc247428..64657547621f 100644
 --- a/packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml
@ -59,7 +34,7 @@ index 7c5dbc247428..64657547621f 100644
     />
 </com.android.keyguard.KeyguardSliceView>
 diff --git a/packages/SystemUI/res-keyguard/values/dimens.xml b/packages/SystemUI/res-keyguard/values/dimens.xml
-index 77f1803523a8..ed0bca225550 100644
+index 46f6ab2399d1..6fce16ced94f 100644
 --- a/packages/SystemUI/res-keyguard/values/dimens.xml
 +++ b/packages/SystemUI/res-keyguard/values/dimens.xml
@@ -91,10 +91,10 @@
@ -77,7 +52,7 @@ index 77f1803523a8..ed0bca225550 100644
     <!-- Proportion of the screen height to use to set the maximum height of the bouncer to when
          the device is in the DEVICE_POSTURE_HALF_OPENED posture, for the PIN/pattern entry. 0 will
 diff --git a/packages/SystemUI/res-keyguard/values/styles.xml b/packages/SystemUI/res-keyguard/values/styles.xml
-index 625ffd3aa3ec..0f7d931f4fdc 100644
+index a1d12668d27a..955e24e01a9a 100644
 --- a/packages/SystemUI/res-keyguard/values/styles.xml
 +++ b/packages/SystemUI/res-keyguard/values/styles.xml
@@ -117,8 +117,6 @@
@ -90,10 +65,10 @@ index 625ffd3aa3ec..0f7d931f4fdc 100644
 
     <style name="TextAppearance.Keyguard.Secondary">
 diff --git a/packages/SystemUI/res/layout/keyguard_status_bar.xml b/packages/SystemUI/res/layout/keyguard_status_bar.xml
-index e47eed9ea04a..fe4f0a6e1104 100644
+index d27fa192e741..2480d0189e16 100644
 --- a/packages/SystemUI/res/layout/keyguard_status_bar.xml
 +++ b/packages/SystemUI/res/layout/keyguard_status_bar.xml
-@@ -92,7 +92,7 @@
+@@ -91,7 +91,7 @@
         android:gravity="center_vertical"
         android:ellipsize="marquee"
         android:textDirection="locale"
@ -103,10 +78,10 @@ index e47eed9ea04a..fe4f0a6e1104 100644
         android:singleLine="true"
         systemui:showMissingSim="true"
 diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
-index 4d8e3529c5b5..15e3738f2a86 100644
+index a10878709364..78fd8ab3b324 100644
 --- a/packages/SystemUI/res/values/styles.xml
 +++ b/packages/SystemUI/res/values/styles.xml
-@@ -296,7 +296,7 @@
+@@ -276,7 +276,7 @@
         <item name="darkIconTheme">@style/DualToneDarkTheme</item>
         <item name="wallpaperTextColor">@*android:color/primary_text_material_dark</item>
         <item name="wallpaperTextColorSecondary">@*android:color/secondary_text_material_dark</item>
@ -115,7 +90,7 @@ index 4d8e3529c5b5..15e3738f2a86 100644
         <item name="android:colorError">@*android:color/error_color_material_dark</item>
         <item name="*android:lockPatternStyle">@style/LockPatternStyle</item>
         <item name="passwordStyle">@style/PasswordTheme</item>
-@@ -312,7 +312,7 @@
+@@ -292,7 +292,7 @@
     <style name="Theme.SystemUI.LightWallpaper">
         <item name="wallpaperTextColor">@*android:color/primary_text_material_light</item>
         <item name="wallpaperTextColorSecondary">@*android:color/secondary_text_material_light</item>
@ -124,19 +99,71 @@ index 4d8e3529c5b5..15e3738f2a86 100644
         <item name="android:colorError">@*android:color/error_color_material_light</item>
         <item name="shadowRadius">0</item>
 
-diff --git a/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.kt b/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.kt
-index e22386e78359..a4154c2bcd8e 100644
--- a/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.kt
-+++ b/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.kt
-@@ -126,7 +126,7 @@ class AnimatableClockView @JvmOverloads constructor(
+diff --git a/packages/SystemUI/shared/res/layout/clock_default_large.xml b/packages/SystemUI/shared/res/layout/clock_default_large.xml
+index 0139d50dcfba..9f5ca7b89213 100644
+--- a/packages/SystemUI/shared/res/layout/clock_default_large.xml
+++ b/packages/SystemUI/shared/res/layout/clock_default_large.xml
+@@ -26,6 +26,7 @@
+     android:fontFamily="@*android:string/config_clockFontFamily"
+     android:typeface="monospace"
+     android:elegantTextHeight="false"
+    android:fontFeatureSettings="tnum"
+     chargeAnimationDelay="200"
+     dozeWeight="200"
+     lockScreenWeight="400" />
+diff --git a/packages/SystemUI/shared/res/layout/clock_default_small.xml b/packages/SystemUI/shared/res/layout/clock_default_small.xml
+index ff6d7f9e2240..b63ffce20671 100644
+--- a/packages/SystemUI/shared/res/layout/clock_default_small.xml
+++ b/packages/SystemUI/shared/res/layout/clock_default_small.xml
+@@ -27,7 +27,7 @@
+     android:elegantTextHeight="false"
+     android:ellipsize="none"
+     android:singleLine="true"
+-    android:fontFeatureSettings="pnum"
+    android:fontFeatureSettings="tnum"
+     chargeAnimationDelay="350"
+     dozeWeight="200"
+     lockScreenWeight="400" />
+diff --git a/packages/SystemUI/shared/res/values/colors.xml b/packages/SystemUI/shared/res/values/colors.xml
+new file mode 100644
+index 000000000000..f80af4376ff1
+--- /dev/null
+++ b/packages/SystemUI/shared/res/values/colors.xml
+@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="clock_default_color_dark">@*android:color/primary_text_material_dark</color>
+    <color name="clock_default_color_light">@*android:color/primary_text_material_light</color>
+</resources>
+diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/AnimatableClockView.kt b/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/AnimatableClockView.kt
+index c2e74456c032..555c20bfed9c 100644
+--- a/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/AnimatableClockView.kt
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/AnimatableClockView.kt
+@@ -148,7 +148,7 @@ class AnimatableClockView @JvmOverloads constructor(
     fun refreshTime() {
-         time.timeInMillis = System.currentTimeMillis()
+         time.timeInMillis = timeOverrideInMillis ?: System.currentTimeMillis()
         contentDescription = DateFormat.format(descFormat, time)
 -        val formattedText = DateFormat.format(format, time)
 +        val formattedText = DateFormat.format(format, time).toString() + ' '
         // Setting text actually triggers a layout pass (because the text view is set to
         // wrap_content width and TextView always relayouts for this). Avoid needless
         // relayout if the text didn't actually change.
+diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/DefaultClockProvider.kt b/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/DefaultClockProvider.kt
+index 19ac2e479bcb..92a05c540f94 100644
+--- a/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/DefaultClockProvider.kt
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/DefaultClockProvider.kt
+@@ -230,9 +230,9 @@ class DefaultClock(
+ 
+     private fun updateClockColor(clock: AnimatableClockView, isRegionDark: Boolean) {
+         val color = if (isRegionDark) {
+-            resources.getColor(android.R.color.system_accent1_100)
+            resources.getColor(R.color.clock_default_color_dark)
+         } else {
+-            resources.getColor(android.R.color.system_accent2_600)
+            resources.getColor(R.color.clock_default_color_light)
+         }
+         clock.setColors(DOZE_COLOR, color)
+         clock.animateAppearOnLockscreen()
 -- 
 2.25.1

--- a/patches_platform_personal/frameworks_base/0006-Keyguard-Hide-padlock-unless-UDFPS-is-in-use.patch
+++ b/patches_platform_personal/frameworks_base/0006-Keyguard-Hide-padlock-unless-UDFPS-is-in-use.patch
@ -1,7 +1,7 @@
-From 3c619ea3fbec83453d6386dd2aa8f94a97693994 Mon Sep 17 00:00:00 2001
+From a75f9906f81debf9940b3e9b54ddb05205d1b5fc 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 07/21] Keyguard: Hide padlock unless UDFPS is in use
+Subject: [PATCH 06/21] Keyguard: Hide padlock unless UDFPS is in use

 Fair enough Google, but don't give me that otherwise

@ -11,10 +11,10 @@ Change-Id: Ie91e80ca5c6637a51a8acc72fb28cd6ac2a7abb6
 1 file changed, 3 insertions(+), 9 deletions(-)

 diff --git a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
-index 0097196fd841..149d6ca48edf 100644
+index 2a3667610f9c..12905c70fc21 100644
 --- a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
 +++ b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
-@@ -255,20 +255,14 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
+@@ -254,20 +254,14 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
             return;
         }
 
--- a/patches_platform_personal/frameworks_base/0007-Keyguard-Never-switch-to-large-clock.patch
+++ b/patches_platform_personal/frameworks_base/0007-Keyguard-Never-switch-to-large-clock.patch
@ -1,7 +1,7 @@
-From ebb782f9444aa9057bced3609f938ab570279c97 Mon Sep 17 00:00:00 2001
+From 9f0dbda9fb7f965f994a374c2194c81fc2a36c65 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 08/21] Keyguard: Never switch to large clock
+Subject: [PATCH 07/21] Keyguard: Never switch to large clock

 It looks alright actually, but as always breaks under landscape

@ -11,10 +11,10 @@ Change-Id: I434d033ecae597ed2a7b2ed71e96ba1a963e9cc3
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
-index 5c9dd5ec26e7..08e006fd3cca 100644
+index 2165099b474e..3b137c932139 100644
 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
 +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
-@@ -454,7 +454,7 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
+@@ -376,7 +376,7 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
 
     private void updateDoubleLineClock() {
         mCanShowDoubleLineClock = mSecureSettings.getIntForUser(
--- a/patches_platform_personal/frameworks_base/0008-Keyguard-Refine-indication-text.patch
+++ b/patches_platform_personal/frameworks_base/0008-Keyguard-Refine-indication-text.patch
@ -1,7 +1,7 @@
-From 7ebf4555ffb7184d67c15546616a6feb9217649d Mon Sep 17 00:00:00 2001
+From 5ccbd8949c23e2d21ff0dc36d1915418803c2d19 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 09/21] Keyguard: Refine indication text
+Subject: [PATCH 08/21] Keyguard: Refine indication text

 Change-Id: Ib771c35610f712a1de34736e817bcfe616ac37d8
 ---
@ -14,7 +14,7 @@ Change-Id: Ib771c35610f712a1de34736e817bcfe616ac37d8
 6 files changed, 18 insertions(+), 9 deletions(-)

 diff --git a/packages/SystemUI/res-keyguard/values/styles.xml b/packages/SystemUI/res-keyguard/values/styles.xml
-index 0f7d931f4fdc..19004a4c28da 100644
+index 955e24e01a9a..58c6919971a1 100644
 --- a/packages/SystemUI/res-keyguard/values/styles.xml
 +++ b/packages/SystemUI/res-keyguard/values/styles.xml
@@ -132,8 +132,6 @@
@ -27,7 +27,7 @@ index 0f7d931f4fdc..19004a4c28da 100644
 
     <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 8f8993f3c8d9..be49748b8fb8 100644
+index 8df8c49ee057..ff616b66790d 100644
 --- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml
 +++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
@@ -35,6 +35,7 @@
@ -39,10 +39,10 @@ index 8f8993f3c8d9..be49748b8fb8 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 32bc89c875e9..d124bfbf8cd8 100644
+index 9c85fbc4b391..44766f3b6a6d 100644
 --- a/packages/SystemUI/res/values/dimens.xml
 +++ b/packages/SystemUI/res/values/dimens.xml
-@@ -717,11 +717,10 @@
+@@ -760,11 +760,10 @@
     <dimen name="keyguard_lock_height">42dp</dimen>
     <dimen name="keyguard_lock_padding">20dp</dimen>
 
@ -56,10 +56,10 @@ index 32bc89c875e9..d124bfbf8cd8 100644
     <dimen name="double_tap_slop">32dp</dimen>
 
 diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java
-index 5aedbdc20b31..6f4405a8329c 100644
+index f84a5e39163f..38baa611cf07 100644
 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java
 +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java
-@@ -216,12 +216,22 @@ public class KeyguardIndicationRotateTextViewController extends
+@@ -220,12 +220,22 @@ public class KeyguardIndicationRotateTextViewController extends
     }
 
     /**
@ -84,10 +84,10 @@ index 5aedbdc20b31..6f4405a8329c 100644
      * Clears all messages in the queue and sets the current message to an empty string.
      */
 diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
-index 9e029095ea6b..6c64743aa1d7 100644
+index 073ab8b16864..5fb3c05c4a2a 100644
 --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
 +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
-@@ -255,10 +255,12 @@ public class KeyguardIndicationController {
+@@ -267,10 +267,12 @@ public class KeyguardIndicationController {
             public void handleMessage(Message msg) {
                 if (msg.what == MSG_HIDE_TRANSIENT) {
                     hideTransientIndication();
@ -97,10 +97,10 @@ index 9e029095ea6b..6c64743aa1d7 100644
                 } else if (msg.what == MSG_HIDE_BIOMETRIC_MESSAGE) {
                     hideBiometricMessage();
 +                    updateLockScreenIndications(false /* animate */, KeyguardUpdateMonitor.getCurrentUser());
+                 } else if (msg.what == MSG_RESET_ERROR_MESSAGE_ON_SCREEN_ON) {
+                     mBiometricErrorMessageToShowOnScreenOn = null;
                 }
-             }
-         };
-@@ -559,12 +561,11 @@ public class KeyguardIndicationController {
+@@ -588,12 +590,11 @@ public class KeyguardIndicationController {
     }
 
     private void updateLockScreenRestingMsg() {
@ -116,10 +116,10 @@ index 9e029095ea6b..6c64743aa1d7 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 339f371c0d12..bd1432303463 100644
+index d24469e8421e..647c766aa0f0 100644
 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java
 +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java
-@@ -44,7 +44,7 @@ public class KeyguardIndicationTextView extends TextView {
+@@ -46,7 +46,7 @@ public class KeyguardIndicationTextView extends TextView {
     @StyleRes
     private static int sButtonStyleId = R.style.TextAppearance_Keyguard_BottomArea_Button;
 
--- a/patches_platform_personal/frameworks_base/0009-Revert-SystemUI-Align-QS-header-with-status-bar.patch
+++ b/patches_platform_personal/frameworks_base/0009-Revert-SystemUI-Align-QS-header-with-status-bar.patch
@ -0,0 +1,128 @@
+From cccdc9392402135535e81d35bb1c8d62222f061f Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Thu, 29 Dec 2022 02:53:16 +0000
+Subject: [PATCH 09/21] Revert "SystemUI: Align QS header with status bar"
+
+This reverts commit 8658042a3c1c662f6a14ea3bf311e1e6b07f785e.
+---
+ .../res/layout/quick_qs_status_icons.xml      |  3 +++
+ .../quick_status_bar_header_date_privacy.xml  |  4 +++-
+ .../systemui/qs/QuickStatusBarHeader.java     | 23 ++++++++-----------
+ 3 files changed, 16 insertions(+), 14 deletions(-)
+
+diff --git a/packages/SystemUI/res/layout/quick_qs_status_icons.xml b/packages/SystemUI/res/layout/quick_qs_status_icons.xml
+index 9feec09dd52a..7a370d8cbc48 100644
+--- a/packages/SystemUI/res/layout/quick_qs_status_icons.xml
+++ b/packages/SystemUI/res/layout/quick_qs_status_icons.xml
+@@ -21,6 +21,7 @@
+     android:layout_height="@*android:dimen/quick_qs_offset_height"
+     android:clipChildren="false"
+     android:clipToPadding="false"
+    android:minHeight="@dimen/qs_header_row_min_height"
+     android:clickable="false"
+     android:focusable="true"
+     android:theme="@style/QSHeaderTheme">
+@@ -38,6 +39,7 @@
+             android:id="@+id/clock"
+             android:layout_width="wrap_content"
+             android:layout_height="match_parent"
+            android:minHeight="@dimen/qs_header_row_min_height"
+             android:gravity="center_vertical|start"
+             android:paddingStart="@dimen/status_bar_left_clock_starting_padding"
+             android:paddingEnd="@dimen/status_bar_left_clock_end_padding"
+@@ -62,6 +64,7 @@
+         android:layout_width="0dp"
+         android:layout_height="match_parent"
+         android:layout_weight="1"
+        android:minHeight="@dimen/qs_header_row_min_height"
+         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 2220bbbb76a5..60bc3732cde0 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,12 +25,14 @@
+     android:gravity="center"
+     android:layout_gravity="top"
+     android:orientation="horizontal"
+-    android:clickable="true">
+    android:clickable="true"
+    android:minHeight="48dp">
+ 
+     <FrameLayout
+         android:id="@+id/date_container"
+         android:layout_width="0dp"
+         android:layout_height="match_parent"
+        android:minHeight="48dp"
+         android:layout_weight="1"
+         android:gravity="center_vertical|start" >
+ 
+diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
+index 04ace4dc2f3a..614b0c03c696 100644
+--- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
+@@ -106,7 +106,6 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu
+     private StatusBarContentInsetsProvider mInsetsProvider;
+ 
+     private int mRoundedCornerPadding = 0;
+-    private int mStatusBarPaddingTop;
+     private int mWaterfallTopInset;
+     private int mCutOutPaddingLeft;
+     private int mCutOutPaddingRight;
+@@ -270,20 +269,19 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu
+             mRoundedCornerPadding = resources.getDimensionPixelSize(
+                     R.dimen.rounded_corner_content_padding);
+ 
+-        int statusBarHeight = SystemBarUtils.getStatusBarHeight(mContext);
+        int qsOffsetHeight = SystemBarUtils.getQuickQsOffsetHeight(mContext);
+ 
+-        mStatusBarPaddingTop = resources.getDimensionPixelSize(
+-                R.dimen.status_bar_padding_top);
+-
+-        mDatePrivacyView.getLayoutParams().height = statusBarHeight;
+        mDatePrivacyView.getLayoutParams().height =
+                Math.max(qsOffsetHeight, mDatePrivacyView.getMinimumHeight());
+         mDatePrivacyView.setLayoutParams(mDatePrivacyView.getLayoutParams());
+ 
+-        mStatusIconsView.getLayoutParams().height = statusBarHeight;
+        mStatusIconsView.getLayoutParams().height =
+                Math.max(qsOffsetHeight, mStatusIconsView.getMinimumHeight());
+         mStatusIconsView.setLayoutParams(mStatusIconsView.getLayoutParams());
+ 
+         ViewGroup.LayoutParams lp = getLayoutParams();
+         if (mQsDisabled) {
+-            lp.height = mStatusIconsView.getLayoutParams().height - mWaterfallTopInset;
+            lp.height = mStatusIconsView.getLayoutParams().height;
+         } else {
+             lp.height = WRAP_CONTENT;
+         }
+@@ -307,9 +305,8 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu
+         }
+ 
+         MarginLayoutParams qqsLP = (MarginLayoutParams) mHeaderQsPanel.getLayoutParams();
+-        qqsLP.topMargin = largeScreenHeaderActive || !mUseCombinedQSHeader
+-                ? mContext.getResources().getDimensionPixelSize(R.dimen.qqs_layout_margin_top)
+-                : SystemBarUtils.getQuickQsOffsetHeight(mContext);
+        qqsLP.topMargin = largeScreenHeaderActive || !mUseCombinedQSHeader ? mContext.getResources()
+                .getDimensionPixelSize(R.dimen.qqs_layout_margin_top) : qsOffsetHeight;
+         mHeaderQsPanel.setLayoutParams(qqsLP);
+ 
+         updateBatteryMode();
+@@ -556,11 +553,11 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu
+         }
+ 
+         mDatePrivacyView.setPadding(paddingLeft,
+-                mStatusBarPaddingTop,
+                mWaterfallTopInset,
+                 paddingRight,
+                 0);
+         mStatusIconsView.setPadding(paddingLeft,
+-                mStatusBarPaddingTop,
+                mWaterfallTopInset,
+                 paddingRight,
+                 0);
+     }
+-- 
+2.25.1
+
--- a/patches_platform_personal/frameworks_base/0010-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch
+++ b/patches_platform_personal/frameworks_base/0010-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch
@ -1,4 +1,4 @@
-From 849272eeabd70c3898d8d714934e7dac65aafe4e Mon Sep 17 00:00:00 2001
+From 790f729ba423a331c05ead93c0baadc0cc3a5eff 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 10/21] Keyguard/UI: Fix status bar / quick settings margins
@ -32,10 +32,10 @@ Change-Id: Ic91fa398813e1907297bb0892c444d96405950e7
 7 files changed, 35 insertions(+), 40 deletions(-)

 diff --git a/packages/SystemUI/res/layout/keyguard_status_bar.xml b/packages/SystemUI/res/layout/keyguard_status_bar.xml
-index fe4f0a6e1104..c8936a195a49 100644
+index 2480d0189e16..5561271d4733 100644
 --- a/packages/SystemUI/res/layout/keyguard_status_bar.xml
 +++ b/packages/SystemUI/res/layout/keyguard_status_bar.xml
-@@ -87,7 +87,7 @@
+@@ -86,7 +86,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:paddingTop="@dimen/status_bar_padding_top"
@ -112,7 +112,7 @@ index 60bc3732cde0..6ba9382bea94 100644
         android:gravity="center_vertical|end" >
 
 diff --git a/packages/SystemUI/res/values-sw600dp/dimens.xml b/packages/SystemUI/res/values-sw600dp/dimens.xml
-index 008299bd9b1c..271c6d3de672 100644
+index 599bf30a5135..f9911fda7dbe 100644
 --- a/packages/SystemUI/res/values-sw600dp/dimens.xml
 +++ b/packages/SystemUI/res/values-sw600dp/dimens.xml
@@ -27,9 +27,6 @@
@ -126,10 +126,10 @@ index 008299bd9b1c..271c6d3de672 100644
     <dimen name="keyguard_affordance_height">80dp</dimen>
     <dimen name="keyguard_affordance_width">120dp</dimen>
 diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
-index d124bfbf8cd8..b91143e9d6bb 100644
+index 44766f3b6a6d..569926a1e1a0 100644
 --- a/packages/SystemUI/res/values/dimens.xml
 +++ b/packages/SystemUI/res/values/dimens.xml
-@@ -693,7 +693,7 @@
+@@ -736,7 +736,7 @@
     <dimen name="kg_framed_avatar_size">32dp</dimen>
 
     <!-- Margin on the left side of the carrier text on Keyguard -->
--- a/patches_platform_personal/frameworks_base/0011-Replace-NTP-server.patch
+++ b/patches_platform_personal/frameworks_base/0011-Replace-NTP-server.patch
@ -1,4 +1,4 @@
-From 8e54cfb859e4a6bdd99290108095974922cecc81 Mon Sep 17 00:00:00 2001
+From a8a6e151d39736c5e73394839e476c5b82630d3a Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 17 Apr 2022 08:48:42 +0000
 Subject: [PATCH 11/21] Replace NTP server
@ -9,10 +9,10 @@ Change-Id: I938ab46026d841e7536d8fc02b0ef6b28ebb6ea1
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
-index a1b97506b1f5..3accbddbe38b 100644
+index 80fa6013ee77..9410897a24a0 100644
 --- a/core/res/res/values/config.xml
 +++ b/core/res/res/values/config.xml
-@@ -2352,7 +2352,7 @@
+@@ -2390,7 +2390,7 @@
     <bool name="config_actionMenuItemAllCaps">true</bool>
 
     <!-- Remote server that can provide NTP responses. -->
--- a/patches_platform_personal/frameworks_base/0012-Revert-SystemUI-Add-left-padding-for-keyguard-slices.patch
+++ b/patches_platform_personal/frameworks_base/0012-Revert-SystemUI-Add-left-padding-for-keyguard-slices.patch
@ -1,4 +1,4 @@
-From c125258153937e30bbeeaa9666af7ac3d2b03366 Mon Sep 17 00:00:00 2001
+From 2406fad099bf603dd754a0e279210b606517b77d Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Tue, 31 May 2022 00:00:08 +0000
 Subject: [PATCH 12/21] Revert "SystemUI: Add left padding for keyguard slices"
--- a/patches_platform_personal/frameworks_base/0013-Revert-Update-RAT-icons-to-match-Silk-design.patch
+++ b/patches_platform_personal/frameworks_base/0013-Revert-Update-RAT-icons-to-match-Silk-design.patch
@ -1,4 +1,4 @@
-From 6dbe76e67aa9fb8ad6285b3730093af49cde6a4d Mon Sep 17 00:00:00 2001
+From fba26224a6d73d49389a8eddad477950a729ee59 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 13/21] Revert "Update RAT icons to match Silk design"
--- a/patches_platform_personal/frameworks_base/0014-Revert-Use-the-default-top-clock-margin-on-h800-devi.patch
+++ b/patches_platform_personal/frameworks_base/0014-Revert-Use-the-default-top-clock-margin-on-h800-devi.patch
@ -1,4 +1,4 @@
-From ea9a73648e61b2ab2e35aaefae7a27e92dea210b Mon Sep 17 00:00:00 2001
+From 2760ca8d2b0c8920b60d7d4f9ee8f2ae2cabd8b6 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Thu, 29 Sep 2022 11:27:57 +0000
 Subject: [PATCH 14/21] Revert "Use the default top clock margin on h800
--- a/patches_platform_personal/frameworks_base/0015-UI-Always-render-windows-into-cutouts.patch
+++ b/patches_platform_personal/frameworks_base/0015-UI-Always-render-windows-into-cutouts.patch
@ -1,4 +1,4 @@
-From c4f2d8931a870eaf3faff1d73da630ba7ab339f4 Mon Sep 17 00:00:00 2001
+From 8fd984bf1c1a79ed4f7d97ace689f0b6718968bb 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 15/21] UI: Always render windows into cutouts
@ -8,31 +8,40 @@ Quick and dirty way to do the latter - wait for proper fix from Google

 Change-Id: I4661c7979bfa7de453329fcddbaeefc2009e2da3
 ---
- .../com/android/server/wm/DisplayFrames.java  | 19 ++++---------------
+ .../com/android/server/wm/DisplayFrames.java  | 28 +++----------------
 .../com/android/server/wm/DisplayPolicy.java  |  1 +
- 2 files changed, 5 insertions(+), 15 deletions(-)
+ 2 files changed, 5 insertions(+), 24 deletions(-)

 diff --git a/services/core/java/com/android/server/wm/DisplayFrames.java b/services/core/java/com/android/server/wm/DisplayFrames.java
-index fd0631320520..97989e086c74 100644
+index 33641f72b2ff..6e201970ac03 100644
 --- a/services/core/java/com/android/server/wm/DisplayFrames.java
 +++ b/services/core/java/com/android/server/wm/DisplayFrames.java
-@@ -99,21 +99,10 @@ public class DisplayFrames {
+@@ -92,30 +92,10 @@ public class DisplayFrames {
         state.setRoundedCorners(roundedCorners);
         state.setPrivacyIndicatorBounds(indicatorBounds);
         state.getDisplayCutoutSafe(safe);
-        if (!cutout.isEmpty()) {
+-        if (safe.left > unrestricted.left) {
 -            state.getSource(ITYPE_LEFT_DISPLAY_CUTOUT).setFrame(
 -                    unrestricted.left, unrestricted.top, safe.left, unrestricted.bottom);
+-        } else {
+-            state.removeSource(ITYPE_LEFT_DISPLAY_CUTOUT);
+-        }
+-        if (safe.top > unrestricted.top) {
 -            state.getSource(ITYPE_TOP_DISPLAY_CUTOUT).setFrame(
 -                    unrestricted.left, unrestricted.top, unrestricted.right, safe.top);
+-        } else {
+-            state.removeSource(ITYPE_TOP_DISPLAY_CUTOUT);
+-        }
+-        if (safe.right < unrestricted.right) {
 -            state.getSource(ITYPE_RIGHT_DISPLAY_CUTOUT).setFrame(
 -                    safe.right, unrestricted.top, unrestricted.right, unrestricted.bottom);
+-        } else {
+-            state.removeSource(ITYPE_RIGHT_DISPLAY_CUTOUT);
+-        }
+-        if (safe.bottom < unrestricted.bottom) {
 -            state.getSource(ITYPE_BOTTOM_DISPLAY_CUTOUT).setFrame(
 -                    unrestricted.left, safe.bottom, unrestricted.right, unrestricted.bottom);
 -        } else {
-            state.removeSource(ITYPE_LEFT_DISPLAY_CUTOUT);
-            state.removeSource(ITYPE_TOP_DISPLAY_CUTOUT);
-            state.removeSource(ITYPE_RIGHT_DISPLAY_CUTOUT);
 -            state.removeSource(ITYPE_BOTTOM_DISPLAY_CUTOUT);
 -        }
 +        state.removeSource(ITYPE_LEFT_DISPLAY_CUTOUT);
@ -43,15 +52,15 @@ index fd0631320520..97989e086c74 100644
     }
 
 diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java
-index 6363479d318f..7c3df487b208 100644
+index f4cb23d5f369..a4cd2fbcc89f 100644
 --- a/services/core/java/com/android/server/wm/DisplayPolicy.java
 +++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
-@@ -1594,6 +1594,7 @@ public class DisplayPolicy {
+@@ -1639,6 +1639,7 @@ public class DisplayPolicy {
         displayFrames = win.getDisplayFrames(displayFrames);
 
-         final WindowManager.LayoutParams attrs = win.getLayoutingAttrs(displayFrames.mRotation);
+         final WindowManager.LayoutParams attrs = win.mAttrs.forRotation(displayFrames.mRotation);
 +        attrs.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
-         final Rect attachedWindowFrame = attached != null ? attached.getFrame() : null;
+         sTmpClientFrames.attachedFrame = attached != null ? attached.getFrame() : null;
 
         // If this window has different LayoutParams for rotations, we cannot trust its requested
 -- 
--- a/patches_platform_personal/frameworks_base/0016-UI-Kill-rounded-corners-in-notification-scrim.patch
+++ b/patches_platform_personal/frameworks_base/0016-UI-Kill-rounded-corners-in-notification-scrim.patch
@ -1,4 +1,4 @@
-From 7e637a2930dd450bbed631e29a46d96ec2cde12f Mon Sep 17 00:00:00 2001
+From 06472eb420c14153266aca7dc2487f33c32f2f44 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 16/21] UI: Kill rounded corners in notification scrim
@ -11,12 +11,12 @@ 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 b91143e9d6bb..790e5d7044b6 100644
+index 569926a1e1a0..09dd8ed9ef9d 100644
 --- a/packages/SystemUI/res/values/dimens.xml
 +++ b/packages/SystemUI/res/values/dimens.xml
-@@ -626,7 +626,7 @@
-     <!-- Burmese line spacing multiplier between hours and minutes of the keyguard clock -->
-     <item name="keyguard_clock_line_spacing_scale_burmese" type="dimen" format="float">1</item>
+@@ -672,7 +672,7 @@
+     <!-- With the large clock, move up slightly from the center -->
+     <dimen name="keyguard_large_clock_top_margin">-60dp</dimen>
 
 -    <dimen name="notification_scrim_corner_radius">32dp</dimen>
 +    <dimen name="notification_scrim_corner_radius">0dp</dimen>
--- a/patches_platform_personal/frameworks_base/0017-UI-Reconfigure-power-menu-items.patch
+++ b/patches_platform_personal/frameworks_base/0017-UI-Reconfigure-power-menu-items.patch
@ -1,4 +1,4 @@
-From f3cda7c608ba6fd49024c7e2920d70e22b4c93ee Mon Sep 17 00:00:00 2001
+From eef68c9e3faad07776544f152946ad299be23d51 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 17/21] UI: Reconfigure power menu items
@ -9,10 +9,10 @@ Change-Id: I32cca6e2c6bb64d891efee959127edf7c0802cbc
 1 file changed, 1 insertion(+), 4 deletions(-)

 diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
-index 3accbddbe38b..b461c062396d 100644
+index 9410897a24a0..a6e437b1efd6 100644
 --- a/core/res/res/values/config.xml
 +++ b/core/res/res/values/config.xml
-@@ -3178,13 +3178,10 @@
+@@ -3213,13 +3213,10 @@
          "logout" =  Logout the current user
          -->
     <string-array translatable="false" name="config_globalActionsList">
--- a/patches_platform_personal/frameworks_base/0018-UI-Reconfigure-quick-settings-tiles.patch
+++ b/patches_platform_personal/frameworks_base/0018-UI-Reconfigure-quick-settings-tiles.patch
@ -1,4 +1,4 @@
-From 2c0b16610475573d1aaecfbb6c7ce15aa35f3121 Mon Sep 17 00:00:00 2001
+From be8f19801ee144b27fdd74ddfa8f7ecb9c60bfaa Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 5 Mar 2022 01:43:37 +0000
 Subject: [PATCH 18/21] UI: Reconfigure quick settings tiles
@ -9,10 +9,10 @@ Change-Id: I743f52ef3a95db0ca2c02ae973faa4629e41885d
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
-index 22ca3a2c637c..3f4ab235b37e 100644
+index d7d6fa34cce8..61c7613baadc 100644
 --- a/packages/SystemUI/res/values/config.xml
 +++ b/packages/SystemUI/res/values/config.xml
-@@ -74,7 +74,7 @@
+@@ -68,7 +68,7 @@
 
     <!-- The default tiles to display in QuickSettings -->
     <string name="quick_settings_tiles_default" translatable="false">
--- a/patches_platform_personal/frameworks_base/0019-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch
+++ b/patches_platform_personal/frameworks_base/0019-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch
@ -1,4 +1,4 @@
-From 83a3672002f098bf37101915387bd13d99ca2b4b Mon Sep 17 00:00:00 2001
+From 6616bcdd57fa5a9f3f482d41ba7667995f083c61 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 19/21] UI: Relax requirement for HINT_SUPPORTS_DARK_TEXT
--- a/patches_platform_personal/frameworks_base/0020-UI-Remove-privacy-dot-padding.patch
+++ b/patches_platform_personal/frameworks_base/0020-UI-Remove-privacy-dot-padding.patch
@ -1,4 +1,4 @@
-From 5efc5dd187e73421399e1190eb22eef2d735b80e Mon Sep 17 00:00:00 2001
+From d329a8c0310ece234f68f1bf271e27b6a3ef948c 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 20/21] 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 790e5d7044b6..06d13fc2b9f3 100644
+index 09dd8ed9ef9d..4515539bb4b4 100644
 --- a/packages/SystemUI/res/values/dimens.xml
 +++ b/packages/SystemUI/res/values/dimens.xml
-@@ -960,7 +960,7 @@
+@@ -1002,7 +1002,7 @@
     <dimen name="ongoing_appops_chip_animation_in_status_bar_translation_x">15dp</dimen>
     <dimen name="ongoing_appops_chip_animation_out_status_bar_translation_x">7dp</dimen>
     <!--  Total minimum padding to enforce to ensure that the dot can always show  -->
--- a/patches_platform_personal/frameworks_base/0021-UI-Revert-to-HSL-luminance-for-wallpaper-dark-hints.patch
+++ b/patches_platform_personal/frameworks_base/0021-UI-Revert-to-HSL-luminance-for-wallpaper-dark-hints.patch
@ -1,4 +1,4 @@
-From 1d61f2f34fbf2df23f5bb506f86cd6f59675ebb4 Mon Sep 17 00:00:00 2001
+From 12c19b3e96fde96dab5093ac2134ad1453bb59b8 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Fri, 30 Sep 2022 16:02:16 +0000
 Subject: [PATCH 21/21] UI: Revert to HSL luminance for wallpaper dark hints
--- a/patches_platform_personal/packages_apps_DeskClock/0001-DeskClock-Remove-night-mode.patch
+++ b/patches_platform_personal/packages_apps_DeskClock/0001-DeskClock-Remove-night-mode.patch
@ -1,4 +1,4 @@
-From 2e7478c72aa7c3b6585ec64bd61d9df6366e1c48 Mon Sep 17 00:00:00 2001
+From 02bc17bb2554380d7f7d76e3adffce05a2ba2444 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 5 Sep 2021 00:30:33 +0000
 Subject: [PATCH 1/3] DeskClock: Remove night mode
--- a/patches_platform_personal/packages_apps_DeskClock/0002-DeskClock-Adapt-digital-clocks-to-S-style.patch
+++ b/patches_platform_personal/packages_apps_DeskClock/0002-DeskClock-Adapt-digital-clocks-to-S-style.patch
@ -1,4 +1,4 @@
-From e72a06f095a0363085f32d631597611b96e6c160 Mon Sep 17 00:00:00 2001
+From 2a0ca4dab02447bb8fdabb480ed94de15107e22b Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Wed, 19 Jan 2022 18:04:36 +0000
 Subject: [PATCH 2/3] DeskClock: Adapt digital clocks to S style
@ -447,12 +447,12 @@ index 856ef8241..3061e27f6 100644
 +    <dimen name="sc_keyguard_row_alarm_start_padding">5.5dp</dimen>
 </resources>
 diff --git a/res/values/styles.xml b/res/values/styles.xml
-index 7ae54c97c..73a800383 100644
+index f57bab2fa..28b68fd55 100644
 --- a/res/values/styles.xml
 +++ b/res/values/styles.xml
-@@ -187,4 +187,23 @@
-     <style name="TextAppearance.Title" parent="@style/TextAppearance.AppCompat.Widget.ActionBar.Title">
-         <item name="android:textSize">22.0sp</item>
+@@ -201,4 +201,23 @@
+         <item name="layout_constraintStart_toStartOf">parent</item>
+         <item name="layout_constraintTop_toBottomOf">@id/timer_setup_time</item>
     </style>
 +
 +    <style name="sc_keyguard_clock">
--- a/patches_platform_personal/packages_apps_DeskClock/0003-DeskClock-Wallpaper-based-text-coloring-for-digital-.patch
+++ b/patches_platform_personal/packages_apps_DeskClock/0003-DeskClock-Wallpaper-based-text-coloring-for-digital-.patch
@ -1,4 +1,4 @@
-From 87509b89725d9b7439e4c14a19175a085e10b784 Mon Sep 17 00:00:00 2001
+From 8736347a89fc7e15e747ac5267c9f96b05bfaee8 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Thu, 20 Jan 2022 04:42:03 +0000
 Subject: [PATCH 3/3] DeskClock: Wallpaper-based text coloring for digital
--- a/patches_treble/device_phh_treble/0001-treble-Lineage-ify.patch
+++ b/patches_treble/device_phh_treble/0001-treble-Lineage-ify.patch
@ -1,7 +1,7 @@
-From 33bd59e348d95f59265fad3abb72e27038f5222f Mon Sep 17 00:00:00 2001
+From 05f4b920214c3d4145ca39d2c4334dc68c8faecb 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/6] treble: Lineage-ify
+Subject: [PATCH 1/7] treble: Lineage-ify

 Squash of:
 - Proper target names
@ -29,7 +29,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 ce2f218..48b2ccb 100644
+index 5d4ed0b..6097e3d 100644
 --- a/base.mk
 +++ b/base.mk
@@ -17,12 +17,14 @@ PRODUCT_COPY_FILES += \
@ -52,10 +52,10 @@ index ce2f218..48b2ccb 100644
 
 $(call inherit-product, vendor/hardware_overlay/overlay.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-@@ -39,11 +41,11 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
- 	ro.build.version.security_patch=$(PLATFORM_SECURITY_PATCH) \
+@@ -40,11 +42,11 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
 	ro.adb.secure=0 \
- 	ro.logd.auditd=true
+ 	ro.logd.auditd=true \
+ 	ro.logd.kernel=true \
 -	
 +
 #Huawei HiSuite (also other OEM custom programs I guess) it's of no use in AOSP builds
@ -67,7 +67,7 @@ index ce2f218..48b2ccb 100644
 #VNDK config files
 PRODUCT_COPY_FILES += \
 diff --git a/generate.sh b/generate.sh
-index fac8208..2160786 100644
+index 9c20eb5..89fa88b 100644
 --- a/generate.sh
 +++ b/generate.sh
@@ -54,7 +54,7 @@ for part in a ab;do
@ -176,7 +176,7 @@ index 0000000..8df673a
 +    <integer name="config_deviceHardwareWakeKeys">127</integer>
 +</resources>
 diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
-index 0bc3350..045f4b3 100644
+index 479bff7..964524c 100644
 --- a/overlay/frameworks/base/core/res/res/values/config.xml
 +++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -22,7 +22,6 @@
--- a/patches_treble/device_phh_treble/0002-treble-Set-BOARD_EXT4_SHARE_DUP_BLOCKS-explicitly.patch
+++ b/patches_treble/device_phh_treble/0002-treble-Set-BOARD_EXT4_SHARE_DUP_BLOCKS-explicitly.patch
@ -1,7 +1,7 @@
-From 1d807ba01f00a2b2be96f3e0b06c31f0b68852aa Mon Sep 17 00:00:00 2001
+From 53244ebbb4a2da9fbcf02834f40b8083549e3ca7 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/6] treble: Set BOARD_EXT4_SHARE_DUP_BLOCKS explicitly
+Subject: [PATCH 2/7] treble: Set BOARD_EXT4_SHARE_DUP_BLOCKS explicitly

 Change-Id: I725443154fabde548d2e6c1b072d34c27596c421
 ---
--- a/patches_treble/device_phh_treble/0003-treble-Set-TARGET_NO_KERNEL_OVERRIDE.patch
+++ b/patches_treble/device_phh_treble/0003-treble-Set-TARGET_NO_KERNEL_OVERRIDE.patch
@ -1,7 +1,7 @@
-From a5d17b7fb89bc838b39e642952e897f3ee042e1a Mon Sep 17 00:00:00 2001
+From 515176d3ca472dd8ffe122ebf91af4ecc5533c3f 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/6] treble: Set TARGET_NO_KERNEL_OVERRIDE
+Subject: [PATCH 3/7] treble: Set TARGET_NO_KERNEL_OVERRIDE

 Taken from Lineage generic targets - skips building kernel cleanly

--- a/patches_treble/device_phh_treble/0004-treble-Enable-call-recording.patch
+++ b/patches_treble/device_phh_treble/0004-treble-Enable-call-recording.patch
@ -1,7 +1,7 @@
-From bd8cc570c61789a9df881bd60f53d03bd73d974d Mon Sep 17 00:00:00 2001
+From 027b59c5b6d68570be7025632f985d8569f6dc85 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Tue, 11 Oct 2022 11:29:02 +0000
-Subject: [PATCH 4/6] treble: Enable call recording
+Subject: [PATCH 4/7] treble: Enable call recording

 Change-Id: I57ca3604363547419a566b37b5151b6b30c46d28
 ---
--- a/patches_treble/device_phh_treble/0005-treble-Integrally-secure-N-builds.patch
+++ b/patches_treble/device_phh_treble/0005-treble-Integrally-secure-N-builds.patch
@ -1,43 +0,0 @@
-From efd5867e8b259b885d3dab87704e038f71eb6d86 Mon Sep 17 00:00:00 2001
-From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
-Date: Sat, 5 Nov 2022 23:44:33 +0000
-Subject: [PATCH 5/6] treble: Integrally secure *N builds
-
-Change-Id: I22b5f746cb88a5fa4059595a8daa693d9adca979
---
- generate.sh | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/generate.sh b/generate.sh
-index 2160786..f64ea84 100644
--- a/generate.sh
-+++ b/generate.sh
-@@ -23,6 +23,7 @@ for part in a ab;do
- 				apps_name=""
- 				extra_packages=""
-                 vndk="vndk.mk"
-+                secure=""
- 		optional_base=""
- 				if [ "$apps" == "gapps" ];then
- 					apps_suffix="g"
-@@ -55,6 +56,8 @@ for part in a ab;do
- 				if [ "$su" == "yes" ];then
- 					su_suffix='S'
- 					extra_packages+=' phh-su me.phh.superuser su'
-+				else
-+					secure='PRODUCT_COPY_FILES += device/phh/treble/empty:system/phh/secure'
- 				fi
- 
- 				part_suffix='a'
-@@ -96,6 +99,8 @@ PRODUCT_CHARACTERISTICS := device
- 
- PRODUCT_PACKAGES += $extra_packages
- 
-+$secure
-+
- EOF
- echo -e '\t$(LOCAL_DIR)/'$target.mk '\' >> AndroidProducts.mk
- 			done
-- 
-2.25.1
-
--- a/patches_treble/device_phh_treble/0005-treble-Switch-to-MindTheGapps.patch
+++ b/patches_treble/device_phh_treble/0005-treble-Switch-to-MindTheGapps.patch
@ -1,7 +1,7 @@
-From 667aa0b0c11f18bb8b0f5aeda31e186c0a1fc60d Mon Sep 17 00:00:00 2001
+From b77fda8daa3632ef92f3299180506bcbd7c53189 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 5 Nov 2022 23:49:11 +0000
-Subject: [PATCH 6/6] treble: Switch to MindTheGapps
+Subject: [PATCH 5/7] treble: Switch to MindTheGapps

 Change-Id: I1b80d4c5176cbf4af21d147c71b0abce6027c7c7
 ---
@ -9,10 +9,10 @@ Change-Id: I1b80d4c5176cbf4af21d147c71b0abce6027c7c7
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/generate.sh b/generate.sh
-index f64ea84..b0d6d41 100644
+index 89fa88b..d847430 100644
 --- a/generate.sh
 +++ b/generate.sh
-@@ -27,7 +27,7 @@ for part in a ab;do
+@@ -26,7 +26,7 @@ for part in a ab;do
 		optional_base=""
 				if [ "$apps" == "gapps" ];then
 					apps_suffix="g"
--- a/patches_treble/device_phh_treble/0006-treble-Stop-securing-ADB.patch
+++ b/patches_treble/device_phh_treble/0006-treble-Stop-securing-ADB.patch
@ -0,0 +1,36 @@
+From 2a9382e9a122f3a34adfed4da687e2bf23383d58 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Tue, 22 Nov 2022 00:36:15 +0000
+Subject: [PATCH 6/7] treble: Stop securing ADB
+
+Seems to kill USB Debugging altogether on certain devices,
+and unrelated to SN anyway
+Build-time macro coupled with vendor/lineage might do better...
+
+Change-Id: I0215b3ed970dd53a124f48e30ca2cf4b0c6d2899
+---
+ rw-system.sh | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/rw-system.sh b/rw-system.sh
+index 42d315f..798e5e3 100644
+--- a/rw-system.sh
+++ b/rw-system.sh
+@@ -764,14 +764,10 @@ if [ -f /system/phh/secure ] || [ -f /metadata/phh/secure ];then
+     resetprop_phh ro.boot.veritymode enforcing
+     resetprop_phh ro.boot.warranty_bit 0
+     resetprop_phh ro.warranty_bit 0
+-    resetprop_phh ro.debuggable 0
+     resetprop_phh ro.secure 1
+     resetprop_phh ro.build.type user
+     resetprop_phh ro.build.selinux 0
+ 
+-    resetprop_phh ro.adb.secure 1
+-    setprop ctl.restart adbd
+-
+     # Hide system/xbin/su
+     mount /mnt/phh/empty_dir /system/xbin
+     mount /mnt/phh/empty_dir /system/app/me.phh.superuser
+-- 
+2.25.1
+
--- a/patches_treble/device_phh_treble/0007-treble-Securize-on-demand.patch
+++ b/patches_treble/device_phh_treble/0007-treble-Securize-on-demand.patch
@ -0,0 +1,48 @@
+From f57a44efd56ca41a593e6d1ebb948f486960f714 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Thu, 29 Dec 2022 15:12:03 +0000
+Subject: [PATCH 7/7] treble: Securize on-demand
+
+Status is stored in /metadata and controlled by persist prop
+
+Change-Id: I8069b6f471ad87ab34c18b743689ab3584cee35b
+---
+ phh-prop-handler.sh | 14 ++++++++++++++
+ vndk.rc             |  2 ++
+ 2 files changed, 16 insertions(+)
+
+diff --git a/phh-prop-handler.sh b/phh-prop-handler.sh
+index 4371632..a8cea3f 100644
+--- a/phh-prop-handler.sh
+++ b/phh-prop-handler.sh
+@@ -210,3 +210,17 @@ if [ "$1" == "persist.sys.phh.disable_soundvolume_effect" ];then
+     restartAudio
+     exit
+ fi
+
+if [ "$1" == "persist.sys.phh.securize" ];then
+    if [[ "$prop_value" != "true" && "$prop_value" != "false" ]]; then
+        exit 1
+    fi
+
+    if [[ "$prop_value" == "true" ]]; then
+        mkdir /metadata/phh
+        touch /metadata/phh/secure
+    else
+        rm /metadata/phh/secure
+    fi
+    exit
+fi
+diff --git a/vndk.rc b/vndk.rc
+index d1fffde..7db62b7 100644
+--- a/vndk.rc
+++ b/vndk.rc
+@@ -82,3 +82,5 @@ on property:sys.phh.uninstall-ota=true
+ on property:ro.vendor.radio.default_network=*
+     setprop ro.telephony.default_network ${ro.vendor.radio.default_network}
+ 
+on property:persist.sys.phh.securize=*
+    exec u:r:phhsu_daemon:s0 root -- /system/bin/phh-prop-handler.sh "persist.sys.phh.securize"
+-- 
+2.25.1
+
--- a/patches_treble/vendor_hardware_overlay/0001-TEMP-Up-TrebleApp-to-20221229.patch
+++ b/patches_treble/vendor_hardware_overlay/0001-TEMP-Up-TrebleApp-to-20221229.patch
--- a/patches_treble_prerequisite/frameworks_base/0001-Squashed-revert-of-LOS-UDFPS-changes.patch
+++ b/patches_treble_prerequisite/frameworks_base/0001-Squashed-revert-of-LOS-UDFPS-changes.patch
@ -0,0 +1,440 @@
+From 6ebe8ddd00f9b7bd7aa32e79f7f36e97f60acfa5 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Wed, 11 Jan 2023 11:56:05 +0000
+Subject: [PATCH 1/2] Squashed revert of LOS UDFPS changes
+
+Way less than FOD, but reverting them nonetheless to keep in line with PHH AOSP
+
+- Revert "udfps: Make pressed udfp view configurable"
+- Revert "udfps: Restore illumination dot for global hbm"
+- Revert "udfps: Implement default udfps display mode provider"
+- Revert "udfps: Change window type to TYPE_DISPLAY_OVERLAY"
+---
+ packages/SystemUI/proguard.flags              |   3 -
+ .../res/drawable-nodpi/udfps_icon_pressed.png | Bin 108 -> 0 bytes
+ packages/SystemUI/res/layout/udfps_view.xml   |   6 -
+ .../SystemUI/res/values/lineage_config.xml    |   6 -
+ .../biometrics/AuthContainerView.java         |   2 +-
+ .../DummyUdfpsDisplayModeProvider.kt          |  32 ----
+ .../systemui/biometrics/UdfpsController.java  |   4 +-
+ .../biometrics/UdfpsControllerOverlay.kt      |   2 +-
+ .../systemui/biometrics/UdfpsSurfaceView.java | 159 ------------------
+ .../android/systemui/biometrics/UdfpsView.kt  |  31 +---
+ .../systemui/dagger/SystemUIModule.java       |  14 +-
+ 11 files changed, 7 insertions(+), 252 deletions(-)
+ delete mode 100644 packages/SystemUI/res/drawable-nodpi/udfps_icon_pressed.png
+ delete mode 100644 packages/SystemUI/src/com/android/systemui/biometrics/DummyUdfpsDisplayModeProvider.kt
+ delete mode 100644 packages/SystemUI/src/com/android/systemui/biometrics/UdfpsSurfaceView.java
+
+diff --git a/packages/SystemUI/proguard.flags b/packages/SystemUI/proguard.flags
+index b41952b7306b..7538555e1bcd 100644
+--- a/packages/SystemUI/proguard.flags
+++ b/packages/SystemUI/proguard.flags
+@@ -10,9 +10,6 @@
+ }
+ -keep class * extends com.android.systemui.CoreStartable
+ -keep class * implements com.android.systemui.CoreStartable$Injector
+--keep class * implements com.android.systemui.biometrics.UdfpsDisplayModeProvider {
+-    public <init>(...);
+-}
+ 
+ # Needed for builds to properly initialize KeyFrames from xml scene
+ -keepclassmembers class * extends androidx.constraintlayout.motion.widget.Key {
+diff --git a/packages/SystemUI/res/drawable-nodpi/udfps_icon_pressed.png b/packages/SystemUI/res/drawable-nodpi/udfps_icon_pressed.png
+deleted file mode 100644
+index 4102e28c1300b49323b50625d8cfaa73b006561f..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 108
+zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k8}bl$r9IylHmNblJdl&R0hYC{G?O`
+z&)mfH)S%SFl*+=BsWw1Ge4Z|jAr-fh5*U~o7?>FtSQ!{^cTT<plwt66^>bP0l+XkK
+D@OB!I
+
+diff --git a/packages/SystemUI/res/layout/udfps_view.xml b/packages/SystemUI/res/layout/udfps_view.xml
+index 0fcbfa161ddf..257d238f5c54 100644
+--- a/packages/SystemUI/res/layout/udfps_view.xml
+++ b/packages/SystemUI/res/layout/udfps_view.xml
+@@ -28,10 +28,4 @@
+         android:layout_width="match_parent"
+         android:layout_height="match_parent"/>
+ 
+-    <com.android.systemui.biometrics.UdfpsSurfaceView
+-        android:id="@+id/hbm_view"
+-        android:layout_width="match_parent"
+-        android:layout_height="match_parent"
+-        android:visibility="invisible"/>
+-
+ </com.android.systemui.biometrics.UdfpsView>
+diff --git a/packages/SystemUI/res/values/lineage_config.xml b/packages/SystemUI/res/values/lineage_config.xml
+index 7509dfd2dcba..d08c6f19b9a3 100644
+--- a/packages/SystemUI/res/values/lineage_config.xml
+++ b/packages/SystemUI/res/values/lineage_config.xml
+@@ -25,12 +25,6 @@
+          causes a poor experience. -->
+     <bool name="config_fingerprintWakeAndUnlock">true</bool>
+ 
+-    <!-- Udfps display mode provider class name -->
+-    <string name="config_udfpsDisplayModeProviderComponent">com.android.systemui.biometrics.DummyUdfpsDisplayModeProvider</string>
+-
+-    <!-- Color of the UDFPS pressed view -->
+-    <color name="config_udfpsColor">#ffffffff</color>
+-
+     <!-- Doze: does the double tap sensor need a proximity check? -->
+     <bool name="doze_double_tap_proximity_check">false</bool>
+ 
+diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java
+index 2d87da8c2112..8f5cbb76222f 100644
+--- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java
+@@ -879,7 +879,7 @@ public class AuthContainerView extends LinearLayout
+         final WindowManager.LayoutParams lp = new WindowManager.LayoutParams(
+                 ViewGroup.LayoutParams.MATCH_PARENT,
+                 ViewGroup.LayoutParams.MATCH_PARENT,
+-                WindowManager.LayoutParams.TYPE_DISPLAY_OVERLAY,
+                WindowManager.LayoutParams.TYPE_STATUS_BAR_ADDITIONAL,
+                 windowFlags,
+                 PixelFormat.TRANSLUCENT);
+         lp.privateFlags |= WindowManager.LayoutParams.SYSTEM_FLAG_SHOW_FOR_ALL_USERS;
+diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/DummyUdfpsDisplayModeProvider.kt b/packages/SystemUI/src/com/android/systemui/biometrics/DummyUdfpsDisplayModeProvider.kt
+deleted file mode 100644
+index 380200983114..000000000000
+--- a/packages/SystemUI/src/com/android/systemui/biometrics/DummyUdfpsDisplayModeProvider.kt
+++ /dev/null
+@@ -1,32 +0,0 @@
+-/*
+- * Copyright (C) 2022 The LineageOS Project
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at
+- *
+- *      http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package com.android.systemui.biometrics
+-
+-import android.content.Context
+-import android.view.Surface
+-
+-class DummyUdfpsDisplayModeProvider constructor(
+-    private val context: Context
+-): UdfpsDisplayModeProvider {
+-    override fun enable(onEnabled: Runnable?) {
+-        onEnabled?.run()
+-    }
+-
+-    override fun disable(onDisabled: Runnable?) {
+-        onDisabled?.run()
+-    }
+-}
+diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java
+index 70aa6a3aa06e..412dc0577876 100644
+--- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java
+@@ -594,7 +594,7 @@ public class UdfpsController implements DozeReceiver {
+             @NonNull VibratorHelper vibrator,
+             @NonNull UdfpsHapticsSimulator udfpsHapticsSimulator,
+             @NonNull UdfpsShell udfpsShell,
+-            @NonNull UdfpsDisplayModeProvider udfpsDisplayMode,
+            @NonNull Optional<UdfpsDisplayModeProvider> udfpsDisplayMode,
+             @NonNull KeyguardStateController keyguardStateController,
+             @NonNull DisplayManager displayManager,
+             @Main Handler mainHandler,
+@@ -626,7 +626,7 @@ public class UdfpsController implements DozeReceiver {
+         mPowerManager = powerManager;
+         mAccessibilityManager = accessibilityManager;
+         mLockscreenShadeTransitionController = lockscreenShadeTransitionController;
+-        mUdfpsDisplayMode = udfpsDisplayMode;
+        mUdfpsDisplayMode = udfpsDisplayMode.orElse(null);
+         screenLifecycle.addObserver(mScreenObserver);
+         mScreenOn = screenLifecycle.getScreenState() == ScreenLifecycle.SCREEN_ON;
+         mConfigurationController = configurationController;
+diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt
+index 09a7fb338553..1c62f8a4e508 100644
+--- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt
+@@ -93,7 +93,7 @@ class UdfpsControllerOverlay(
+     private var overlayTouchListener: TouchExplorationStateChangeListener? = null
+ 
+     private val coreLayoutParams = WindowManager.LayoutParams(
+-        WindowManager.LayoutParams.TYPE_DISPLAY_OVERLAY,
+        WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG,
+         0 /* flags set in computeLayoutParams() */,
+         PixelFormat.TRANSLUCENT
+     ).apply {
+diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsSurfaceView.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsSurfaceView.java
+deleted file mode 100644
+index 2488132b508b..000000000000
+--- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsSurfaceView.java
+++ /dev/null
+@@ -1,159 +0,0 @@
+-/*
+- * Copyright (C) 2021 The Android Open Source Project
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at
+- *
+- *      http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package com.android.systemui.biometrics;
+-
+-import android.annotation.NonNull;
+-import android.annotation.Nullable;
+-import android.content.Context;
+-import android.graphics.drawable.Drawable;
+-import android.graphics.Canvas;
+-import android.graphics.Paint;
+-import android.graphics.PixelFormat;
+-import android.graphics.RectF;
+-import android.util.AttributeSet;
+-import android.util.Log;
+-import android.view.Surface;
+-import android.view.SurfaceHolder;
+-import android.view.SurfaceView;
+-
+-import com.android.systemui.R;
+-
+-/**
+- * Surface View for providing the Global High-Brightness Mode (GHBM) illumination for UDFPS.
+- */
+-public class UdfpsSurfaceView extends SurfaceView implements SurfaceHolder.Callback {
+-    private static final String TAG = "UdfpsSurfaceView";
+-
+-    /**
+-     * Notifies {@link UdfpsView} when to enable GHBM illumination.
+-     */
+-    interface GhbmIlluminationListener {
+-        /**
+-         * @param surface the surface for which GHBM should be enabled.
+-         * @param onDisplayConfigured a runnable that should be run after GHBM is enabled.
+-         */
+-        void enableGhbm(@NonNull Surface surface, @Nullable Runnable onDisplayConfigured);
+-    }
+-
+-    @NonNull private final SurfaceHolder mHolder;
+-    @NonNull private final Paint mSensorPaint;
+-
+-    @Nullable private GhbmIlluminationListener mGhbmIlluminationListener;
+-    @Nullable private Runnable mOnDisplayConfigured;
+-    boolean mAwaitingSurfaceToStartIllumination;
+-    boolean mHasValidSurface;
+-
+-    private Drawable mUdfpsIconPressed;
+-
+-    public UdfpsSurfaceView(Context context, AttributeSet attrs) {
+-        super(context, attrs);
+-
+-        // Make this SurfaceView draw on top of everything else in this window. This allows us to
+-        // 1) Always show the HBM circle on top of everything else, and
+-        // 2) Properly composite this view with any other animations in the same window no matter
+-        //    what contents are added in which order to this view hierarchy.
+-        setZOrderOnTop(true);
+-
+-        mHolder = getHolder();
+-        mHolder.addCallback(this);
+-        mHolder.setFormat(PixelFormat.RGBA_8888);
+-
+-        mSensorPaint = new Paint(0 /* flags */);
+-        mSensorPaint.setAntiAlias(true);
+-        mSensorPaint.setColor(context.getColor(R.color.config_udfpsColor));
+-        mSensorPaint.setStyle(Paint.Style.FILL);
+-
+-        mUdfpsIconPressed = context.getDrawable(R.drawable.udfps_icon_pressed);
+-    }
+-
+-    @Override public void surfaceCreated(SurfaceHolder holder) {
+-        mHasValidSurface = true;
+-        if (mAwaitingSurfaceToStartIllumination) {
+-            doIlluminate(mOnDisplayConfigured);
+-            mOnDisplayConfigured = null;
+-            mAwaitingSurfaceToStartIllumination = false;
+-        }
+-    }
+-
+-    @Override
+-    public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
+-        // Unused.
+-    }
+-
+-    @Override public void surfaceDestroyed(SurfaceHolder holder) {
+-        mHasValidSurface = false;
+-    }
+-
+-    void setGhbmIlluminationListener(@Nullable GhbmIlluminationListener listener) {
+-        mGhbmIlluminationListener = listener;
+-    }
+-
+-    /**
+-     * Note: there is no corresponding method to stop GHBM illumination. It is expected that
+-     * {@link UdfpsView} will hide this view, which would destroy the surface and remove the
+-     * illumination dot.
+-     */
+-    void startGhbmIllumination(@Nullable Runnable onDisplayConfigured) {
+-        if (mGhbmIlluminationListener == null) {
+-            Log.e(TAG, "startIllumination | mGhbmIlluminationListener is null");
+-            return;
+-        }
+-
+-        if (mHasValidSurface) {
+-            doIlluminate(onDisplayConfigured);
+-        } else {
+-            mAwaitingSurfaceToStartIllumination = true;
+-            mOnDisplayConfigured = onDisplayConfigured;
+-        }
+-    }
+-
+-    private void doIlluminate(@Nullable Runnable onDisplayConfigured) {
+-        if (mGhbmIlluminationListener == null) {
+-            Log.e(TAG, "doIlluminate | mGhbmIlluminationListener is null");
+-            return;
+-        }
+-
+-        mGhbmIlluminationListener.enableGhbm(mHolder.getSurface(), onDisplayConfigured);
+-    }
+-
+-    /**
+-     * Immediately draws the illumination dot on this SurfaceView's surface.
+-     */
+-    void drawIlluminationDot(@NonNull RectF sensorRect) {
+-        if (!mHasValidSurface) {
+-            Log.e(TAG, "drawIlluminationDot | the surface is destroyed or was never created.");
+-            return;
+-        }
+-        Canvas canvas = null;
+-        try {
+-            canvas = mHolder.lockCanvas();
+-            mUdfpsIconPressed.setBounds(
+-                    Math.round(sensorRect.left),
+-                    Math.round(sensorRect.top),
+-                    Math.round(sensorRect.right),
+-                    Math.round(sensorRect.bottom)
+-            );
+-            mUdfpsIconPressed.draw(canvas);
+-            canvas.drawOval(sensorRect, mSensorPaint);
+-        } finally {
+-            // Make sure the surface is never left in a bad state.
+-            if (canvas != null) {
+-                mHolder.unlockCanvasAndPost(canvas);
+-            }
+-        }
+-    }
+-}
+diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
+index 9dcd2db4d3b4..a15456d46897 100644
+--- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
+@@ -24,7 +24,6 @@ import android.graphics.RectF
+ import android.util.AttributeSet
+ import android.util.Log
+ import android.view.MotionEvent
+-import android.view.Surface
+ import android.widget.FrameLayout
+ import com.android.systemui.R
+ import com.android.systemui.doze.DozeReceiver
+@@ -57,8 +56,6 @@ class UdfpsView(
+             a.getFloat(R.styleable.UdfpsView_sensorTouchAreaCoefficient, 0f)
+         }
+ 
+-    private var ghbmView: UdfpsSurfaceView? = null
+-
+     /** View controller (can be different for enrollment, BiometricPrompt, Keyguard, etc.). */
+     var animationViewController: UdfpsAnimationViewController<*>? = null
+ 
+@@ -85,10 +82,6 @@ class UdfpsView(
+         return (animationViewController == null || !animationViewController!!.shouldPauseAuth())
+     }
+ 
+-    override fun onFinishInflate() {
+-        ghbmView = findViewById(R.id.hbm_view)
+-    }
+-
+     override fun dozeTimeTick() {
+         animationViewController?.dozeTimeTick()
+     }
+@@ -150,34 +143,12 @@ class UdfpsView(
+     fun configureDisplay(onDisplayConfigured: Runnable) {
+         isDisplayConfigured = true
+         animationViewController?.onDisplayConfiguring()
+-        val gView = ghbmView
+-        if (gView != null) {
+-            gView.setGhbmIlluminationListener(this::doIlluminate)
+-            gView.visibility = VISIBLE
+-            gView.startGhbmIllumination(onDisplayConfigured)
+-        } else {
+-            doIlluminate(null /* surface */, onDisplayConfigured)
+-        }
+-    }
+-
+-    private fun doIlluminate(surface: Surface?, onDisplayConfigured: Runnable?) {
+-        if (ghbmView != null && surface == null) {
+-            Log.e(TAG, "doIlluminate | surface must be non-null for GHBM")
+-        }
+-
+-        mUdfpsDisplayMode?.enable {
+-            onDisplayConfigured?.run()
+-            ghbmView?.drawIlluminationDot(sensorRect)
+-        }
+        mUdfpsDisplayMode?.enable(onDisplayConfigured)
+     }
+ 
+     fun unconfigureDisplay() {
+         isDisplayConfigured = false
+         animationViewController?.onDisplayUnconfigured()
+-        ghbmView?.let { view ->
+-            view.setGhbmIlluminationListener(null)
+-            view.visibility = INVISIBLE
+-        }
+         mUdfpsDisplayMode?.disable(null /* onDisabled */)
+     }
+ }
+diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java
+index bc130894ced1..443d2774f0e0 100644
+--- a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java
+++ b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java
+@@ -93,7 +93,6 @@ import com.android.systemui.util.time.SystemClock;
+ import com.android.systemui.util.time.SystemClockImpl;
+ import com.android.systemui.wallet.dagger.WalletModule;
+ import com.android.systemui.wmshell.BubblesManager;
+-import com.android.systemui.R;
+ import com.android.wm.shell.bubbles.Bubbles;
+ 
+ import java.util.Optional;
+@@ -199,17 +198,8 @@ public abstract class SystemUIModule {
+     @BindsOptionalOf
+     abstract CentralSurfaces optionalCentralSurfaces();
+ 
+-    @Provides
+-    static UdfpsDisplayModeProvider getUdfpsDisplayModeProvider(Context context) {
+-        String className = context.getString(R.string.config_udfpsDisplayModeProviderComponent);
+-        try {
+-            Class<?> clazz = context.getClassLoader().loadClass(className);
+-            return (UdfpsDisplayModeProvider) clazz.getDeclaredConstructor(
+-                    new Class[] { Context.class }).newInstance(context);
+-        } catch (Throwable t) {
+-            throw new RuntimeException("Error loading UdfpsDisplayModeProvider " + className, t);
+-        }
+-    }
+    @BindsOptionalOf
+    abstract UdfpsDisplayModeProvider optionalUdfpsDisplayModeProvider();
+ 
+     @BindsOptionalOf
+     abstract AlternateUdfpsTouchProvider optionalUdfpsTouchProvider();
+-- 
+2.25.1
+
--- a/patches_treble_prerequisite/frameworks_base/0002-Revert-Biometrics-Allow-disabling-of-fingerprint-cle.patch
+++ b/patches_treble_prerequisite/frameworks_base/0002-Revert-Biometrics-Allow-disabling-of-fingerprint-cle.patch
@ -1,7 +1,8 @@
-From cbf15ae92b72c4af571cae5bb584cf55dcc96fa4 Mon Sep 17 00:00:00 2001
+From 435be186e085fa16091e2574ac01f07197e8faf5 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Fri, 10 Jun 2022 21:33:47 +0800
-Subject: [PATCH] Revert "Biometrics: Allow disabling of fingerprint cleanups"
+Subject: [PATCH 2/2] Revert "Biometrics: Allow disabling of fingerprint
+ cleanups"

 This reverts commit 87f04da03724b26f64b78e628f171e4bc4b20673.

@ -11,7 +12,7 @@ Change-Id: Iacbb74e392122c5c072251b8153367f7ee3e8aaf
 1 file changed, 8 deletions(-)

 diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java
-index 72095d9cceb7..2a3f34ae3cd4 100644
+index 02353bc01c79..c1a86386dfd4 100644
 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java
 +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java
@@ -128,8 +128,6 @@ public class Fingerprint21 implements IHwBinder.DeathRecipient, ServiceProvider
@ -33,7 +34,7 @@ index 72095d9cceb7..2a3f34ae3cd4 100644
         try {
             ActivityManager.getService().registerUserSwitchObserver(mUserSwitchObserver, TAG);
         } catch (RemoteException e) {
-@@ -734,9 +729,6 @@ public class Fingerprint21 implements IHwBinder.DeathRecipient, ServiceProvider
+@@ -739,9 +734,6 @@ public class Fingerprint21 implements IHwBinder.DeathRecipient, ServiceProvider
 
     private void scheduleInternalCleanup(int userId,
             @Nullable ClientMonitorCallback callback) {
--- a/patches_treble_prerequisite/frameworks_native/0001-Revert-CompositionEngine-Request-device-composition-.patch
+++ b/patches_treble_prerequisite/frameworks_native/0001-Revert-CompositionEngine-Request-device-composition-.patch
@ -0,0 +1,55 @@
+From 7c185420e60e45008f9308b676923e45a56f8505 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Wed, 11 Jan 2023 11:59:05 +0000
+Subject: [PATCH 1/2] Revert "CompositionEngine: Request device composition for
+ the Udfps touched layer"
+
+This reverts commit c2a0b2db8e69b403478379351d4aabf751829c9c.
+---
+ .../CompositionEngine/src/Output.cpp             | 16 +---------------
+ 1 file changed, 1 insertion(+), 15 deletions(-)
+
+diff --git a/services/surfaceflinger/CompositionEngine/src/Output.cpp b/services/surfaceflinger/CompositionEngine/src/Output.cpp
+index d17ddd9df6..b724daa8ce 100644
+--- a/services/surfaceflinger/CompositionEngine/src/Output.cpp
+++ b/services/surfaceflinger/CompositionEngine/src/Output.cpp
+@@ -22,7 +22,6 @@
+ #include <compositionengine/LayerFE.h>
+ #include <compositionengine/LayerFECompositionState.h>
+ #include <compositionengine/RenderSurface.h>
+-#include <compositionengine/UdfpsExtension.h>
+ #include <compositionengine/impl/HwcAsyncWorker.h>
+ #include <compositionengine/impl/Output.h>
+ #include <compositionengine/impl/OutputCompositionState.h>
+@@ -836,10 +835,7 @@ void Output::writeCompositionState(const compositionengine::CompositionRefreshAr
+ 
+ compositionengine::OutputLayer* Output::findLayerRequestingBackgroundComposition() const {
+     compositionengine::OutputLayer* layerRequestingBgComposition = nullptr;
+-    for (size_t i = 0; i < getOutputLayerCount(); i++) {
+-        compositionengine::OutputLayer* layer = getOutputLayerOrderedByZByIndex(i);
+-        compositionengine::OutputLayer* nextLayer = getOutputLayerOrderedByZByIndex(i + 1);
+-
+    for (auto* layer : getOutputLayersOrderedByZ()) {
+         auto* compState = layer->getLayerFE().getCompositionState();
+ 
+         // If any layer has a sideband stream, we will disable blurs. In that case, we don't
+@@ -853,16 +849,6 @@ compositionengine::OutputLayer* Output::findLayerRequestingBackgroundComposition
+         if (compState->backgroundBlurRadius > 0 || compState->blurRegions.size() > 0) {
+             layerRequestingBgComposition = layer;
+         }
+-
+-        // If the next layer is the Udfps touched layer, enable client composition for it
+-        // because that somehow leads to the Udfps touched layer getting device composition
+-        // consistently.
+-        if ((nextLayer != nullptr && layerRequestingBgComposition == nullptr) &&
+-            (strncmp(nextLayer->getLayerFE().getDebugName(), UDFPS_TOUCHED_LAYER_NAME,
+-                     strlen(UDFPS_TOUCHED_LAYER_NAME)) == 0)) {
+-            layerRequestingBgComposition = layer;
+-            break;
+-        }
+     }
+     return layerRequestingBgComposition;
+ }
+-- 
+2.25.1
+
--- a/patches_treble_prerequisite/frameworks_native/0002-Revert-surfaceflinger-Add-support-for-Udfps-extensio.patch
+++ b/patches_treble_prerequisite/frameworks_native/0002-Revert-surfaceflinger-Add-support-for-Udfps-extensio.patch
@ -0,0 +1,157 @@
+From 274dbe335d658a429bdd3b266b94d739dc77bedd Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Wed, 11 Jan 2023 11:59:35 +0000
+Subject: [PATCH 2/2] Revert "surfaceflinger: Add support for Udfps extension
+ lib"
+
+This reverts commit 76874f54f1fa7517361fd1817044a5d0bbfa9ade.
+---
+ .../CompositionEngine/Android.bp              | 14 +--------
+ .../compositionengine/UdfpsExtension.h        | 29 -------------------
+ .../CompositionEngine/src/OutputLayer.cpp     | 13 +--------
+ .../CompositionEngine/src/UdfpsExtension.cpp  | 27 -----------------
+ 4 files changed, 2 insertions(+), 81 deletions(-)
+ delete mode 100644 services/surfaceflinger/CompositionEngine/include/compositionengine/UdfpsExtension.h
+ delete mode 100644 services/surfaceflinger/CompositionEngine/src/UdfpsExtension.cpp
+
+diff --git a/services/surfaceflinger/CompositionEngine/Android.bp b/services/surfaceflinger/CompositionEngine/Android.bp
+index abc3478313..11a9e19db8 100644
+--- a/services/surfaceflinger/CompositionEngine/Android.bp
+++ b/services/surfaceflinger/CompositionEngine/Android.bp
+@@ -59,10 +59,7 @@ cc_defaults {
+ 
+ cc_library {
+     name: "libcompositionengine",
+-    defaults: [
+-        "libcompositionengine_defaults",
+-        "surfaceflinger_udfps_lib_defaults",
+-    ],
+    defaults: ["libcompositionengine_defaults"],
+     srcs: [
+         "src/planner/CachedSet.cpp",
+         "src/planner/Flattener.cpp",
+@@ -84,7 +81,6 @@ cc_library {
+         "src/OutputLayer.cpp",
+         "src/OutputLayerCompositionState.cpp",
+         "src/RenderSurface.cpp",
+-        "src/UdfpsExtension.cpp",
+     ],
+     local_include_dirs: ["include"],
+     export_include_dirs: ["include"],
+@@ -113,14 +109,6 @@ cc_library {
+     export_include_dirs: ["include"],
+ }
+ 
+-cc_library_static {
+-    name: "surfaceflinger_udfps_lib",
+-    srcs: [
+-        "src/UdfpsExtension.cpp",
+-    ],
+-    export_include_dirs: ["include"],
+-}
+-
+ cc_test {
+     name: "libcompositionengine_test",
+     test_suites: ["device-tests"],
+diff --git a/services/surfaceflinger/CompositionEngine/include/compositionengine/UdfpsExtension.h b/services/surfaceflinger/CompositionEngine/include/compositionengine/UdfpsExtension.h
+deleted file mode 100644
+index 4306cb4a02..0000000000
+--- a/services/surfaceflinger/CompositionEngine/include/compositionengine/UdfpsExtension.h
+++ /dev/null
+@@ -1,29 +0,0 @@
+-/*
+- * Copyright 2021-2022 The LineageOS Project
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at
+- *
+- *      http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-#include <stdint.h>
+-
+-#ifndef __UDFPS_EXTENSION__H__
+-#define __UDFPS_EXTENSION__H__
+-
+-#define UDFPS_BIOMETRIC_PROMPT_LAYER_NAME "BiometricPrompt"
+-#define UDFPS_LAYER_NAME "UdfpsControllerOverlay"
+-#define UDFPS_TOUCHED_LAYER_NAME "SurfaceView[UdfpsControllerOverlay](BLAST)"
+-
+-extern uint32_t getUdfpsZOrder(uint32_t z, bool touched);
+-extern uint64_t getUdfpsUsageBits(uint64_t usageBits, bool touched);
+-
+-#endif /* __UDFPS_EXTENSION__H__ */
+diff --git a/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp b/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp
+index 2129dfed29..1bb9d0eb63 100644
+--- a/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp
+++ b/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp
+@@ -19,7 +19,6 @@
+ #include <compositionengine/DisplayColorProfile.h>
+ #include <compositionengine/LayerFECompositionState.h>
+ #include <compositionengine/Output.h>
+-#include <compositionengine/UdfpsExtension.h>
+ #include <compositionengine/impl/HwcBufferCache.h>
+ #include <compositionengine/impl/OutputCompositionState.h>
+ #include <compositionengine/impl/OutputLayer.h>
+@@ -442,17 +441,7 @@ void OutputLayer::writeOutputDependentGeometryStateToHWC(HWC2::Layer* hwcLayer,
+               sourceCrop.bottom, to_string(error).c_str(), static_cast<int32_t>(error));
+     }
+ 
+-    uint32_t z_udfps = z;
+-    if ((strncmp(getLayerFE().getDebugName(), UDFPS_LAYER_NAME, strlen(UDFPS_LAYER_NAME)) == 0) ||
+-        (strncmp(getLayerFE().getDebugName(), UDFPS_BIOMETRIC_PROMPT_LAYER_NAME,
+-                 strlen(UDFPS_BIOMETRIC_PROMPT_LAYER_NAME)) == 0)) {
+-        z_udfps = getUdfpsZOrder(z, false);
+-    } else if (strncmp(getLayerFE().getDebugName(), UDFPS_TOUCHED_LAYER_NAME,
+-                       strlen(UDFPS_TOUCHED_LAYER_NAME)) == 0) {
+-        z_udfps = getUdfpsZOrder(z, true);
+-    }
+-
+-    if (auto error = hwcLayer->setZOrder(z_udfps); error != hal::Error::NONE) {
+    if (auto error = hwcLayer->setZOrder(z); error != hal::Error::NONE) {
+         ALOGE("[%s] Failed to set Z %u: %s (%d)", getLayerFE().getDebugName(), z,
+               to_string(error).c_str(), static_cast<int32_t>(error));
+     }
+diff --git a/services/surfaceflinger/CompositionEngine/src/UdfpsExtension.cpp b/services/surfaceflinger/CompositionEngine/src/UdfpsExtension.cpp
+deleted file mode 100644
+index 2d9d086dd2..0000000000
+--- a/services/surfaceflinger/CompositionEngine/src/UdfpsExtension.cpp
+++ /dev/null
+@@ -1,27 +0,0 @@
+-/*
+- * Copyright 2020 The LineageOS Project
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at
+- *
+- *      http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-#ifndef TARGET_PROVIDES_UDFPS_LIB
+-#include <compositionengine/UdfpsExtension.h>
+-
+-uint32_t getUdfpsZOrder(uint32_t z, __unused bool touched) {
+-    return z;
+-}
+-
+-uint64_t getUdfpsUsageBits(uint64_t usageBits, __unused bool touched) {
+-    return usageBits;
+-}
+-#endif
+-- 
+2.25.1
+
--- a/patches_treble_td/platform_external_selinux/0001-Increase-default-log_level-to-get-actual-selinux-err.patch
+++ b/patches_treble_td/platform_external_selinux/0001-Increase-default-log_level-to-get-actual-selinux-err.patch
@ -1,7 +1,7 @@
-From 43119ff620379b3710f1411b0e965ed0b10982fc Mon Sep 17 00:00:00 2001
+From d9083d41e17a8429dc53a6be9acfb437fd3b982b Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 9 Apr 2018 00:19:49 +0200
-Subject: [PATCH 1/8] Increase default log_level to get actual selinux error in
+Subject: [PATCH 1/9] Increase default log_level to get actual selinux error in
 kmsg

 ---
--- a/patches_treble_td/platform_external_selinux/0002-Revert-libsepol-Make-an-unknown-permission-an-error-.patch
+++ b/patches_treble_td/platform_external_selinux/0002-Revert-libsepol-Make-an-unknown-permission-an-error-.patch
@ -1,7 +1,7 @@
-From 1e713fc5860318d2a99f31718fea884c8d461923 Mon Sep 17 00:00:00 2001
+From 0deb03a6694729e084e8e81d7e840a851d130476 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 9 Sep 2020 22:36:42 +0200
-Subject: [PATCH 2/8] Revert "libsepol: Make an unknown permission an error in
+Subject: [PATCH 2/9] Revert "libsepol: Make an unknown permission an error in
 CIL"

 This reverts commit dc4e54126bf25dea4d51820922ccd1959be68fbc.
--- a/patches_treble_td/platform_external_selinux/0003-Workaround-device-phh-treble-conflict-with-SELinux-p.patch
+++ b/patches_treble_td/platform_external_selinux/0003-Workaround-device-phh-treble-conflict-with-SELinux-p.patch
@ -1,7 +1,7 @@
-From 383c762e65ba755da5f424cea56f7249fb4aa852 Mon Sep 17 00:00:00 2001
+From fad09461b0c7ab877b32c5ab402c053335f19f18 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 31 Mar 2021 23:32:37 +0200
-Subject: [PATCH 3/8] Workaround device/phh/treble conflict with SELinux policy
+Subject: [PATCH 3/9] Workaround device/phh/treble conflict with SELinux policy

 device/phh/treble defines the following three types (hostapd,
 sysfs_usb_supply, rpmb_device)
--- a/patches_treble_td/platform_external_selinux/0004-Allow-devices-virtual-block-genfscon-conflict-seen-o.patch
+++ b/patches_treble_td/platform_external_selinux/0004-Allow-devices-virtual-block-genfscon-conflict-seen-o.patch
@ -1,7 +1,7 @@
-From f1ee5e7fb0ef1bbed930d955ce34601f91850762 Mon Sep 17 00:00:00 2001
+From 8168537d375afd17235b88f6ee9bc9b2c3db06a3 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 6 Sep 2019 15:07:25 +0200
-Subject: [PATCH 4/8] Allow /devices/virtual/block/ genfscon conflict (seen on
+Subject: [PATCH 4/9] Allow /devices/virtual/block/ genfscon conflict (seen on
 Xiaomi Mi 9)

 Change-Id: I06e4e9d5b82d61a8aeab595b47e2589249675895
--- a/patches_treble_td/platform_external_selinux/0005-if-service-is-rcs-accept-conflict.-Seen-on-Moto-E5.patch
+++ b/patches_treble_td/platform_external_selinux/0005-if-service-is-rcs-accept-conflict.-Seen-on-Moto-E5.patch
@ -1,7 +1,7 @@
-From d023a3be8b43e5539ac5aab02f0fa96c03ed9901 Mon Sep 17 00:00:00 2001
+From 5d08badc20058b79803197379ca0371b5ae18230 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 12 Sep 2019 20:37:04 +0200
-Subject: [PATCH 5/8] if service is "rcs", accept conflict. Seen on Moto E5
+Subject: [PATCH 5/9] if service is "rcs", accept conflict. Seen on Moto E5

 Change-Id: I0cc2d0fad83f403f2b5d7458039b1564ce5ed9dd
 ---
--- a/patches_treble_td/platform_external_selinux/0006-Allow-mismatches-of-exfat-genfscon.patch
+++ b/patches_treble_td/platform_external_selinux/0006-Allow-mismatches-of-exfat-genfscon.patch
@ -1,7 +1,7 @@
-From 9cd3d8a0becbd182f5fe77af64ca7611ceba6fd1 Mon Sep 17 00:00:00 2001
+From 1bb417ece7c1709906499a9cdd73c5b37ddd8c71 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 24 May 2020 17:22:22 +0200
-Subject: [PATCH 6/8] Allow mismatches of exfat genfscon
+Subject: [PATCH 6/9] Allow mismatches of exfat genfscon

 ---
 libsepol/cil/src/cil_post.c | 4 ++++
--- a/patches_treble_td/platform_external_selinux/0007-Enable-multipl_decls-by-default.-This-is-needed-beca.patch
+++ b/patches_treble_td/platform_external_selinux/0007-Enable-multipl_decls-by-default.-This-is-needed-beca.patch
@ -1,7 +1,7 @@
-From 81a82adb74c53b1671f24cb69a140a7915707f0f Mon Sep 17 00:00:00 2001
+From 6a0bc65c6bda1576d59bd89225ae4babfc3de6be Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 2 Mar 2018 22:49:55 +0100
-Subject: [PATCH 7/8] Enable multipl_decls by default. This is needed because
+Subject: [PATCH 7/9] Enable multipl_decls by default. This is needed because
 8.0 init doesn't add -m

 Change-Id: I43dc661d519f7b8576d72a828d8cbd444592bf5e
--- a/patches_treble_td/platform_external_selinux/0008-Fix-boot-on-Moto-devices-using-unknown-class.patch
+++ b/patches_treble_td/platform_external_selinux/0008-Fix-boot-on-Moto-devices-using-unknown-class.patch
@ -1,7 +1,7 @@
-From 426de61556334b4b1024f615302dadb1ed6d6ac8 Mon Sep 17 00:00:00 2001
+From 1e5154623b208daf37d20d297f3c8ecaacfb1b28 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 25 Oct 2019 13:29:20 +0200
-Subject: [PATCH 8/8] Fix boot on Moto devices using unknown class
+Subject: [PATCH 8/9] Fix boot on Moto devices using unknown class

 vendor sepolicy never contains new class or classorder, and are not
 allowed to.
--- a/patches_treble_td/platform_external_selinux/0009-Improve-SELinux-policy-workaround-on-device-phh-treb.patch
+++ b/patches_treble_td/platform_external_selinux/0009-Improve-SELinux-policy-workaround-on-device-phh-treb.patch
@ -0,0 +1,26 @@
+From e0e22c909d3f107f54136921d723f2656d5677ff Mon Sep 17 00:00:00 2001
+From: ponces <ponces26@gmail.com>
+Date: Mon, 7 Nov 2022 16:14:20 +0000
+Subject: [PATCH 9/9] Improve SELinux policy workaround on device/phh/treble
+ conflict to exit with SEPOL_OK instead of SEPOL_EEXIST
+
+This fixes boot on many Samsung devices as exiting with SEPOL_EEXIST will prevent them to boot
+---
+ libsepol/cil/src/cil_build_ast.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/libsepol/cil/src/cil_build_ast.c b/libsepol/cil/src/cil_build_ast.c
+index 023fd6c7..61c8864b 100644
+--- a/libsepol/cil/src/cil_build_ast.c
+++ b/libsepol/cil/src/cil_build_ast.c
+@@ -141,7 +141,6 @@ int cil_add_decl_to_symtab(struct cil_db *db, symtab_t *symtab, hashtab_key_t ke
+ 		/* multiple_decls is enabled and works for this datum type, add node */
+ 		cil_list_append(prev->nodes, CIL_NODE, node);
+ 		node->data = prev;
+-		return SEPOL_EEXIST;
+ 	}
+ 
+ 	return SEPOL_OK;
+-- 
+2.25.1
+
--- a/patches_treble_td/platform_frameworks_base/0001-Fallback-to-stupid-autobrightness-if-brightness-valu.patch
+++ b/patches_treble_td/platform_frameworks_base/0001-Fallback-to-stupid-autobrightness-if-brightness-valu.patch
@ -1,7 +1,7 @@
-From 425ab90a2c6b4b92f3c18152f92b22511de556ba Mon Sep 17 00:00:00 2001
+From f8173b19f4197fc7858d5d968cebd198855a14a1 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/30] Fallback to stupid autobrightness if brightness values
+Subject: [PATCH 01/35] Fallback to stupid autobrightness if brightness values
 are broken

 This is needed because of:
@ -14,10 +14,10 @@ Change-Id: Ieb679b34239013a5e31b34cb010b12febd9ef6d9
 1 file changed, 7 insertions(+), 2 deletions(-)

 diff --git a/services/core/java/com/android/server/display/DisplayDeviceConfig.java b/services/core/java/com/android/server/display/DisplayDeviceConfig.java
-index a25ac210f9c8..ed26223948b0 100644
+index 416518613568..5a56266ad759 100644
 --- a/services/core/java/com/android/server/display/DisplayDeviceConfig.java
 +++ b/services/core/java/com/android/server/display/DisplayDeviceConfig.java
-@@ -317,9 +317,14 @@ public class DisplayDeviceConfig {
+@@ -405,9 +405,14 @@ public class DisplayDeviceConfig {
      * @return A configuration instance.
      */
     public static DisplayDeviceConfig create(Context context, boolean useConfigXml) {
--- a/patches_treble_td/platform_frameworks_base/0002-Fix-env-empty-string-ANDROID_STORAGE.patch
+++ b/patches_treble_td/platform_frameworks_base/0002-Fix-env-empty-string-ANDROID_STORAGE.patch
@ -1,7 +1,7 @@
-From b8fc79c1f7c07e725a3e211119b4393d665d4658 Mon Sep 17 00:00:00 2001
+From 943fd5f9ad41ea7c389a7fb66bd99527870bd834 Mon Sep 17 00:00:00 2001
 From: Raphael Mounier <mounierr07@gmail.com>
 Date: Sat, 6 Aug 2022 18:08:36 +0200
-Subject: [PATCH 02/30] Fix env empty string - ANDROID_STORAGE
+Subject: [PATCH 02/35] Fix env empty string - ANDROID_STORAGE

 Huawei hi6250 define in init.hi6250.rc ANDROID_STORAGE to "", so check empty string and replace with default path. Apply change for all env directory
 ---
--- a/patches_treble_td/platform_frameworks_base/0003-Relax-requirement-for-visible-flag-to-sdcards.patch
+++ b/patches_treble_td/platform_frameworks_base/0003-Relax-requirement-for-visible-flag-to-sdcards.patch
@ -1,7 +1,7 @@
-From 74723cfbaaf7e2df53940f9935798a8297e1289f Mon Sep 17 00:00:00 2001
+From 7a8367b927b9763fb048d708805ae23dd5032fbc Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 28 Nov 2017 18:28:04 +0100
-Subject: [PATCH 03/30] Relax requirement for visible flag to sdcards
+Subject: [PATCH 03/35] Relax requirement for visible flag to sdcards

 The vast majority of sdcard readers are stable enough to be declared by
 the API. (I see no counter-example)
@ -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 fc4da0b93c83..e8ec4be49f4f 100644
+index 7f3676d0c52b..dc1083879b6e 100644
 --- a/services/core/java/com/android/server/StorageManagerService.java
 +++ b/services/core/java/com/android/server/StorageManagerService.java
-@@ -1610,7 +1610,8 @@ class StorageManagerService extends IStorageManager.Stub
+@@ -1616,7 +1616,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.
--- a/patches_treble_td/platform_frameworks_base/0005-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch
+++ b/patches_treble_td/platform_frameworks_base/0005-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch
@ -1,7 +1,7 @@
-From 0d723d79284ffb84a029d354580492876fbc9454 Mon Sep 17 00:00:00 2001
+From 6ed0e4c93d9ed801924a2f7c34d05cfdf3397013 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 05/30] Don't crash if there is IR HAL is not declared
+Subject: [PATCH 05/35] Don't crash if there is IR HAL is not declared

 Change-Id: I3afded27441bbee8244d5fda544b3e6d1238dc1b
 ---
--- a/patches_treble_td/platform_frameworks_base/0006-Implement-a-persistent-property-to-override-the-defa.patch
+++ b/patches_treble_td/platform_frameworks_base/0006-Implement-a-persistent-property-to-override-the-defa.patch
@ -1,7 +1,7 @@
-From 03b1fceea0b1a47ba2a03993eea5f2521c418944 Mon Sep 17 00:00:00 2001
+From a9638d5d5e81d220ab0a49a0d4f1c53eb8901f9e Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Wed, 1 Jun 2022 16:56:20 -0400
-Subject: [PATCH 06/30] Implement a persistent property to override the default
+Subject: [PATCH 06/35] Implement a persistent property to override the default
 primary camera (0)

 Change-Id: I49b45d00bf71d7932591b3516d49a680e1b6568b
@ -27,10 +27,10 @@ index 7193b93dba7f..aaa2887d7c5b 100644
         CameraInfo cameraInfo = new CameraInfo();
         for (int i = 0; i < numberOfCameras; i++) {
 diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java
-index 228d05b05083..1d7005075d3f 100644
+index 028b1afd9765..a6c318822d7e 100644
 --- a/core/java/android/hardware/camera2/CameraManager.java
 +++ b/core/java/android/hardware/camera2/CameraManager.java
-@@ -1727,6 +1727,15 @@ public final class CameraManager {
+@@ -1754,6 +1754,15 @@ public final class CameraManager {
                         }
                     }});
 
--- a/patches_treble_td/platform_frameworks_base/0007-Show-APN-Settings-for-CDMA-carriers.patch
+++ b/patches_treble_td/platform_frameworks_base/0007-Show-APN-Settings-for-CDMA-carriers.patch
@ -1,17 +1,17 @@
-From 2888eb102d00b8eaabaec536ca2ce0b95eb5fd4b Mon Sep 17 00:00:00 2001
+From d5ebcae00b09c3ee45ef9a5ad44da456d3ad1db6 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 07/30] Show APN Settings for CDMA carriers
+Subject: [PATCH 07/35] Show APN Settings for CDMA carriers

 ---
 telephony/java/android/telephony/CarrierConfigManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
-index e032f65f3427..f96d8bd9bc55 100644
+index cf6d681d596a..4308f6ee40c4 100644
 --- a/telephony/java/android/telephony/CarrierConfigManager.java
 +++ b/telephony/java/android/telephony/CarrierConfigManager.java
-@@ -8675,7 +8675,7 @@ public class CarrierConfigManager {
+@@ -8686,7 +8686,7 @@ public class CarrierConfigManager {
         sDefaults.putBoolean(KEY_OPERATOR_SELECTION_EXPAND_BOOL, true);
         sDefaults.putBoolean(KEY_PREFER_2G_BOOL, false);
         sDefaults.putBoolean(KEY_4G_ONLY_BOOL, false);
--- a/patches_treble_td/platform_frameworks_base/0008-Re-order-services-so-that-it-works-even-without-qtag.patch
+++ b/patches_treble_td/platform_frameworks_base/0008-Re-order-services-so-that-it-works-even-without-qtag.patch
@ -1,7 +1,7 @@
-From 429e3b26107f94404f3e7c01a368a5ec91c0389b Mon Sep 17 00:00:00 2001
+From 5266fe30bf9b7a19220d68bd4a0998d2464fc0d2 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 08/30] Re-order services so that it works even without qtaguid
+Subject: [PATCH 08/35] Re-order services so that it works even without qtaguid

 Change-Id: I0c0f527b3ae151d45c68f7ac6c205da3f34e74df
 ---
@ -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 132dfb42e983..db95bc2ac2bb 100644
+index 8102d892c2d7..ad9a50101e11 100644
 --- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
 +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -959,6 +959,10 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
--- a/patches_treble_td/platform_frameworks_base/0009-Support-samsung-Pie-and-Q-light-hal.patch
+++ b/patches_treble_td/platform_frameworks_base/0009-Support-samsung-Pie-and-Q-light-hal.patch
@ -1,7 +1,7 @@
-From 1ff57569827f74f2ebcaea4ac0e7fad6458a834a Mon Sep 17 00:00:00 2001
+From 285af2fd4f0f782390cbbd24485d3645c22a1cbb 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 09/30] Support samsung Pie and Q light hal
+Subject: [PATCH 09/35] Support samsung Pie and Q light hal

 Change-Id: I01f94acd7d0672733e48854d80368f9ac6f861c6
 ---
--- a/patches_treble_td/platform_frameworks_base/0010-Add-support-for-samsung-touch-physical-and-hover-pro.patch
+++ b/patches_treble_td/platform_frameworks_base/0010-Add-support-for-samsung-touch-physical-and-hover-pro.patch
@ -1,7 +1,7 @@
-From 626dae36e22f0cfce7a7f40ae812d2ed219055e1 Mon Sep 17 00:00:00 2001
+From 6f95d47885a2d4a8586bf9c3b56bbc9f9b4814df 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 10/30] Add support for samsung touch, physical and hover
+Subject: [PATCH 10/35] Add support for samsung touch, physical and hover
 proximity sensor as fallback to real proximity sensor

 Change-Id: I7a0f8b4665c802140d19197d850b77b2a7ac1865
@ -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 9c673caf6f08..427d062de831 100644
+index 9b7cd18760be..d41892634b80 100644
 --- a/services/core/java/com/android/server/display/DisplayPowerController.java
 +++ b/services/core/java/com/android/server/display/DisplayPowerController.java
-@@ -2010,6 +2010,27 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+@@ -2049,6 +2049,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 9c673caf6f08..427d062de831 100644
         if (mProximitySensor != null) {
             mProximityThreshold = Math.min(mProximitySensor.getMaximumRange(),
                     TYPICAL_PROXIMITY_THRESHOLD);
-@@ -2971,6 +2992,20 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+@@ -3095,6 +3116,20 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
         public void onSensorChanged(SensorEvent event) {
             if (mProximitySensorEnabled) {
                 final long time = SystemClock.uptimeMillis();
--- a/patches_treble_td/platform_frameworks_base/0011-Always-allow-overriding-the-number-of-work-profiles.patch
+++ b/patches_treble_td/platform_frameworks_base/0011-Always-allow-overriding-the-number-of-work-profiles.patch
@ -1,7 +1,7 @@
-From 55ecbae148221eb507c4f22cef9858b2966f2ee7 Mon Sep 17 00:00:00 2001
+From 5ae82f9e13a66acdbcaee9aa9ce7190d94c16fd8 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 11/30] Always allow overriding the number of work profiles
+Subject: [PATCH 11/35] Always allow overriding the number of work profiles

 Change-Id: I6eb09aa71663c6fbe7563e3038bffcabdba0ff6a
 ---
@ -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 a66f0177176d..acfe6c9e17d7 100644
+index 7090881138c7..2f2b423a9a3b 100644
 --- a/services/core/java/com/android/server/pm/UserManagerService.java
 +++ b/services/core/java/com/android/server/pm/UserManagerService.java
-@@ -6315,12 +6315,8 @@ public class UserManagerService extends IUserManager.Stub {
+@@ -6432,12 +6432,8 @@ public class UserManagerService extends IUserManager.Stub {
      */
     private static int getMaxUsersOfTypePerParent(UserTypeDetails userTypeDetails) {
         final int defaultMax = userTypeDetails.getMaxAllowedPerParent();
--- a/patches_treble_td/platform_frameworks_base/0012-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch
+++ b/patches_treble_td/platform_frameworks_base/0012-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch
@ -1,7 +1,7 @@
-From cde569bb7e39cbfbcff17846cb3b397deb29bb1b Mon Sep 17 00:00:00 2001
+From 895f6b5d236f65142b2fa2224ed1970656da0389 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 12/30] HOME deserves to wake-up devices just as well as back
+Subject: [PATCH 12/35] HOME deserves to wake-up devices just as well as back
 and menu

 Change-Id: Ia562bafd8c620d00c17e8eb338e4701c6c4a3c3a
--- a/patches_treble_td/platform_frameworks_base/0013-Some-devices-have-proximity-sensor-reporting-NaN-as-.patch
+++ b/patches_treble_td/platform_frameworks_base/0013-Some-devices-have-proximity-sensor-reporting-NaN-as-.patch
@ -1,7 +1,7 @@
-From a382316556ded590fe9a26f50b7f712fd5e0a2b4 Mon Sep 17 00:00:00 2001
+From 9f2b4ccb9c3192e58c4294a59a2b9ea07984e357 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 13/30] Some devices have proximity sensor reporting NaN as max
+Subject: [PATCH 13/35] Some devices have proximity sensor reporting NaN as max
 range for some reason. Make them behave standard way by setting 5 cm

 Change-Id: I3c39e3e914a05903c140235702e0480d2d58a612
@ -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 427d062de831..1de60dd46046 100644
+index d41892634b80..be19e6c4ae53 100644
 --- a/services/core/java/com/android/server/display/DisplayPowerController.java
 +++ b/services/core/java/com/android/server/display/DisplayPowerController.java
-@@ -2034,6 +2034,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+@@ -2073,6 +2073,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
         if (mProximitySensor != null) {
             mProximityThreshold = Math.min(mProximitySensor.getMaximumRange(),
                     TYPICAL_PROXIMITY_THRESHOLD);
--- a/patches_treble_td/platform_frameworks_base/0014-Fix-brightness-range-not-being-complete-on-Samsung-d.patch
+++ b/patches_treble_td/platform_frameworks_base/0014-Fix-brightness-range-not-being-complete-on-Samsung-d.patch
@ -1,7 +1,7 @@
-From 0890446fae292d38fa640a10ee6ea0a2ab02a1e1 Mon Sep 17 00:00:00 2001
+From 8a1150fa5061085d2ebd9fef09ac6e37c2f95c09 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 14/30] Fix brightness range not being complete on Samsung
+Subject: [PATCH 14/35] Fix brightness range not being complete on Samsung
 devices

 On some devices, minimum brightness is 0, which totally messes with
@ -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 60a344f153ab..18d80f3f80f4 100644
+index 36ee002709ef..54df08bd95d3 100644
 --- a/services/core/java/com/android/server/power/PowerManagerService.java
 +++ b/services/core/java/com/android/server/power/PowerManagerService.java
-@@ -1134,9 +1134,11 @@ public final class PowerManagerService extends SystemService
+@@ -1135,9 +1135,11 @@ public final class PowerManagerService extends SystemService
 
         if (min == INVALID_BRIGHTNESS_IN_CONFIG || max == INVALID_BRIGHTNESS_IN_CONFIG
                 || def == INVALID_BRIGHTNESS_IN_CONFIG) {
--- a/patches_treble_td/platform_frameworks_base/0015-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch
+++ b/patches_treble_td/platform_frameworks_base/0015-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch
@ -1,7 +1,7 @@
-From 7e0acc722c9fd061310aa48ec023e1ccb5bb58a0 Mon Sep 17 00:00:00 2001
+From 816006c568ab3008e1d7a88d4d15dd082dbcc7f7 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 15/30] Re-implement fnmatch-like behaviour for RRO java-side
+Subject: [PATCH 15/35] Re-implement fnmatch-like behaviour for RRO java-side

 T: Also apply to FrameworkParsingPackageUtils (@PeterCxy)

@ -12,10 +12,10 @@ Change-Id: Id38292a9a1453aa87b8401c1fdb390fa4e63c7d1
 2 files changed, 22 insertions(+), 4 deletions(-)

 diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
-index 995092117f4d..28efda00393d 100644
+index c01e30ded50e..db6a36ee1b66 100644
 --- a/core/java/android/content/pm/PackageParser.java
 +++ b/core/java/android/content/pm/PackageParser.java
-@@ -2544,8 +2544,17 @@ public class PackageParser {
+@@ -2554,8 +2554,17 @@ public class PackageParser {
         for (int i = 0; i < propNames.length; i++) {
             // Check property value: make sure it is both set and equal to expected value
             final String currValue = SystemProperties.get(propNames[i]);
--- a/patches_treble_td/platform_frameworks_base/0016-Make-rounded-corners-padding-overridable-with-persis.patch
+++ b/patches_treble_td/platform_frameworks_base/0016-Make-rounded-corners-padding-overridable-with-persis.patch
@ -1,7 +1,7 @@
-From de11206d21f61a22c3f39bceb60dacf741ce99bf Mon Sep 17 00:00:00 2001
+From b82b1a7a33beb82bf1a7d4bb9ab5014e7120e1e7 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 16/30] Make rounded corners padding overridable with
+Subject: [PATCH 16/35] Make rounded corners padding overridable with
 persist.sys.phh.rounded_corners_padding

 Change-Id: I481c1c8849b2f22a7cdfb2896a6d3c2e7e3b44d9
@ -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 b0e2f8368703..614b0c03c696 100644
+index efa864f12481..04ace4dc2f3a 100644
 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
 +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
@@ -23,6 +23,7 @@ import android.content.res.Configuration;
@ -23,7 +23,7 @@ index b0e2f8368703..614b0c03c696 100644
 import android.os.UserHandle;
 import android.provider.AlarmClock;
 import android.util.AttributeSet;
-@@ -263,8 +264,10 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu
+@@ -264,8 +265,10 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu
 
         mConfigShowBatteryEstimate = resources.getBoolean(R.bool.config_showBatteryEstimateQSBH);
 
@ -34,7 +34,7 @@ index b0e2f8368703..614b0c03c696 100644
 +            mRoundedCornerPadding = resources.getDimensionPixelSize(
 +                    R.dimen.rounded_corner_content_padding);
 
-         int qsOffsetHeight = SystemBarUtils.getQuickQsOffsetHeight(mContext);
+         int statusBarHeight = SystemBarUtils.getStatusBarHeight(mContext);
 
 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 5119b8f95aa8..cc8b2d5c0913 100644
@ -62,7 +62,7 @@ index 5119b8f95aa8..cc8b2d5c0913 100644
 
     private void updateVisibilities() {
 diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarContentInsetsProvider.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarContentInsetsProvider.kt
-index f5462bc0fba5..c09ab6db814b 100644
+index c850d4f9c56b..af12f592398b 100644
 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarContentInsetsProvider.kt
 +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarContentInsetsProvider.kt
@@ -39,6 +39,7 @@ import com.android.systemui.util.leak.RotationUtils.Rotation
--- a/patches_treble_td/platform_frameworks_base/0017-Remove-useless-notification-about-console-service-be.patch
+++ b/patches_treble_td/platform_frameworks_base/0017-Remove-useless-notification-about-console-service-be.patch
@ -1,7 +1,7 @@
-From 5f1362a864dcf873e2606ff2c4a9399ca70db814 Mon Sep 17 00:00:00 2001
+From 8f63e465b1ddaa84bab57b824d61c2ec6986819b 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 17/30] Remove useless notification about "console" service
+Subject: [PATCH 17/35] Remove useless notification about "console" service
 being running

 ---
@ -9,10 +9,10 @@ Subject: [PATCH 17/30] 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 a78c64b6538d..f4bae98e1bf8 100644
+index df5113b16f49..5740e7e23723 100644
 --- a/services/core/java/com/android/server/am/ActivityManagerService.java
 +++ b/services/core/java/com/android/server/am/ActivityManagerService.java
-@@ -5176,7 +5176,7 @@ public class ActivityManagerService extends IActivityManager.Stub
+@@ -5169,7 +5169,7 @@ public class ActivityManagerService extends IActivityManager.Stub
     }
 
     private void showConsoleNotificationIfActive() {
--- a/patches_treble_td/platform_frameworks_base/0018-Revert-Remove-unused-SystemProperties.set.patch
+++ b/patches_treble_td/platform_frameworks_base/0018-Revert-Remove-unused-SystemProperties.set.patch
@ -1,7 +1,7 @@
-From cd02e06d6fbde606706c1771193da2832a22ce44 Mon Sep 17 00:00:00 2001
+From 2d14422205d961a92711afa56ead9b2ea2d6c4cb Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Wed, 16 Dec 2020 21:24:12 +0800
-Subject: [PATCH 18/30] Revert "Remove unused SystemProperties.set"
+Subject: [PATCH 18/35] Revert "Remove unused SystemProperties.set"

 This reverts commit debb4616ef67f9ed5054eca51ec58592358ff55f.

--- a/patches_treble_td/platform_frameworks_base/0019-TelephonyManager-bring-back-getNetworkClass.patch
+++ b/patches_treble_td/platform_frameworks_base/0019-TelephonyManager-bring-back-getNetworkClass.patch
@ -1,7 +1,7 @@
-From 2f2bc2764b387a03026cf0e2b645b0b9ed86f038 Mon Sep 17 00:00:00 2001
+From 24238287f42ac9c03c521e155c05a06556284d2e Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Wed, 16 Dec 2020 13:46:15 +0800
-Subject: [PATCH 19/30] TelephonyManager: bring back getNetworkClass()
+Subject: [PATCH 19/35] TelephonyManager: bring back getNetworkClass()

 This partially reverts commit c058cac051ab083dc7fb7ea6aa85699110b2e9bf.

--- a/patches_treble_td/platform_frameworks_base/0020-TelephonyManager-add-API-annotations-for-setTelephon.patch
+++ b/patches_treble_td/platform_frameworks_base/0020-TelephonyManager-add-API-annotations-for-setTelephon.patch
@ -1,7 +1,7 @@
-From b8cd5cff6a7541dd1e70a91a8c6e43b928af250b Mon Sep 17 00:00:00 2001
+From 8a6def47510623a545ef3682dac7c6d434351b53 Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Wed, 16 Dec 2020 21:26:45 +0800
-Subject: [PATCH 20/30] TelephonyManager: add API annotations for
+Subject: [PATCH 20/35] TelephonyManager: add API annotations for
 setTelephonyProperty

 * This method was added back by reverting commit
--- a/patches_treble_td/platform_frameworks_base/0021-Fix-Wakelock-issue.patch
+++ b/patches_treble_td/platform_frameworks_base/0021-Fix-Wakelock-issue.patch
@ -1,7 +1,7 @@
-From ce4850163c105cf0baa193bcc9efad2a54478d2f Mon Sep 17 00:00:00 2001
+From 95c0d229e1c77a7011bb0a75525b3d52ebd95f8d Mon Sep 17 00:00:00 2001
 From: Alberto Ponces <ponces26@gmail.com>
 Date: Tue, 2 Feb 2021 10:20:51 +0000
-Subject: [PATCH 21/30] Fix Wakelock issue
+Subject: [PATCH 21/35] Fix Wakelock issue

 Prevent SystemUI crash due to "WakeLock under-locked Doze" (issue #12) by only releasing a wakelock that was not already released
 ---
--- a/patches_treble_td/platform_frameworks_base/0022-Automatically-detect-pick-up-sensor-so-that-an-overl.patch
+++ b/patches_treble_td/platform_frameworks_base/0022-Automatically-detect-pick-up-sensor-so-that-an-overl.patch
@ -1,7 +1,7 @@
-From 8b657065ea65f1b7140ad04e31b6e8a69ffc490c Mon Sep 17 00:00:00 2001
+From df9f9f61c1f7c8e454a90ba0d8b15f8d3217983a 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 22/30] Automatically detect pick up sensor, so that an overlay
+Subject: [PATCH 22/35] Automatically detect pick up sensor, so that an overlay
 is required for the sole purpose of enabling pulse doze on pick up sensor

 ---
@ -9,7 +9,7 @@ Subject: [PATCH 22/30] Automatically detect pick up sensor, so that an overlay
 1 file changed, 17 insertions(+), 2 deletions(-)

 diff --git a/core/java/android/hardware/display/AmbientDisplayConfiguration.java b/core/java/android/hardware/display/AmbientDisplayConfiguration.java
-index 7d8f2ff92200..bd79b727fd05 100644
+index 8c71b363eb7b..ff57d445bbc0 100644
 --- a/core/java/android/hardware/display/AmbientDisplayConfiguration.java
 +++ b/core/java/android/hardware/display/AmbientDisplayConfiguration.java
@@ -25,6 +25,9 @@ import android.text.TextUtils;
@ -22,7 +22,7 @@ index 7d8f2ff92200..bd79b727fd05 100644
 import com.android.internal.R;
 import com.android.internal.util.ArrayUtils;
 
-@@ -100,8 +103,20 @@ public class AmbientDisplayConfiguration {
+@@ -101,8 +104,20 @@ public class AmbientDisplayConfiguration {
 
     /** @hide */
     public boolean dozePickupSensorAvailable() {
--- a/patches_treble_td/platform_frameworks_base/0023-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch
+++ b/patches_treble_td/platform_frameworks_base/0023-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch
@ -1,7 +1,7 @@
-From 899145af82436c53748638465187b48df26a224b Mon Sep 17 00:00:00 2001
+From 1e88b787a1b40f2258ba06dc9cade02b6ff39ace 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 23/30] Catch broken mainBuiltInDisplayCutoutRectApproximation
+Subject: [PATCH 23/35] Catch broken mainBuiltInDisplayCutoutRectApproximation

 Some devices (Redmi Note 9T) have:
 mainBuiltInDisplayCutoutRectApproximation = @android:mainBuiltInDisplayCutout
--- a/patches_treble_td/platform_frameworks_base/0024-backlight-Fix-backlight-control-on-Galaxy-S9.patch
+++ b/patches_treble_td/platform_frameworks_base/0024-backlight-Fix-backlight-control-on-Galaxy-S9.patch
@ -1,7 +1,7 @@
-From f6b967da32661d88c205b496571e0c8f14ca197c Mon Sep 17 00:00:00 2001
+From abf8e674797c3115ac588d730294498a1c967389 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 24/30] backlight: Fix backlight control on Galaxy S9(+)
+Subject: [PATCH 24/35] backlight: Fix backlight control on Galaxy S9(+)

 Change-Id: I1fbbb47939c377597ef8ad6b88b2acea5f4acaa6

--- a/patches_treble_td/platform_frameworks_base/0025-Revert-Switch-long-press-power-behavior-in-AOSP.patch
+++ b/patches_treble_td/platform_frameworks_base/0025-Revert-Switch-long-press-power-behavior-in-AOSP.patch
@ -1,7 +1,7 @@
-From c3645feb413833f5e320fb4cb9d8b6a7457b8ff3 Mon Sep 17 00:00:00 2001
+From 5708ccd78a837211c184808a83fdb5728620d716 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 25/30] Revert "Switch long-press power behavior in AOSP."
+Subject: [PATCH 25/35] Revert "Switch long-press power behavior in AOSP."

 This reverts commit 803c77a0a24624111944832098c6f65158051dc4.
 ---
@ -9,10 +9,10 @@ This reverts commit 803c77a0a24624111944832098c6f65158051dc4.
 1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
-index d655721615b6..6c1368c63b76 100644
+index 659d0f37bf05..80fa6013ee77 100644
 --- a/core/res/res/values/config.xml
 +++ b/core/res/res/values/config.xml
-@@ -993,7 +993,7 @@
+@@ -1007,7 +1007,7 @@
             5 - Go to assistant (Settings.Secure.ASSISTANT)
             6 - Toggle torch on / off (if screen is off)
     -->
@ -21,7 +21,7 @@ index d655721615b6..6c1368c63b76 100644
 
     <!-- The time in milliseconds after which a press on power button is considered "long". -->
     <integer name="config_longPressOnPowerDurationMs">500</integer>
-@@ -1025,7 +1025,7 @@
+@@ -1039,7 +1039,7 @@
             1 - Mute toggle
             2 - Global actions menu
     -->
--- a/patches_treble_td/platform_frameworks_base/0026-Once-we-integrate-Samsung-Power-hal-in-libpowermanag.patch
+++ b/patches_treble_td/platform_frameworks_base/0026-Once-we-integrate-Samsung-Power-hal-in-libpowermanag.patch
@ -1,7 +1,7 @@
-From 4a7e481c942057784ee61c40d50c0ae47b139440 Mon Sep 17 00:00:00 2001
+From 8e6b31e1dc663e67e5b37b3f648e9833ae5a0ed1 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 27 Dec 2021 17:57:11 -0500
-Subject: [PATCH 26/30] Once we integrate Samsung Power hal in libpowermanager,
+Subject: [PATCH 26/35] Once we integrate Samsung Power hal in libpowermanager,
 libpowermanager and its deps require linking against
 vendor.samsung.hardware.miscpower@2.0

--- a/patches_treble_td/platform_frameworks_base/0027-Allow-disabling-of-fingerprint-cleanups-needed-on-so.patch
+++ b/patches_treble_td/platform_frameworks_base/0027-Allow-disabling-of-fingerprint-cleanups-needed-on-so.patch
@ -1,7 +1,7 @@
-From 98ff48370d40fdcb784ac6a2f2333530eea2473b Mon Sep 17 00:00:00 2001
+From 00242c1479803645f0b4ee6983dc435e6c56dd69 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 2 Apr 2022 18:04:01 -0400
-Subject: [PATCH 27/30] Allow disabling of fingerprint cleanups, needed on some
+Subject: [PATCH 27/35] Allow disabling of fingerprint cleanups, needed on some
 Realme devices that cant enumerate

 ---
@ -9,10 +9,10 @@ Subject: [PATCH 27/30] Allow disabling of fingerprint cleanups, needed on some
 1 file changed, 2 insertions(+)

 diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java
-index 2a3f34ae3cd4..23087a4df68a 100644
+index c1a86386dfd4..47f130b95267 100644
 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java
 +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java
-@@ -729,6 +729,8 @@ public class Fingerprint21 implements IHwBinder.DeathRecipient, ServiceProvider
+@@ -734,6 +734,8 @@ public class Fingerprint21 implements IHwBinder.DeathRecipient, ServiceProvider
 
     private void scheduleInternalCleanup(int userId,
             @Nullable ClientMonitorCallback callback) {
--- a/patches_treble_td/platform_frameworks_base/0028-Reduce-the-size-of-udfps-enroll-progress-bar.-Some-d.patch
+++ b/patches_treble_td/platform_frameworks_base/0028-Reduce-the-size-of-udfps-enroll-progress-bar.-Some-d.patch
@ -1,7 +1,7 @@
-From a243391a6fadaa01b3f2b8e0b8653dd23db277ab Mon Sep 17 00:00:00 2001
+From f22c8359d376992a55fcfd366268ec42ffc5cbdf Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 17 Dec 2021 17:16:14 -0500
-Subject: [PATCH 28/30] Reduce the size of udfps enroll progress bar. Some
+Subject: [PATCH 28/35] Reduce the size of udfps enroll progress bar. Some
 devices have their udfps pretty low, and the progress bar would make the icon
 at the wrong place

@ -11,7 +11,7 @@ Change-Id: I1609ad9ca316293dcaaf07f7e681d11aadfcd29c
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
-index 3d56c2522f07..341ee91750f8 100644
+index d7d88cea2dbc..da7a597883eb 100644
 --- a/packages/SystemUI/res/values/config.xml
 +++ b/packages/SystemUI/res/values/config.xml
@@ -577,7 +577,7 @@
--- a/patches_treble_td/platform_frameworks_base/0029-Dynamically-resize-boot-animation-to-match-screen-si.patch
+++ b/patches_treble_td/platform_frameworks_base/0029-Dynamically-resize-boot-animation-to-match-screen-si.patch
@ -1,7 +1,7 @@
-From 7ef5766dd4a6b7e48ab14388283705446fd6e2cc Mon Sep 17 00:00:00 2001
+From 347ac13d5fcd6c7249212827c2cd403fdc238eb3 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 20 Dec 2021 15:01:41 -0500
-Subject: [PATCH 29/30] Dynamically resize boot animation to match screen size
+Subject: [PATCH 29/35] Dynamically resize boot animation to match screen size

 Change-Id: I54e49fc6b8c670103852e212d1416e27ff976205
 ---
--- a/patches_treble_td/platform_frameworks_base/0030-Revert-Remove-more-FDE-methods-from-StorageManager.patch
+++ b/patches_treble_td/platform_frameworks_base/0030-Revert-Remove-more-FDE-methods-from-StorageManager.patch
@ -1,7 +1,7 @@
-From a4efb74c6ddd11ed5bace13786dbb0a633ec4753 Mon Sep 17 00:00:00 2001
+From 26c09ef28bc48c592cb5ae6e4804b0e8b8e39911 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 15 Oct 2022 09:33:56 +0000
-Subject: [PATCH 30/30] Revert "Remove more FDE methods from StorageManager"
+Subject: [PATCH 30/35] Revert "Remove more FDE methods from StorageManager"

 This reverts commit bd13f84152449a3ead6fa8604fd31f48c0224676.
 ---
--- a/patches_treble_td/platform_frameworks_base/0031-Set-old-fingerprint-sensors-to-security-strong.patch
+++ b/patches_treble_td/platform_frameworks_base/0031-Set-old-fingerprint-sensors-to-security-strong.patch
@ -0,0 +1,28 @@
+From 3e2cd958145b810f17b334208c6a01fbaa7e57a6 Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Sat, 3 Dec 2022 17:13:24 -0500
+Subject: [PATCH 31/35] Set old fingerprint sensors to security "strong"
+
+This allows removing config_biometric_sensors from overlays, which led
+to Pixels not booting, because they are using AIDL biometric sensor, and
+despite its name, config_biometric_sensors is HIDL-specific
+---
+ .../core/java/com/android/server/biometrics/AuthService.java    | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/services/core/java/com/android/server/biometrics/AuthService.java b/services/core/java/com/android/server/biometrics/AuthService.java
+index fffb445895a5..c39f80822b8c 100644
+--- a/services/core/java/com/android/server/biometrics/AuthService.java
+++ b/services/core/java/com/android/server/biometrics/AuthService.java
+@@ -668,7 +668,7 @@ public class AuthService extends SystemService {
+         if (pm.hasSystemFeature(PackageManager.FEATURE_FACE)) {
+             modalities.add(String.valueOf(BiometricAuthenticator.TYPE_FACE));
+         }
+-        final String strength = String.valueOf(Authenticators.BIOMETRIC_CONVENIENCE);
+        final String strength = String.valueOf(Authenticators.BIOMETRIC_STRONG);
+         final String[] configStrings = new String[modalities.size()];
+         for (int i = 0; i < modalities.size(); ++i) {
+             final String id = String.valueOf(i);
+-- 
+2.25.1
+
--- a/patches_treble_td/platform_frameworks_base/0032-Call-Samsung-s-ISehSysInputDev-to-report-screen-stat.patch
+++ b/patches_treble_td/platform_frameworks_base/0032-Call-Samsung-s-ISehSysInputDev-to-report-screen-stat.patch
@ -0,0 +1,100 @@
+From efddf3d701ed0d2ae648c9cfed33550a08fcb529 Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Wed, 14 Dec 2022 17:21:00 -0500
+Subject: [PATCH 32/35] Call Samsung's ISehSysInputDev to report screen state
+ to touchscreen driver
+
+This fixes touchscreen not waking up on Galaxy F23
+---
+ services/core/Android.bp                      |  1 +
+ .../server/display/LocalDisplayAdapter.java   | 31 +++++++++++++++++++
+ 2 files changed, 32 insertions(+)
+
+diff --git a/services/core/Android.bp b/services/core/Android.bp
+index f6ba92a94cde..39161ba0df68 100644
+--- a/services/core/Android.bp
+++ b/services/core/Android.bp
+@@ -175,6 +175,7 @@ java_library_static {
+         "overlayable_policy_aidl-java",
+         "SurfaceFlingerProperties",
+         "com.android.sysprop.watchdog",
+        "vendor.samsung.hardware.sysinput-V1.2-java", // HIDL
+     ],
+     javac_shard_size: 50,
+ }
+diff --git a/services/core/java/com/android/server/display/LocalDisplayAdapter.java b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
+index 2a219289cf10..29f653f0edd4 100644
+--- a/services/core/java/com/android/server/display/LocalDisplayAdapter.java
+++ b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
+@@ -33,6 +33,7 @@ import android.os.Trace;
+ import android.util.DisplayUtils;
+ import android.util.LongSparseArray;
+ import android.util.Slog;
+import android.util.Log;
+ import android.util.SparseArray;
+ import android.view.Display;
+ import android.view.DisplayAddress;
+@@ -48,6 +49,8 @@ import com.android.server.LocalServices;
+ import com.android.server.lights.LightsManager;
+ import com.android.server.lights.LogicalLight;
+ 
+import vendor.samsung.hardware.sysinput.V1_1.ISehSysInputDev;
+
+ import java.io.PrintWriter;
+ import java.util.ArrayList;
+ import java.util.Arrays;
+@@ -226,6 +229,8 @@ final class LocalDisplayAdapter extends DisplayAdapter {
+ 
+         private DisplayEventReceiver.FrameRateOverride[] mFrameRateOverrides =
+                 new DisplayEventReceiver.FrameRateOverride[0];
+        private boolean triedSamsungHal = false;
+        private ISehSysInputDev samsungSysinput = null;
+ 
+         LocalDisplayDevice(IBinder displayToken, long physicalDisplayId,
+                 SurfaceControl.StaticDisplayInfo staticDisplayInfo,
+@@ -815,16 +820,42 @@ final class LocalDisplayAdapter extends DisplayAdapter {
+                             }
+                             mSidekickActive = false;
+                         }
+                        if (!triedSamsungHal) {
+                            triedSamsungHal = true;
+                            try {
+                                samsungSysinput = ISehSysInputDev.getService();
+                            } catch(Throwable t) {}
+                        }
+                         final int mode = getPowerModeForState(state);
+                         Trace.traceBegin(Trace.TRACE_TAG_POWER, "setDisplayState("
+                                 + "id=" + physicalDisplayId
+                                 + ", state=" + Display.stateToString(state) + ")");
+
+                        if (samsungSysinput != null) {
+                            try {
+                                Log.d("PHH", "setTspEnable 1, " + state + ", true");
+                                samsungSysinput.setTspEnable(1, state, true);
+                            } catch(Throwable t) {
+                                Log.d("PHH", "Failed settings tsp enable", t);
+                            }
+                        }
+
+                         try {
+                             mSurfaceControlProxy.setDisplayPowerMode(token, mode);
+                             Trace.traceCounter(Trace.TRACE_TAG_POWER, "DisplayPowerMode", mode);
+                         } finally {
+                             Trace.traceEnd(Trace.TRACE_TAG_POWER);
+                         }
+
+                        if (samsungSysinput != null) {
+                            try {
+                                Log.d("PHH", "setTspEnable 1, " + state + ", false");
+                                samsungSysinput.setTspEnable(1, state, false);
+                            } catch(Throwable t) {
+                                Log.d("PHH", "Failed settings tsp enable", t);
+                            }
+                        }
+
+                         // If we're entering a suspended (but not OFF) power state and we
+                         // have a sidekick available, tell it now that it can take control.
+                         if (Display.isSuspendedState(state) && state != Display.STATE_OFF
+-- 
+2.25.1
+
--- a/patches_treble_td/platform_frameworks_base/0033-Fixup-of-c50777-original-commit-only-cares-about-R-v.patch
+++ b/patches_treble_td/platform_frameworks_base/0033-Fixup-of-c50777-original-commit-only-cares-about-R-v.patch
@ -0,0 +1,26 @@
+From df69b89ddbbd4b66ef07e6e3abbef9a0dedcd4c9 Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Thu, 15 Dec 2022 15:54:50 -0500
+Subject: [PATCH 33/35] Fixup of c50777 -- original commit only cares about R
+ vendors, but not about older ones. Apply that on older ones as well
+
+---
+ .../core/java/com/android/server/biometrics/AuthService.java    | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/services/core/java/com/android/server/biometrics/AuthService.java b/services/core/java/com/android/server/biometrics/AuthService.java
+index c39f80822b8c..7e6f35acc398 100644
+--- a/services/core/java/com/android/server/biometrics/AuthService.java
+++ b/services/core/java/com/android/server/biometrics/AuthService.java
+@@ -633,7 +633,7 @@ public class AuthService extends SystemService {
+             final int firstApiLevel = SystemProperties.getInt(SYSPROP_FIRST_API_LEVEL, 0);
+             final int apiLevel = SystemProperties.getInt(SYSPROP_API_LEVEL, firstApiLevel);
+             String[] configStrings = mInjector.getConfiguration(getContext());
+-            if (configStrings.length == 0 && apiLevel == Build.VERSION_CODES.R) {
+            if (configStrings.length == 0 && apiLevel <= Build.VERSION_CODES.R) {
+                 // For backwards compatibility with R where biometrics could work without being
+                 // configured in config_biometric_sensors. In the absence of a vendor provided
+                 // configuration, we assume the weakest biometric strength (i.e. convenience).
+-- 
+2.25.1
+
--- a/patches_treble_td/platform_frameworks_base/0034-FOD-support-for-Asus-ZF8-and-Samsung-devices.patch
+++ b/patches_treble_td/platform_frameworks_base/0034-FOD-support-for-Asus-ZF8-and-Samsung-devices.patch
@ -0,0 +1,565 @@
+From 96856d788adcfdf9b49b93b05509e816890dcfe7 Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Sun, 18 Dec 2022 18:20:40 -0500
+Subject: [PATCH 34/35] FOD support for Asus ZF8 and Samsung devices
+
+Thanks Asus for providing a free device to make this support
+And thanks @davigamer987 for donating enough to get a Samsung FOD device
+to make this
+
+Change-Id: Ib328f39217c3f9b42e13e186496b3f6391643637
+---
+ packages/SystemUI/Android.bp                  |   1 +
+ packages/SystemUI/res/values/config.xml       |   2 +-
+ .../biometrics/UdfpsControllerOverlay.kt      |   7 +-
+ .../android/systemui/biometrics/UdfpsView.kt  | 138 ++++++++++
+ services/core/Android.bp                      |   7 +-
+ .../server/biometrics/AuthService.java        | 238 +++++++++++++++++-
+ 6 files changed, 388 insertions(+), 5 deletions(-)
+
+diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp
+index 13372e8c284a..f6bb05fce8a9 100644
+--- a/packages/SystemUI/Android.bp
+++ b/packages/SystemUI/Android.bp
+@@ -126,6 +126,7 @@ android_library {
+         "lottie",
+         "LowLightDreamLib",
+         "vendor.lineage.powershare-V1.0-java",
+        "vendor.goodix.hardware.biometrics.fingerprint-V2.1-java",
+     ],
+     manifest: "AndroidManifest.xml",
+     additional_manifests: ["LineageManifest.xml"],
+diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
+index da7a597883eb..d7d6fa34cce8 100644
+--- a/packages/SystemUI/res/values/config.xml
+++ b/packages/SystemUI/res/values/config.xml
+@@ -577,7 +577,7 @@
+ 
+     <!-- The radius of the enrollment progress bar, in dp -->
+     <integer name="config_udfpsEnrollProgressBar" translatable="false">
+-        70
+        50
+     </integer>
+ 
+     <!-- The time (in ms) needed to trigger the lock icon view's long-press affordance -->
+diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt
+index 1c62f8a4e508..7b2713bf3419 100644
+--- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt
+@@ -102,7 +102,9 @@ class UdfpsControllerOverlay(
+         gravity = android.view.Gravity.TOP or android.view.Gravity.LEFT
+         layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS
+         flags = (Utils.FINGERPRINT_OVERLAY_LAYOUT_PARAM_FLAGS or
+-          WindowManager.LayoutParams.FLAG_SPLIT_TOUCH)
+          WindowManager.LayoutParams.FLAG_SPLIT_TOUCH) or
+          WindowManager.LayoutParams.FLAG_DIM_BEHIND
+        dimAmount = 0.0f
+         privateFlags = WindowManager.LayoutParams.PRIVATE_FLAG_TRUSTED_OVERLAY
+         // Avoid announcing window title.
+         accessibilityTitle = " "
+@@ -153,6 +155,9 @@ class UdfpsControllerOverlay(
+ 
+                     windowManager.addView(this, coreLayoutParams.updateDimensions(animation))
+                     touchExplorationEnabled = accessibilityManager.isTouchExplorationEnabled
+                    dimUpdate = {
+                        windowManager.updateViewLayout(this, coreLayoutParams.updateDimensions(animation).apply { dimAmount = it })
+                    }
+                     overlayTouchListener = TouchExplorationStateChangeListener {
+                         if (accessibilityManager.isTouchExplorationEnabled) {
+                             setOnHoverListener { v, event -> onTouch(v, event, true) }
+diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
+index a15456d46897..d591cc809129 100644
+--- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
+@@ -19,17 +19,26 @@ import android.content.Context
+ import android.graphics.Canvas
+ import android.graphics.Color
+ import android.graphics.Paint
+import android.graphics.PixelFormat
+ import android.graphics.PointF
+ import android.graphics.RectF
+import android.os.FileObserver
+ import android.util.AttributeSet
+ import android.util.Log
+ import android.view.MotionEvent
+import android.view.SurfaceHolder
+import android.view.SurfaceView
+import android.view.ViewGroup
+ import android.widget.FrameLayout
+ import com.android.systemui.R
+ import com.android.systemui.doze.DozeReceiver
+import java.io.File
+
+import vendor.goodix.hardware.biometrics.fingerprint.V2_1.IGoodixFingerprintDaemon
+ 
+ private const val TAG = "UdfpsView"
+ 
+
+ /**
+  * The main view group containing all UDFPS animations.
+  */
+@@ -37,6 +46,54 @@ class UdfpsView(
+     context: Context,
+     attrs: AttributeSet?
+ ) : FrameLayout(context, attrs), DozeReceiver {
+    private var currentOnIlluminatedRunnable: Runnable? = null
+    private val mySurfaceView = SurfaceView(context)
+    init {
+        mySurfaceView.setVisibility(INVISIBLE)
+        mySurfaceView.setZOrderOnTop(true)
+        addView(mySurfaceView, FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT))
+        mySurfaceView.holder.addCallback(object: SurfaceHolder.Callback{
+            override fun surfaceCreated(p0: SurfaceHolder) {
+                Log.d("PHH", "Surface created!")
+                val paint = Paint(0 /* flags */);
+                paint.setAntiAlias(true);
+                paint.setStyle(Paint.Style.FILL);
+                val colorStr = android.os.SystemProperties.get("persist.sys.phh.fod_color", "00ff00");
+                try {
+                    val parsedColor = Color.parseColor("#" + colorStr);
+                    val r = (parsedColor shr 16) and 0xff;
+                    val g = (parsedColor shr  8) and 0xff;
+                    val b = (parsedColor shr  0) and 0xff;
+                    paint.setARGB(255, r, g, b);
+                } catch(t: Throwable) {
+                    Log.d("PHH", "Failed parsing color #" + colorStr, t);
+                }
+                var canvas: Canvas? = null
+                try {
+                    canvas = p0.lockCanvas();
+Log.d("PHH", "Surface dimensions ${canvas.getWidth()*1.0f} ${canvas.getHeight()*1.0f}")
+                    canvas.drawOval(RectF(0.0f, 0.0f, canvas.getWidth()*1.0f, canvas.getHeight()*1.0f), paint);
+                } finally {
+                    // Make sure the surface is never left in a bad state.
+                    if (canvas != null) {
+                        p0.unlockCanvasAndPost(canvas);
+                    }
+                }
+
+                currentOnIlluminatedRunnable?.run()
+            }
+
+            override fun surfaceChanged(p0: SurfaceHolder, p1: Int, p2: Int, p3: Int) {
+Log.d("PHH", "Got surface size $p1 $p2 $p3")
+            }
+
+            override fun surfaceDestroyed(p0: SurfaceHolder) {
+Log.d("PHH", "Surface destroyed!")
+            }
+        })
+        mySurfaceView.holder.setFormat(PixelFormat.RGBA_8888)
+
+    }
+ 
+     // sensorRect may be bigger than the sensor. True sensor dimensions are defined in
+     // overlayParams.sensorBounds
+@@ -62,6 +119,8 @@ class UdfpsView(
+     /** Parameters that affect the position and size of the overlay. */
+     var overlayParams = UdfpsOverlayParams()
+ 
+    var dimUpdate: (Float) -> Unit = {}
+
+     /** Debug message. */
+     var debugMessage: String? = null
+         set(value) {
+@@ -140,15 +199,94 @@ class UdfpsView(
+             !(animationViewController?.shouldPauseAuth() ?: false)
+     }
+ 
+    fun goodixCmd(id: Int) {
+        val goodixSvc = IGoodixFingerprintDaemon.getService()
+        if(goodixSvc != null) {
+            goodixSvc.sendCommand(id, ArrayList(), { returnCode, resultData -> {
+                Log.e("PHH-Enroll", "Goodix send command returned code "+ returnCode);
+            }});
+        }
+    }
+
+    val asusGhbmOnAchieved = "/sys/class/drm/ghbm_on_achieved"
+    var hasAsusGhbm = File(asusGhbmOnAchieved).exists()
+    var samsungActualMaskBrightness = "/sys/class/lcd/panel/actual_mask_brightness"
+    val hasSamsungMask = File(samsungActualMaskBrightness).exists()
+    var fodFileObserver: FileObserver? = null
+
+     fun configureDisplay(onDisplayConfigured: Runnable) {
+         isDisplayConfigured = true
+         animationViewController?.onDisplayConfiguring()
+         mUdfpsDisplayMode?.enable(onDisplayConfigured)
+
+        mySurfaceView.setVisibility(VISIBLE)
+        Log.d("PHH", "setting surface visible!")
+
+        val brightness = File("/sys/class/backlight/panel0-backlight/brightness").readText().toDouble()
+        val maxBrightness = File("/sys/class/backlight/panel0-backlight/max_brightness").readText().toDouble()
+
+        // Assume HBM is max brightness
+        val dim = 1.0 - Math.pow( (brightness / maxBrightness), 1/2.3);
+        Log.d("PHH-Enroll", "Brightness is $brightness / $maxBrightness, setting dim to $dim")
+        if (hasAsusGhbm) {
+            dimUpdate(dim.toFloat())
+        }
+        if (hasSamsungMask) {
+            dimUpdate(dim.toFloat())
+        }
+
+        if(android.os.SystemProperties.get("ro.vendor.build.fingerprint").contains("ASUS")) {
+            goodixCmd(200001)
+        }
+     }
+ 
+     fun unconfigureDisplay() {
+         isDisplayConfigured = false
+         animationViewController?.onDisplayUnconfigured()
+         mUdfpsDisplayMode?.disable(null /* onDisabled */)
+
+        if (hasAsusGhbm) {
+            fodFileObserver = object: FileObserver(asusGhbmOnAchieved, FileObserver.MODIFY) {
+                override fun onEvent(event: Int, path: String): Unit {
+                    Log.d("PHH-Enroll", "Asus ghbm event")
+                    try {
+                        val spotOn = File(asusGhbmOnAchieved).readText().toInt()
+                        if(spotOn == 0) {
+                            dimUpdate(0.0f)
+                            fodFileObserver?.stopWatching()
+                            fodFileObserver = null
+                        }
+                    } catch(e: Exception) {
+                        Log.d("PHH-Enroll", "Failed dimpdate off", e)
+                    }
+                }
+            };
+            fodFileObserver?.startWatching();
+        } else if (hasSamsungMask) {
+            fodFileObserver = object: FileObserver(asusGhbmOnAchieved, FileObserver.MODIFY) {
+                override fun onEvent(event: Int, path: String): Unit {
+                    Log.d("PHH-Enroll", "samsung mask brightness event")
+                    try {
+                        val spotOn = File(samsungActualMaskBrightness).readText().toInt()
+                        if(spotOn == 0) {
+                            dimUpdate(0.0f)
+                            fodFileObserver?.stopWatching()
+                            fodFileObserver = null
+                        }
+                    } catch(e: Exception) {
+                        Log.d("PHH-Enroll", "Failed dimpdate off", e)
+                    }
+                }
+            };
+            fodFileObserver?.startWatching();
+        } else {
+            dimUpdate(0.0f)
+        }
+
+        mySurfaceView.setVisibility(INVISIBLE)
+        Log.d("PHH", "setting surface invisible!")
+        if(android.os.SystemProperties.get("ro.vendor.build.fingerprint").contains("ASUS")) {
+            goodixCmd(200003)
+        }
+     }
+ }
+diff --git a/services/core/Android.bp b/services/core/Android.bp
+index 39161ba0df68..e9332f19fb3f 100644
+--- a/services/core/Android.bp
+++ b/services/core/Android.bp
+@@ -175,7 +175,12 @@ java_library_static {
+         "overlayable_policy_aidl-java",
+         "SurfaceFlingerProperties",
+         "com.android.sysprop.watchdog",
+-        "vendor.samsung.hardware.sysinput-V1.2-java", // HIDL
+        // HIDL
+        "vendor.samsung.hardware.sysinput-V1.2-java",
+        "vendor.goodix.hardware.biometrics.fingerprint-V2.1-java",
+        "vendor.samsung.hardware.biometrics.fingerprint-V3.0-java",
+        "vendor.oplus.hardware.biometrics.fingerprint-V2.1-java",
+        "vendor.oppo.hardware.biometrics.fingerprint-V2.1-java",
+     ],
+     javac_shard_size: 50,
+ }
+diff --git a/services/core/java/com/android/server/biometrics/AuthService.java b/services/core/java/com/android/server/biometrics/AuthService.java
+index 7e6f35acc398..063e3599d6cd 100644
+--- a/services/core/java/com/android/server/biometrics/AuthService.java
+++ b/services/core/java/com/android/server/biometrics/AuthService.java
+@@ -77,6 +77,22 @@ import java.util.ArrayList;
+ import java.util.Arrays;
+ import java.util.List;
+ 
+import android.hardware.display.DisplayManager;
+
+import android.graphics.Point;
+import android.util.DisplayMetrics;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.PrintWriter;
+
+import android.os.FileObserver;
+import android.os.Build;
+
+import vendor.samsung.hardware.biometrics.fingerprint.V3_0.ISehBiometricsFingerprint;
+import vendor.goodix.hardware.biometrics.fingerprint.V2_1.IGoodixFingerprintDaemon;
+import vendor.samsung.hardware.sysinput.V1_0.ISehSysInputDev;
+
+ /**
+  * System service that provides an interface for authenticating with biometrics and
+  * PIN/pattern/password to BiometricPrompt and lock screen.
+@@ -95,6 +111,9 @@ public class AuthService extends SystemService {
+     @VisibleForTesting
+     final IAuthService.Stub mImpl;
+ 
+    private FileObserver fodFileObserver = null;
+    private ISehBiometricsFingerprint mSamsungFingerprint = null;
+
+     /**
+      * Class for injecting dependencies into AuthService.
+      * TODO(b/141025588): Replace with a dependency injection framework (e.g. Guice, Dagger).
+@@ -652,6 +671,72 @@ public class AuthService extends SystemService {
+         registerAuthenticators(hidlConfigs);
+ 
+         mInjector.publishBinderService(this, mImpl);
+        try {
+            mSamsungFingerprint = ISehBiometricsFingerprint.getService();
+            android.util.Log.e("PHH", "Got samsung fingerprint HAL");
+        } catch(Exception e) {
+            android.util.Log.e("PHH", "Failed getting Samsung fingerprint HAL", e);
+        }
+        if(samsungHasCmd("fod_enable") && mSamsungFingerprint != null) {
+            samsungCmd("fod_enable,1,1,0");
+            String actualMaskBrightnessPath = "/sys/class/lcd/panel/actual_mask_brightness";
+            android.util.Log.e("PHH-Enroll", "Reading actual brightness file gives " + readFile(actualMaskBrightnessPath));
+            fodFileObserver = new FileObserver(actualMaskBrightnessPath, FileObserver.MODIFY) {
+                @Override
+                public void onEvent(int event, String path) {
+                    String actualMask = readFile(actualMaskBrightnessPath);
+                    try {
+                        mSamsungFingerprint = ISehBiometricsFingerprint.getService();
+                    } catch(Exception e) {}
+                    Slog.d("PHH-Enroll", "New actual mask brightness is " + actualMask);
+                    try {
+                        int eventReq = 0;
+                        if("0".equals(actualMask)) {
+                            eventReq = 1; //released
+                        } else {
+                            eventReq = 2; //pressed
+                        }
+                        if(mSamsungFingerprint != null) {
+                            mSamsungFingerprint.sehRequest(22 /* SEM_FINGER_STATE */, eventReq, new java.util.ArrayList<Byte>(),
+                                    (int retval, java.util.ArrayList<Byte> out) -> {} );
+                        }
+                    } catch(Exception e) {
+                        Slog.d("PHH-Enroll", "Failed setting samsung event for mask observer", e);
+                    }
+                }
+            };
+            fodFileObserver.startWatching();
+        }
+
+        String asusGhbmOnAchieved = "/sys/class/drm/ghbm_on_achieved";
+        if( (new File(asusGhbmOnAchieved)).exists()) {
+            fodFileObserver = new FileObserver(asusGhbmOnAchieved, FileObserver.MODIFY) {
+                boolean wasOn = false;
+                @Override
+                public void onEvent(int event, String path) {
+                    String spotOn = readFile(asusGhbmOnAchieved);
+                    if("1".equals(spotOn)) {
+                        if(!wasOn) {
+                            try {
+                                IGoodixFingerprintDaemon goodixDaemon = IGoodixFingerprintDaemon.getService();
+
+                                //Send UI ready
+                                goodixDaemon.sendCommand(200002, new java.util.ArrayList<Byte>(), (returnCode, resultData) -> {
+                                    Slog.e(TAG, "Goodix send command touch pressed returned code "+ returnCode);
+                                });
+                            } catch(Throwable t) {
+                                Slog.d("PHH-Enroll", "Failed sending goodix command", t);
+                            }
+                        }
+                        wasOn = true;
+                    } else {
+                        wasOn = false;
+                    }
+                }
+            };
+            fodFileObserver.startWatching();
+        }
+
+     }
+ 
+     /**
+@@ -775,18 +860,104 @@ public class AuthService extends SystemService {
+                 ? modality : (modality & ~BiometricAuthenticator.TYPE_CREDENTIAL);
+     }
+ 
+    private int[] dynamicUdfpsProps() {
+        DisplayManager mDM = (DisplayManager) getContext().getSystemService(Context.DISPLAY_SERVICE);
+        Point displayRealSize = new Point();
+        DisplayMetrics displayMetrics = new DisplayMetrics();
+        mDM.getDisplay(0).getRealSize(displayRealSize);
+        mDM.getDisplay(0).getMetrics(displayMetrics);
+
+        if(readFile("/sys/class/fingerprint/fingerprint/position") != null) {
+            try {
+            ISehSysInputDev s = ISehSysInputDev.getService();
+            s.getTspFodInformation(0, (a, b) -> {
+                Slog.d("PHH-Enroll", "TspFod info " + a + ", " + b);
+            });
+            s.getTspFodPosition(0, (a, b) -> {
+                Slog.d("PHH-Enroll", "TspFod info " + a + ", " + b);
+            });
+            }catch(Throwable t) {
+                Slog.d("PHH-Enroll", "heya ", t);
+            }
+
+
+            android.util.Log.d("PHH", "Samsung fingerprint");
+            String[] fodPositionArray = readFile("/sys/class/fingerprint/fingerprint/position").split(",");
+            float bottomMM = Float.parseFloat(fodPositionArray[0]);
+            float areaSizeMM = Float.parseFloat(fodPositionArray[5]);
+            float heightMM = Float.parseFloat(fodPositionArray[2]);
+            float bottomInch = bottomMM * 0.0393700787f;
+            float areaSizeInch = areaSizeMM * 0.0393700787f;
+            float heightInch = heightMM * 0.0393700787f;
+            int bottomPx = (int)(bottomInch * displayMetrics.ydpi);
+            int areaSizePx = (int)(areaSizeInch * displayMetrics.ydpi);
+            int midDistPx = (int)(areaSizeInch * displayMetrics.ydpi / 2.0f);
+
+            float mW = areaSizePx/2;
+            float mH = areaSizePx/2;
+            float mX = displayRealSize.x/2;
+            //float mY = displayRealSize.y - bottomPx - midDistPx;
+            float mY = displayRealSize.y - (bottomInch * displayMetrics.ydpi) - (areaSizeInch * displayMetrics.ydpi / 2.0f);
+
+            samsungCmd(String.format("fod_rect,%d,%d,%d,%d", (int)(mX - mW/2), (int)(mY - mW/2), (int)(mX + mW/2), (int)(mY + mW/2)));
+            Slog.d("PHH-Enroll", "Display real size is " + displayRealSize.y + ", dpy " + displayMetrics.ydpi);
+
+            int udfpsProps[] = new int[3];
+            udfpsProps[0] = (int)mX;
+            udfpsProps[1] = (int)mY;
+            udfpsProps[2] = (int)mW;
+
+            try {
+                mSamsungFingerprint = ISehBiometricsFingerprint.getService();
+                Slog.d("PHH-Enroll", "Samsung ask for sensor status");
+                mSamsungFingerprint.sehRequest(6, 0, new java.util.ArrayList(), (int retval, java.util.ArrayList<Byte> out) -> {
+                    Slog.d("PHH-Enroll", "Result is " + retval);
+                    for(int i=0; i<out.size(); i++) {
+                        Slog.d("PHH-Enroll", "\t" + i + ":" + out.get(i));
+                    }
+                } );
+                Slog.d("PHH-Enroll", "Samsung ask for sensor brightness value");
+                mSamsungFingerprint.sehRequest(32, 0, new java.util.ArrayList(), (int retval, java.util.ArrayList<Byte> out) -> {
+                    Slog.d("PHH-Enroll", "Result is " + retval);
+                    for(int i=0; i<out.size(); i++) {
+                        Slog.d("PHH-Enroll", "\t" + i + ":" + out.get(i));
+                    }
+                } );
+
+            } catch(Exception e) {
+                Slog.d("PHH-Enroll", "Failed setting samsung3.0 fingerprint recognition", e);
+            }
+            return udfpsProps;
+        }
+
+        if(android.os.SystemProperties.get("ro.vendor.build.fingerprint").contains("ASUS_I006D")) {
+            int udfpsProps[] = new int[3];
+            udfpsProps[0] = displayRealSize.x/2;
+            udfpsProps[1] = 1741;
+            udfpsProps[2] = 110;
+            return udfpsProps;
+        }
+
+        return new int[0];
+    }
+ 
+     private FingerprintSensorPropertiesInternal getHidlFingerprintSensorProps(int sensorId,
+             @BiometricManager.Authenticators.Types int strength) {
+         // The existence of config_udfps_sensor_props indicates that the sensor is UDFPS.
+-        final int[] udfpsProps = getContext().getResources().getIntArray(
+        int[] udfpsProps = getContext().getResources().getIntArray(
+                 com.android.internal.R.array.config_udfps_sensor_props);
+ 
+         // Non-empty workaroundLocations indicates that the sensor is SFPS.
+         final List<SensorLocationInternal> workaroundLocations =
+                 getWorkaroundSensorProps(getContext());
+ 
+-        final boolean isUdfps = !ArrayUtils.isEmpty(udfpsProps);
+        boolean isUdfps = !ArrayUtils.isEmpty(udfpsProps);
+        if(!isUdfps) udfpsProps = dynamicUdfpsProps();
+        isUdfps = !ArrayUtils.isEmpty(udfpsProps);
+
+        if(udfpsProps.length > 0) {
+            Slog.d("PHH-Enroll", "Got udfps infos " + udfpsProps[0] + ", " + udfpsProps[1] + ", " + udfpsProps[2]);
+        }
+ 
+         // config_is_powerbutton_fps indicates whether device has a power button fingerprint sensor.
+         final boolean isPowerbuttonFps = getContext().getResources().getBoolean(
+@@ -854,4 +1025,67 @@ public class AuthService extends SystemService {
+                 componentInfo, resetLockoutRequiresHardwareAuthToken,
+                 resetLockoutRequiresChallenge);
+     }
+
+    private static boolean samsungHasCmd(String cmd) {
+        try {
+            File f = new File("/sys/devices/virtual/sec/tsp/cmd_list");
+            if(!f.exists()) return false;
+
+            android.util.Log.d("PHH", "Managed to grab cmd list, checking...");
+            BufferedReader b = new BufferedReader(new FileReader(f));
+            String line = null;
+            while( (line = b.readLine()) != null) {
+                if(line.equals(cmd)) return true;
+            }
+            android.util.Log.d("PHH", "... nope");
+            return false;
+        } catch(Exception e) {
+            android.util.Log.d("PHH", "Failed reading cmd_list", e);
+            return false;
+        }
+    }
+
+    public static void samsungCmd(String cmd) {
+        try {
+            writeFile("/sys/devices/virtual/sec/tsp/cmd", cmd);
+
+            String status = readFile("/sys/devices/virtual/sec/tsp/cmd_status");
+            String ret = readFile("/sys/devices/virtual/sec/tsp/cmd_result");
+
+            android.util.Log.d("PHH", "Sending command " + cmd + " returned " + ret + ":" + status);
+        } catch(Exception e) {
+            android.util.Log.d("PHH", "Failed sending command " + cmd, e);
+        }
+    }
+
+    private static void writeFile(String path, String value) {
+        try {
+            PrintWriter writer = new PrintWriter(path, "UTF-8");
+            writer.println(value);
+            writer.close();
+        } catch(Exception e) {
+            android.util.Log.d("PHH", "Failed writing to " + path + ": " + value);
+        }
+    }
+
+    private static void writeFile(File file, String value) {
+        try {
+            PrintWriter writer = new PrintWriter(file, "UTF-8");
+            writer.println(value);
+            writer.close();
+        } catch(Exception e) {
+            android.util.Log.d("PHH", "Failed writing to " + file + ": " + value);
+        }
+    }
+
+    private static String readFile(String path) {
+        try {
+            File f = new File(path);
+
+            BufferedReader b = new BufferedReader(new FileReader(f));
+            return b.readLine();
+        } catch(Exception e) {
+            return null;
+        }
+    }
+ }
+-- 
+2.25.1
+
--- a/patches_treble_td/platform_frameworks_base/0035-Always-add-HIDL-fingerprint-config-Galaxy-A53-is-mis.patch
+++ b/patches_treble_td/platform_frameworks_base/0035-Always-add-HIDL-fingerprint-config-Galaxy-A53-is-mis.patch
@ -0,0 +1,47 @@
+From 43a802cfe0f99bb7735ae2280e3bc522a68c3442 Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Tue, 3 Jan 2023 17:59:00 -0500
+Subject: [PATCH 35/35] Always add HIDL fingerprint config (Galaxy A53 is
+ missing it on A12 vendor) -- but first enumerate AIDL
+
+---
+ .../core/java/com/android/server/biometrics/AuthService.java  | 4 ++--
+ .../biometrics/sensors/fingerprint/FingerprintService.java    | 3 ++-
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/services/core/java/com/android/server/biometrics/AuthService.java b/services/core/java/com/android/server/biometrics/AuthService.java
+index 063e3599d6cd..7d6f9a12057f 100644
+--- a/services/core/java/com/android/server/biometrics/AuthService.java
+++ b/services/core/java/com/android/server/biometrics/AuthService.java
+@@ -652,11 +652,11 @@ public class AuthService extends SystemService {
+             final int firstApiLevel = SystemProperties.getInt(SYSPROP_FIRST_API_LEVEL, 0);
+             final int apiLevel = SystemProperties.getInt(SYSPROP_API_LEVEL, firstApiLevel);
+             String[] configStrings = mInjector.getConfiguration(getContext());
+-            if (configStrings.length == 0 && apiLevel <= Build.VERSION_CODES.R) {
+            if (configStrings.length == 0) {
+                 // For backwards compatibility with R where biometrics could work without being
+                 // configured in config_biometric_sensors. In the absence of a vendor provided
+                 // configuration, we assume the weakest biometric strength (i.e. convenience).
+-                Slog.w(TAG, "Found R vendor partition without config_biometric_sensors");
+                Slog.w(TAG, "Found vendor partition without config_biometric_sensors");
+                 configStrings = generateRSdkCompatibleConfiguration();
+             }
+             hidlConfigs = new SensorConfig[configStrings.length];
+diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java
+index 94b67cedf86c..9468f5f91c24 100644
+--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java
+@@ -905,8 +905,9 @@ public class FingerprintService extends SystemService {
+             final Handler handler = new Handler(thread.getLooper());
+ 
+             handler.post(() -> {
+-                addHidlProviders(hidlSensors);
+                 addAidlProviders();
+                if(mServiceProviders.isEmpty())
+                    addHidlProviders(hidlSensors);
+ 
+                 final IBiometricService biometricService = IBiometricService.Stub.asInterface(
+                         ServiceManager.getService(Context.BIOMETRIC_SERVICE));
+-- 
+2.25.1
+
--- a/patches_treble_td/platform_frameworks_native/0001-On-Samsung-we-need-to-send-a-hack-message-to-HAL-to-.patch
+++ b/patches_treble_td/platform_frameworks_native/0001-On-Samsung-we-need-to-send-a-hack-message-to-HAL-to-.patch
@ -1,7 +1,7 @@
-From 1cd9026a5662a35e1b6181baf7b02cfa9f8a0570 Mon Sep 17 00:00:00 2001
+From b0bf70b947ea0a7090490f08804932efa0632ce7 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 14 Aug 2019 23:37:10 +0200
-Subject: [PATCH 1/8] On Samsung, we need to send a hack-message to HAL to get
+Subject: [PATCH 1/9] On Samsung, we need to send a hack-message to HAL to get
 all Sensors

 Change-Id: Id6a1fa48340de61c418493668e9abd22c2599376
--- a/patches_treble_td/platform_frameworks_native/0002-Matching-an-input-with-a-display-uses-uniqueId.patch
+++ b/patches_treble_td/platform_frameworks_native/0002-Matching-an-input-with-a-display-uses-uniqueId.patch
@ -1,7 +1,7 @@
-From 448c8549bc90e6738b68c50d2318a8cca7dd1db0 Mon Sep 17 00:00:00 2001
+From 9ef33b3c1b2fbd9049e232de2e2b9b66d83bdef9 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 22 Oct 2020 23:22:46 +0200
-Subject: [PATCH 2/8] Matching an input with a display uses uniqueId
+Subject: [PATCH 2/9] Matching an input with a display uses uniqueId

 Not all devices have a `location`, notably bluetooth devices.
 However, we might still want to associate them with a screen,
@ -15,10 +15,10 @@ Change-Id: Ifcbc8329d54386f58e013270d9888316c0f516b6
 1 file changed, 4 insertions(+), 1 deletion(-)

 diff --git a/services/inputflinger/reader/InputDevice.cpp b/services/inputflinger/reader/InputDevice.cpp
-index ba5083bec3..72f824110b 100644
+index 989700f6cf..e45222103b 100644
 --- a/services/inputflinger/reader/InputDevice.cpp
 +++ b/services/inputflinger/reader/InputDevice.cpp
-@@ -304,7 +304,10 @@ void InputDevice::configure(nsecs_t when, const InputReaderConfiguration* config
+@@ -309,7 +309,10 @@ void InputDevice::configure(nsecs_t when, const InputReaderConfiguration* config
             mAssociatedDisplayUniqueId = std::nullopt;
             mAssociatedViewport = std::nullopt;
             // Find the display port that corresponds to the current input port.
--- a/patches_treble_td/platform_frameworks_native/0003-unshared_oob-didn-t-exist-in-O-P-so-detect-its-suppo.patch
+++ b/patches_treble_td/platform_frameworks_native/0003-unshared_oob-didn-t-exist-in-O-P-so-detect-its-suppo.patch
@ -1,7 +1,7 @@
-From 6d0350654547eca97cc4b05ed8b4f03f9b5fc215 Mon Sep 17 00:00:00 2001
+From b294852aff716e1ba0b23fdd1fc9cc3fd904bd44 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 5 Jan 2021 23:44:00 +0100
-Subject: [PATCH 3/8] unshared_oob didn't exist in O/P, so detect its supported
+Subject: [PATCH 3/9] unshared_oob didn't exist in O/P, so detect its supported
 based on vndk version

 ---
--- a/patches_treble_td/platform_frameworks_native/0004-Remove-Samsung-system-permission-on-sensors.patch
+++ b/patches_treble_td/platform_frameworks_native/0004-Remove-Samsung-system-permission-on-sensors.patch
@ -1,7 +1,7 @@
-From 6fca75b0d3125be0d0a1edc9d7aedf755b681e63 Mon Sep 17 00:00:00 2001
+From 28938c96830fccd9859008daccffaa055e5ad6c9 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 31 Mar 2021 23:36:03 +0200
-Subject: [PATCH 4/8] Remove Samsung system permission on sensors
+Subject: [PATCH 4/9] Remove Samsung system permission on sensors

 ---
 libs/sensor/Sensor.cpp              | 1 +
--- a/Show More
+++ b/Show More