From 291d57d10adb8c55e3845fdc63cdebe63a33259c Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Tue, 10 Jan 2023 14:41:29 +0000
Subject: [PATCH] Changes for January 2023

---
 .../0001-Add-MiuiNavbarOverlay.patch          |   4 +-
 .../0002-Disable-Bluetooth-by-default.patch   |   4 +-
 ...rag-by-default-for-editable-TextView.patch |   4 +-
 ...0004-Disable-RESTRICTED-bucket-toast.patch |   4 +-
 .../0005-Keyguard-Adjust-clock-style.patch    |   4 +-
 ...-Hide-padlock-unless-UDFPS-is-in-use.patch |   4 +-
 ...Keyguard-Never-switch-to-large-clock.patch |   4 +-
 ...0008-Keyguard-Refine-indication-text.patch |   4 +-
 ...emUI-Align-QS-header-with-status-bar.patch | 128 +++++++++++++++++
 ...tatus-bar-quick-settings-margins-an.patch} |   4 +-
 ...er.patch => 0011-Replace-NTP-server.patch} |   4 +-
 ...dd-left-padding-for-keyguard-slices.patch} |   4 +-
 ...date-RAT-icons-to-match-Silk-design.patch} |   4 +-
 ...fault-top-clock-margin-on-h800-devi.patch} |   4 +-
 ...-Always-render-windows-into-cutouts.patch} |   4 +-
 ...unded-corners-in-notification-scrim.patch} |   4 +-
 ...017-UI-Reconfigure-power-menu-items.patch} |   4 +-
 ...UI-Reconfigure-quick-settings-tiles.patch} |   4 +-
 ...irement-for-HINT_SUPPORTS_DARK_TEXT.patch} |   4 +-
 ... 0020-UI-Remove-privacy-dot-padding.patch} |   4 +-
 ...-luminance-for-wallpaper-dark-hints.patch} |   4 +-
 .../0001-DeskClock-Remove-night-mode.patch    |   2 +-
 ...lock-Adapt-digital-clocks-to-S-style.patch |  10 +-
 ...per-based-text-coloring-for-digital-.patch |   2 +-
 ...ide-their-vibrator-HAL-behind-non-de.patch |  30 ++++
 ...tings-Screen-resolution-refresh-rate.patch |   4 +-
 ...ttings-Basic-audio-and-display-fixes.patch |   4 +-
 .../0003-TrebleSettings-IMS.patch             |  43 ++++--
 ...-TrebleSettings-Disable-A2DP-offload.patch |   4 +-
 ...ngs-Alternative-audio-jack-detection.patch |   4 +-
 ...Settings-Override-minimum-brightness.patch | 116 +++++++++++++++
 ...ettings-Override-navbar-availability.patch | 128 +++++++++++++++++
 ...08-TrebleSettings-Securize-on-demand.patch | 133 ++++++++++++++++++
 ...nted-with-exfat-kernel-fs-driver-or-.patch |  60 ++++++++
 ...lineage-Commonly-build-some-packages.patch |  13 +-
 ...r_lineage-Disable-ADB-authentication.patch |   4 +-
 36 files changed, 694 insertions(+), 71 deletions(-)
 create mode 100644 patches_platform_personal/frameworks_base/0009-Revert-SystemUI-Align-QS-header-with-status-bar.patch
 rename patches_platform_personal/frameworks_base/{0009-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch => 0010-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch} (99%)
 rename patches_platform_personal/frameworks_base/{0010-Replace-NTP-server.patch => 0011-Replace-NTP-server.patch} (90%)
 rename patches_platform_personal/frameworks_base/{0011-Revert-SystemUI-Add-left-padding-for-keyguard-slices.patch => 0012-Revert-SystemUI-Add-left-padding-for-keyguard-slices.patch} (93%)
 rename patches_platform_personal/frameworks_base/{0012-Revert-Update-RAT-icons-to-match-Silk-design.patch => 0013-Revert-Update-RAT-icons-to-match-Silk-design.patch} (99%)
 rename patches_platform_personal/frameworks_base/{0013-Revert-Use-the-default-top-clock-margin-on-h800-devi.patch => 0014-Revert-Use-the-default-top-clock-margin-on-h800-devi.patch} (87%)
 rename patches_platform_personal/frameworks_base/{0014-UI-Always-render-windows-into-cutouts.patch => 0015-UI-Always-render-windows-into-cutouts.patch} (96%)
 rename patches_platform_personal/frameworks_base/{0015-UI-Kill-rounded-corners-in-notification-scrim.patch => 0016-UI-Kill-rounded-corners-in-notification-scrim.patch} (88%)
 rename patches_platform_personal/frameworks_base/{0016-UI-Reconfigure-power-menu-items.patch => 0017-UI-Reconfigure-power-menu-items.patch} (88%)
 rename patches_platform_personal/frameworks_base/{0017-UI-Reconfigure-quick-settings-tiles.patch => 0018-UI-Reconfigure-quick-settings-tiles.patch} (87%)
 rename patches_platform_personal/frameworks_base/{0018-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch => 0019-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch} (88%)
 rename patches_platform_personal/frameworks_base/{0019-UI-Remove-privacy-dot-padding.patch => 0020-UI-Remove-privacy-dot-padding.patch} (89%)
 rename patches_platform_personal/frameworks_base/{0020-UI-Revert-to-HSL-luminance-for-wallpaper-dark-hints.patch => 0021-UI-Revert-to-HSL-luminance-for-wallpaper-dark-hints.patch} (93%)
 create mode 100644 patches_treble/frameworks_native/0001-MIUI13-devices-hide-their-vibrator-HAL-behind-non-de.patch
 create mode 100644 patches_treble/packages_apps_Settings/0006-TrebleSettings-Override-minimum-brightness.patch
 create mode 100644 patches_treble/packages_apps_Settings/0007-TrebleSettings-Override-navbar-availability.patch
 create mode 100644 patches_treble/packages_apps_Settings/0008-TrebleSettings-Securize-on-demand.patch
 create mode 100644 patches_treble/system_vold/0001-Exfat-can-be-mounted-with-exfat-kernel-fs-driver-or-.patch

diff --git a/patches_platform_personal/frameworks_base/0001-Add-MiuiNavbarOverlay.patch b/patches_platform_personal/frameworks_base/0001-Add-MiuiNavbarOverlay.patch
index d5c5b31..d608109 100644
--- a/patches_platform_personal/frameworks_base/0001-Add-MiuiNavbarOverlay.patch
+++ b/patches_platform_personal/frameworks_base/0001-Add-MiuiNavbarOverlay.patch
@@ -1,7 +1,7 @@
-From 3098f128184cbbc1e46f4a9990c95276593f9d4c Mon Sep 17 00:00:00 2001
+From d6798034133d378b48f226e876e679b0131c1dbd 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/20] Add MiuiNavbarOverlay
+Subject: [PATCH 01/21] Add MiuiNavbarOverlay
 
 Change-Id: I0e6791abc3c9521d7dc612df2fec2b041affe7e9
 ---
diff --git a/patches_platform_personal/frameworks_base/0002-Disable-Bluetooth-by-default.patch b/patches_platform_personal/frameworks_base/0002-Disable-Bluetooth-by-default.patch
index 0c5cc69..f576419 100644
--- 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,7 +1,7 @@
-From c725d2e1707392ad83ddc841f32209d2fd983777 Mon Sep 17 00:00:00 2001
+From 3d733c87e62d1b84124e5a2c1172bb94df3501d2 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/20] Disable Bluetooth by default
+Subject: [PATCH 02/21] Disable Bluetooth by default
 
 Change-Id: Iea5d24f977928bf01cd7a46b98c75c0a4bd6a23c
 ---
diff --git 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
index 498c45e..09c07f5 100644
--- 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,7 +1,7 @@
-From e5c28fd145b3e78f2b6e54ea0e00aadbed4842be Mon Sep 17 00:00:00 2001
+From 1a6a0ac98a327cfee7e3d703792ef456197ae212 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/20] Disable cursor drag by default for editable TextViews
+Subject: [PATCH 03/21] Disable cursor drag by default for editable TextViews
 
 Requested by @TadiT7
 
diff --git a/patches_platform_personal/frameworks_base/0004-Disable-RESTRICTED-bucket-toast.patch b/patches_platform_personal/frameworks_base/0004-Disable-RESTRICTED-bucket-toast.patch
index 449c03f..318557e 100644
--- 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 353e9dabe0c53561aad7d65dffffce5006f91323 Mon Sep 17 00:00:00 2001
+From 57b4bdcc55b85a0c92a348c23e31e6d7d373ba83 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 04/20] Disable "RESTRICTED bucket" toast
+Subject: [PATCH 04/21] Disable "RESTRICTED bucket" toast
 
 Change-Id: I20a328d3c77962f3a6095bfca42d0b165a093ce8
 ---
diff --git a/patches_platform_personal/frameworks_base/0005-Keyguard-Adjust-clock-style.patch b/patches_platform_personal/frameworks_base/0005-Keyguard-Adjust-clock-style.patch
index 1a6bbcf..3a8a408 100644
--- 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,7 +1,7 @@
-From 759236e336d30ddc96f0fa859daf894c0d543fd7 Mon Sep 17 00:00:00 2001
+From 2288c34ff8bf06a7be040815ff4d6496eb36062a Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Thu, 2 Sep 2021 16:15:19 +0000
-Subject: [PATCH 05/20] Keyguard: Adjust clock style
+Subject: [PATCH 05/21] Keyguard: Adjust clock style
 
 Thinner font, less padding and unintrusive colors
 
diff --git 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
index 3011665..cf6e96c 100644
--- 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 309b7ba76b5af3c6632eaf0de4981a9a5291ccd4 Mon Sep 17 00:00:00 2001
+From 9524ee57bd44eba56aa592164544f623a010614a Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 2 Nov 2019 06:41:03 +0000
-Subject: [PATCH 06/20] 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
 
diff --git 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
index 677af11..79c52d0 100644
--- 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 86b94b87951c261e23497d490fb0e356d5c727d3 Mon Sep 17 00:00:00 2001
+From 97ad90dbfeab360820f198a39c48fd6f7d1139b6 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Wed, 1 Sep 2021 14:41:53 +0000
-Subject: [PATCH 07/20] 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
 
diff --git a/patches_platform_personal/frameworks_base/0008-Keyguard-Refine-indication-text.patch b/patches_platform_personal/frameworks_base/0008-Keyguard-Refine-indication-text.patch
index 40b79e9..9127be6 100644
--- 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 0769aefc185bd933f77bdac65a4d615643ff8f69 Mon Sep 17 00:00:00 2001
+From c7579711632d2fc79e9775bb79e3f56126accbc3 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 2 Nov 2019 08:31:36 +0000
-Subject: [PATCH 08/20] Keyguard: Refine indication text
+Subject: [PATCH 08/21] Keyguard: Refine indication text
 
 Change-Id: Ib771c35610f712a1de34736e817bcfe616ac37d8
 ---
diff --git 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
new file mode 100644
index 0000000..44208c7
--- /dev/null
+++ b/patches_platform_personal/frameworks_base/0009-Revert-SystemUI-Align-QS-header-with-status-bar.patch
@@ -0,0 +1,128 @@
+From f6022c3e0b759dbcbe8ef750db0f83f1e244ff33 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 efa864f12481..b0e2f8368703 100644
+--- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
++++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
+@@ -105,7 +105,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;
+@@ -267,20 +266,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;
+         }
+@@ -304,9 +302,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();
+@@ -553,11 +550,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
+
diff --git a/patches_platform_personal/frameworks_base/0009-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
similarity index 99%
rename from patches_platform_personal/frameworks_base/0009-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch
rename to patches_platform_personal/frameworks_base/0010-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch
index 25ff25e..decc436 100644
--- a/patches_platform_personal/frameworks_base/0009-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,7 +1,7 @@
-From 6a83b2e20b387c42c927ad589f0cfcc25230455a Mon Sep 17 00:00:00 2001
+From 808ad70d1c92dfc1ac6b6e665b826504a760b88c Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 20 Mar 2021 10:35:14 +0000
-Subject: [PATCH 09/20] Keyguard/UI: Fix status bar / quick settings margins
+Subject: [PATCH 10/21] Keyguard/UI: Fix status bar / quick settings margins
  and paddings
 
 Last revised on 2022/09/24, targeting T
diff --git a/patches_platform_personal/frameworks_base/0010-Replace-NTP-server.patch b/patches_platform_personal/frameworks_base/0011-Replace-NTP-server.patch
similarity index 90%
rename from patches_platform_personal/frameworks_base/0010-Replace-NTP-server.patch
rename to patches_platform_personal/frameworks_base/0011-Replace-NTP-server.patch
index 3bd5602..721c168 100644
--- a/patches_platform_personal/frameworks_base/0010-Replace-NTP-server.patch
+++ b/patches_platform_personal/frameworks_base/0011-Replace-NTP-server.patch
@@ -1,7 +1,7 @@
-From 7b61ee641132df3e942246a78f78ff0350c6c6d2 Mon Sep 17 00:00:00 2001
+From 2f26229212e75def4f1072c5aaf05bf392007383 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 10/20] Replace NTP server
+Subject: [PATCH 11/21] Replace NTP server
 
 Change-Id: I938ab46026d841e7536d8fc02b0ef6b28ebb6ea1
 ---
diff --git a/patches_platform_personal/frameworks_base/0011-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
similarity index 93%
rename from patches_platform_personal/frameworks_base/0011-Revert-SystemUI-Add-left-padding-for-keyguard-slices.patch
rename to patches_platform_personal/frameworks_base/0012-Revert-SystemUI-Add-left-padding-for-keyguard-slices.patch
index 3b01751..0510731 100644
--- a/patches_platform_personal/frameworks_base/0011-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,7 +1,7 @@
-From e5545937e37d6f8ef3609e589eaf7731d9f80381 Mon Sep 17 00:00:00 2001
+From dd9133c4af60b222e4f09a430ef120accefb1f93 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 11/20] Revert "SystemUI: Add left padding for keyguard slices"
+Subject: [PATCH 12/21] Revert "SystemUI: Add left padding for keyguard slices"
 
 This reverts commit 4a7a4426944e28e70a3eca6a696ff6c7599fb896.
 ---
diff --git a/patches_platform_personal/frameworks_base/0012-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
similarity index 99%
rename from patches_platform_personal/frameworks_base/0012-Revert-Update-RAT-icons-to-match-Silk-design.patch
rename to patches_platform_personal/frameworks_base/0013-Revert-Update-RAT-icons-to-match-Silk-design.patch
index 404a2e2..b0a90a2 100644
--- a/patches_platform_personal/frameworks_base/0012-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,7 +1,7 @@
-From a394bc33ff924be6f18ffdb63f342ccfdbc1fd43 Mon Sep 17 00:00:00 2001
+From 90b961d665973de20d59218fafcefca48f92d5b1 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 12/20] Revert "Update RAT icons to match Silk design"
+Subject: [PATCH 13/21] Revert "Update RAT icons to match Silk design"
 
 This reverts commit 084c13c8216f6a899cd3eda04fc1d7acff3d1248.
 ---
diff --git a/patches_platform_personal/frameworks_base/0013-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
similarity index 87%
rename from patches_platform_personal/frameworks_base/0013-Revert-Use-the-default-top-clock-margin-on-h800-devi.patch
rename to patches_platform_personal/frameworks_base/0014-Revert-Use-the-default-top-clock-margin-on-h800-devi.patch
index b2b8f4a..09bd7fb 100644
--- a/patches_platform_personal/frameworks_base/0013-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,7 +1,7 @@
-From 5fd1cb47b1004252db6929093f2ceb0bfe1b936b Mon Sep 17 00:00:00 2001
+From b96671ae18db307e2f4323132967544ff66d97ce 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 13/20] Revert "Use the default top clock margin on h800
+Subject: [PATCH 14/21] Revert "Use the default top clock margin on h800
  devices"
 
 This reverts commits 50ba380f4d8d1c2523e0f76295ca556038796bfd
diff --git a/patches_platform_personal/frameworks_base/0014-UI-Always-render-windows-into-cutouts.patch b/patches_platform_personal/frameworks_base/0015-UI-Always-render-windows-into-cutouts.patch
similarity index 96%
rename from patches_platform_personal/frameworks_base/0014-UI-Always-render-windows-into-cutouts.patch
rename to patches_platform_personal/frameworks_base/0015-UI-Always-render-windows-into-cutouts.patch
index 69baa6b..71bf589 100644
--- a/patches_platform_personal/frameworks_base/0014-UI-Always-render-windows-into-cutouts.patch
+++ b/patches_platform_personal/frameworks_base/0015-UI-Always-render-windows-into-cutouts.patch
@@ -1,7 +1,7 @@
-From 549733367b1dc1b80e3b0b7c52d3b2e144a6adb2 Mon Sep 17 00:00:00 2001
+From 6b1e1b06f33f3fe3d0f5a5f6aaa8b9d6bdfbbe01 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 14/20] UI: Always render windows into cutouts
+Subject: [PATCH 15/21] UI: Always render windows into cutouts
 
 Eliminates black/white letterboxing
 Quick and dirty way to do the latter - wait for proper fix from Google
diff --git a/patches_platform_personal/frameworks_base/0015-UI-Kill-rounded-corners-in-notification-scrim.patch b/patches_platform_personal/frameworks_base/0016-UI-Kill-rounded-corners-in-notification-scrim.patch
similarity index 88%
rename from patches_platform_personal/frameworks_base/0015-UI-Kill-rounded-corners-in-notification-scrim.patch
rename to patches_platform_personal/frameworks_base/0016-UI-Kill-rounded-corners-in-notification-scrim.patch
index 73027c8..5794a6e 100644
--- a/patches_platform_personal/frameworks_base/0015-UI-Kill-rounded-corners-in-notification-scrim.patch
+++ b/patches_platform_personal/frameworks_base/0016-UI-Kill-rounded-corners-in-notification-scrim.patch
@@ -1,7 +1,7 @@
-From 90ac0ab08a523dd05f8bfa5ba579f42ca9346dc1 Mon Sep 17 00:00:00 2001
+From b4d980d9f9421f8043edf7e4eda459f40486d09e 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 15/20] UI: Kill rounded corners in notification scrim
+Subject: [PATCH 16/21] UI: Kill rounded corners in notification scrim
 
 Rounded corners in S is nicely implemented, but this is one occasion where it looks out of place
 
diff --git a/patches_platform_personal/frameworks_base/0016-UI-Reconfigure-power-menu-items.patch b/patches_platform_personal/frameworks_base/0017-UI-Reconfigure-power-menu-items.patch
similarity index 88%
rename from patches_platform_personal/frameworks_base/0016-UI-Reconfigure-power-menu-items.patch
rename to patches_platform_personal/frameworks_base/0017-UI-Reconfigure-power-menu-items.patch
index 2f0ec73..fd28181 100644
--- a/patches_platform_personal/frameworks_base/0016-UI-Reconfigure-power-menu-items.patch
+++ b/patches_platform_personal/frameworks_base/0017-UI-Reconfigure-power-menu-items.patch
@@ -1,7 +1,7 @@
-From 93b2a1403d25ab0b1fbd240e5333e6fed916bd98 Mon Sep 17 00:00:00 2001
+From 7b78452e09b2f142c9b6ae23dfab058da7bdb03e 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 16/20] UI: Reconfigure power menu items
+Subject: [PATCH 17/21] UI: Reconfigure power menu items
 
 Change-Id: I32cca6e2c6bb64d891efee959127edf7c0802cbc
 ---
diff --git a/patches_platform_personal/frameworks_base/0017-UI-Reconfigure-quick-settings-tiles.patch b/patches_platform_personal/frameworks_base/0018-UI-Reconfigure-quick-settings-tiles.patch
similarity index 87%
rename from patches_platform_personal/frameworks_base/0017-UI-Reconfigure-quick-settings-tiles.patch
rename to patches_platform_personal/frameworks_base/0018-UI-Reconfigure-quick-settings-tiles.patch
index 4a71a06..cc23bb1 100644
--- a/patches_platform_personal/frameworks_base/0017-UI-Reconfigure-quick-settings-tiles.patch
+++ b/patches_platform_personal/frameworks_base/0018-UI-Reconfigure-quick-settings-tiles.patch
@@ -1,7 +1,7 @@
-From 0d3216a6c0fc99193697ac00a84d8e666f0ba0e8 Mon Sep 17 00:00:00 2001
+From a72959c54bab273faf23b111b3c2ea37a05ebf1e 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 17/20] UI: Reconfigure quick settings tiles
+Subject: [PATCH 18/21] UI: Reconfigure quick settings tiles
 
 Change-Id: I743f52ef3a95db0ca2c02ae973faa4629e41885d
 ---
diff --git a/patches_platform_personal/frameworks_base/0018-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
similarity index 88%
rename from patches_platform_personal/frameworks_base/0018-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch
rename to patches_platform_personal/frameworks_base/0019-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch
index babff4b..c4eaf17 100644
--- a/patches_platform_personal/frameworks_base/0018-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,7 +1,7 @@
-From f2255b7c8145f1d530822d2708f3a627f67d0bc7 Mon Sep 17 00:00:00 2001
+From 3e220efe0e330611011aae408c7341afb3ca6637 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 18/20] UI: Relax requirement for HINT_SUPPORTS_DARK_TEXT
+Subject: [PATCH 19/21] UI: Relax requirement for HINT_SUPPORTS_DARK_TEXT
 
 I decide what's good enough for a wallpaper!
 
diff --git a/patches_platform_personal/frameworks_base/0019-UI-Remove-privacy-dot-padding.patch b/patches_platform_personal/frameworks_base/0020-UI-Remove-privacy-dot-padding.patch
similarity index 89%
rename from patches_platform_personal/frameworks_base/0019-UI-Remove-privacy-dot-padding.patch
rename to patches_platform_personal/frameworks_base/0020-UI-Remove-privacy-dot-padding.patch
index 725d68b..0860603 100644
--- a/patches_platform_personal/frameworks_base/0019-UI-Remove-privacy-dot-padding.patch
+++ b/patches_platform_personal/frameworks_base/0020-UI-Remove-privacy-dot-padding.patch
@@ -1,7 +1,7 @@
-From 3753346b30c05ca391eabc86d2185e6167b1d9b5 Mon Sep 17 00:00:00 2001
+From a0b674ba56fd96ec0f732f587fb5b0b975d01a1a 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 19/20] UI: Remove privacy dot padding
+Subject: [PATCH 20/21] UI: Remove privacy dot padding
 
 Change-Id: I5d2e2b3e36f027b4348a83030d4b4d3c4f0209d1
 ---
diff --git a/patches_platform_personal/frameworks_base/0020-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
similarity index 93%
rename from patches_platform_personal/frameworks_base/0020-UI-Revert-to-HSL-luminance-for-wallpaper-dark-hints.patch
rename to patches_platform_personal/frameworks_base/0021-UI-Revert-to-HSL-luminance-for-wallpaper-dark-hints.patch
index b9496c7..d02894f 100644
--- a/patches_platform_personal/frameworks_base/0020-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,7 +1,7 @@
-From 27a7b5513e6cd6825c51dcfea8688ec5af4a21d0 Mon Sep 17 00:00:00 2001
+From c3a93b2e23aed8c3f831c0636655dccd80770d45 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 20/20] UI: Revert to HSL luminance for wallpaper dark hints
+Subject: [PATCH 21/21] UI: Revert to HSL luminance for wallpaper dark hints
 
 Y U no test for consistency, Google?
 
diff --git 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
index d69332c..8ffdda0 100644
--- 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
diff --git 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
index 6f023ad..847f214 100644
--- 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">
diff --git 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
index b7a5314..9d9fcbe 100644
--- 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
diff --git a/patches_treble/frameworks_native/0001-MIUI13-devices-hide-their-vibrator-HAL-behind-non-de.patch b/patches_treble/frameworks_native/0001-MIUI13-devices-hide-their-vibrator-HAL-behind-non-de.patch
new file mode 100644
index 0000000..d50dd1e
--- /dev/null
+++ b/patches_treble/frameworks_native/0001-MIUI13-devices-hide-their-vibrator-HAL-behind-non-de.patch
@@ -0,0 +1,30 @@
+From 159597feca204b961068e2e79259c0b7671647eb Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Fri, 25 Mar 2022 05:37:56 -0400
+Subject: [PATCH] MIUI13 devices hide their vibrator HAL behind non-default
+ name: "vibratorfeature"
+
+---
+ services/vibratorservice/VibratorHalController.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/services/vibratorservice/VibratorHalController.cpp b/services/vibratorservice/VibratorHalController.cpp
+index c1795f5c32..345016efd6 100644
+--- a/services/vibratorservice/VibratorHalController.cpp
++++ b/services/vibratorservice/VibratorHalController.cpp
+@@ -59,6 +59,12 @@ std::shared_ptr<HalWrapper> connectHal(std::shared_ptr<CallbackScheduler> schedu
+         return std::make_shared<AidlHalWrapper>(std::move(scheduler), aidlHal);
+     }
+ 
++    aidlHal = waitForVintfService<Aidl::IVibrator>(String16("vibratorfeature"));
++    if (aidlHal) {
++        ALOGV("Successfully connected to Xiaomi Vibrator HAL AIDL service.");
++        return std::make_shared<AidlHalWrapper>(std::move(scheduler), aidlHal);
++    }
++
+     sp<V1_0::IVibrator> halV1_0 = V1_0::IVibrator::getService();
+     if (halV1_0 == nullptr) {
+         ALOGV("Vibrator HAL service not available.");
+-- 
+2.25.1
+
diff --git a/patches_treble/packages_apps_Settings/0001-TrebleSettings-Screen-resolution-refresh-rate.patch b/patches_treble/packages_apps_Settings/0001-TrebleSettings-Screen-resolution-refresh-rate.patch
index fc83a26..6cd1b3e 100644
--- a/patches_treble/packages_apps_Settings/0001-TrebleSettings-Screen-resolution-refresh-rate.patch
+++ b/patches_treble/packages_apps_Settings/0001-TrebleSettings-Screen-resolution-refresh-rate.patch
@@ -1,7 +1,7 @@
-From 3da78002775540f9ede8460de48a492d2e72cf21 Mon Sep 17 00:00:00 2001
+From 16a004393cddb96e473b86dd891c2e1561813c5d Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Thu, 22 Sep 2022 12:37:50 +0000
-Subject: [PATCH 1/5] TrebleSettings: Screen resolution & refresh rate
+Subject: [PATCH 1/8] TrebleSettings: Screen resolution & refresh rate
 
 Change-Id: I4a4679cdb6d4ede55479e9ab2f014342025b0fec
 ---
diff --git a/patches_treble/packages_apps_Settings/0002-TrebleSettings-Basic-audio-and-display-fixes.patch b/patches_treble/packages_apps_Settings/0002-TrebleSettings-Basic-audio-and-display-fixes.patch
index d721302..b3e3b2d 100644
--- a/patches_treble/packages_apps_Settings/0002-TrebleSettings-Basic-audio-and-display-fixes.patch
+++ b/patches_treble/packages_apps_Settings/0002-TrebleSettings-Basic-audio-and-display-fixes.patch
@@ -1,7 +1,7 @@
-From 9fc56ce7a1aaeac5571d0e2001f0d6ed79230882 Mon Sep 17 00:00:00 2001
+From 78583743e42884cf7f94477f08718b6dce63a36a Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 24 Sep 2022 03:38:41 +0000
-Subject: [PATCH 2/5] TrebleSettings: Basic audio and display fixes
+Subject: [PATCH 2/8] TrebleSettings: Basic audio and display fixes
 
 - Alternative audio policy
 - Disable soundvolume effect
diff --git a/patches_treble/packages_apps_Settings/0003-TrebleSettings-IMS.patch b/patches_treble/packages_apps_Settings/0003-TrebleSettings-IMS.patch
index d2aac09..8cc20cd 100644
--- a/patches_treble/packages_apps_Settings/0003-TrebleSettings-IMS.patch
+++ b/patches_treble/packages_apps_Settings/0003-TrebleSettings-IMS.patch
@@ -1,17 +1,17 @@
-From fbcfc21db732fb0214bd4bb5c3f4f766c5f93156 Mon Sep 17 00:00:00 2001
+From 1ae67d0fba3acd594a161c37a6fbb8dfe9939f0f Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Tue, 11 Oct 2022 10:29:36 +0000
-Subject: [PATCH 3/5] TrebleSettings: IMS
+Subject: [PATCH 3/8] TrebleSettings: IMS
 
 Change-Id: Id7a12e150d4a3dc988f8ce1a888ad88443fa0ea4
 ---
  Android.bp                                    |   1 +
  res/values/strings.xml                        |   9 +
- res/xml/treble_settings.xml                   |  13 ++
- .../InstallImsApkPreferenceController.java    | 198 ++++++++++++++++++
- ...VolteAvailabilityPreferenceController.java |  59 ++++++
+ res/xml/treble_settings.xml                   |  13 +
+ .../InstallImsApkPreferenceController.java    | 225 ++++++++++++++++++
+ ...VolteAvailabilityPreferenceController.java |  59 +++++
  .../settings/treble/TrebleSettings.java       |   2 +
- 6 files changed, 282 insertions(+)
+ 6 files changed, 309 insertions(+)
  create mode 100644 src/com/android/settings/treble/InstallImsApkPreferenceController.java
  create mode 100644 src/com/android/settings/treble/OverrideVolteAvailabilityPreferenceController.java
 
@@ -78,10 +78,10 @@ index 336137c95f..09e6bc5d00 100644
  </PreferenceScreen>
 diff --git a/src/com/android/settings/treble/InstallImsApkPreferenceController.java b/src/com/android/settings/treble/InstallImsApkPreferenceController.java
 new file mode 100644
-index 0000000000..f59e5d7d9a
+index 0000000000..e5ec05a820
 --- /dev/null
 +++ b/src/com/android/settings/treble/InstallImsApkPreferenceController.java
-@@ -0,0 +1,198 @@
+@@ -0,0 +1,225 @@
 +package com.android.settings.treble;
 +
 +import android.app.DownloadManager;
@@ -156,6 +156,33 @@ index 0000000000..f59e5d7d9a
 +            mPreference.setEnabled(false);
 +        } else {
 +            mPreference.setOnPreferenceClickListener(this);
++            String summary = "IMS type: ";
++            switch (mImsType) {
++                case "qcom_hidl_moto":
++                    summary += "Qualcomm pre-S (Motorola)";
++                    break;
++                case "qcom_hidl":
++                    summary += "Qualcomm pre-S";
++                    break;
++                case "qcom_aidl":
++                    summary += "Qualcomm S+";
++                    break;
++                case "mtk_p":
++                    summary += "MediaTek P";
++                    break;
++                case "mtk_q":
++                    summary += "MediaTek Q";
++                    break;
++                case "mtk_r":
++                    summary += "MediaTek R";
++                    break;
++                case "mtk_s":
++                    summary += "MediaTek S";
++                    break;
++                default:
++                    break;
++            }
++            mPreference.setSummary(summary);
 +        }
 +
 +        super.displayPreference(screen);
diff --git a/patches_treble/packages_apps_Settings/0004-TrebleSettings-Disable-A2DP-offload.patch b/patches_treble/packages_apps_Settings/0004-TrebleSettings-Disable-A2DP-offload.patch
index e378220..71d8934 100644
--- a/patches_treble/packages_apps_Settings/0004-TrebleSettings-Disable-A2DP-offload.patch
+++ b/patches_treble/packages_apps_Settings/0004-TrebleSettings-Disable-A2DP-offload.patch
@@ -1,7 +1,7 @@
-From f147f139435a488a35a37e4c3f8663ddcc4bf48f Mon Sep 17 00:00:00 2001
+From 0786b6b9b2bda23a4a775ce1afdcc6ae58b20a88 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 10 Dec 2022 12:04:37 +0000
-Subject: [PATCH 4/5] TrebleSettings: Disable A2DP offload
+Subject: [PATCH 4/8] TrebleSettings: Disable A2DP offload
 
 Change-Id: I737f49d146f83d96793f4436850529e3c528acbe
 ---
diff --git a/patches_treble/packages_apps_Settings/0005-TrebleSettings-Alternative-audio-jack-detection.patch b/patches_treble/packages_apps_Settings/0005-TrebleSettings-Alternative-audio-jack-detection.patch
index bb65197..068e705 100644
--- a/patches_treble/packages_apps_Settings/0005-TrebleSettings-Alternative-audio-jack-detection.patch
+++ b/patches_treble/packages_apps_Settings/0005-TrebleSettings-Alternative-audio-jack-detection.patch
@@ -1,7 +1,7 @@
-From 6f190a399dbc171dd6e32882901877f87f881cbe Mon Sep 17 00:00:00 2001
+From 2576ff07b08ba1395e8d46c2ff34b3660991d330 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 10 Dec 2022 14:16:50 +0000
-Subject: [PATCH 5/5] TrebleSettings: Alternative audio jack detection
+Subject: [PATCH 5/8] TrebleSettings: Alternative audio jack detection
 
 Change-Id: I5d6d48f26a4a2134fd6edf996eca89a1fc42e6de
 ---
diff --git a/patches_treble/packages_apps_Settings/0006-TrebleSettings-Override-minimum-brightness.patch b/patches_treble/packages_apps_Settings/0006-TrebleSettings-Override-minimum-brightness.patch
new file mode 100644
index 0000000..7fada3f
--- /dev/null
+++ b/patches_treble/packages_apps_Settings/0006-TrebleSettings-Override-minimum-brightness.patch
@@ -0,0 +1,116 @@
+From c37241c9ac2caa23576f9f40ebbe73d9db3467b8 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sat, 17 Dec 2022 10:29:05 +0000
+Subject: [PATCH 6/8] TrebleSettings: Override minimum brightness
+
+Change-Id: I6d621f7dd04b675b6e2e851a5e474dc9a9841eb0
+---
+ res/values/strings.xml                        |  2 +
+ res/xml/treble_settings.xml                   |  4 ++
+ ...MinimumBrightnessPreferenceController.java | 53 +++++++++++++++++++
+ .../settings/treble/TrebleSettings.java       |  1 +
+ 4 files changed, 60 insertions(+)
+ create mode 100644 src/com/android/settings/treble/OverrideMinimumBrightnessPreferenceController.java
+
+diff --git a/res/values/strings.xml b/res/values/strings.xml
+index 4f8eb839f3..649182030e 100644
+--- a/res/values/strings.xml
++++ b/res/values/strings.xml
+@@ -8481,6 +8481,8 @@
+     <string name="screen_resolution_refresh_rate_title">Screen resolution &amp; refresh rate</string>
+     <!-- Treble settings screen, use alternative backlight scale title -->
+     <string name="use_alternative_backlight_scale_title">Use alternative backlight scale</string>
++    <!-- Treble settings screen, override minimum brightness title -->
++    <string name="override_minimum_brightness_title">Override minimum brightness</string>
+     <!-- Treble settings screen, install IMS APK title -->
+     <string name="install_ims_apk_title">Install IMS APK</string>
+     <!-- Treble settings screen, install IMS APK toasts -->
+diff --git a/res/xml/treble_settings.xml b/res/xml/treble_settings.xml
+index 47097a14c7..5c18461b69 100644
+--- a/res/xml/treble_settings.xml
++++ b/res/xml/treble_settings.xml
+@@ -38,6 +38,10 @@
+             android:key="use_alternative_backlight_scale"
+             android:title="@string/use_alternative_backlight_scale_title" />
+ 
++        <SwitchPreference
++            android:key="override_minimum_brightness"
++            android:title="@string/override_minimum_brightness_title" />
++
+     </PreferenceCategory>
+ 
+     <PreferenceCategory
+diff --git a/src/com/android/settings/treble/OverrideMinimumBrightnessPreferenceController.java b/src/com/android/settings/treble/OverrideMinimumBrightnessPreferenceController.java
+new file mode 100644
+index 0000000000..95200fbeaa
+--- /dev/null
++++ b/src/com/android/settings/treble/OverrideMinimumBrightnessPreferenceController.java
+@@ -0,0 +1,53 @@
++package com.android.settings.treble;
++
++import android.content.Context;
++import android.os.SystemProperties;
++
++import androidx.preference.Preference;
++import androidx.preference.PreferenceScreen;
++import androidx.preference.SwitchPreference;
++
++import com.android.settings.core.BasePreferenceController;
++
++public class OverrideMinimumBrightnessPreferenceController extends BasePreferenceController
++        implements Preference.OnPreferenceChangeListener {
++
++    private static final String OVERRIDE_MINIMUM_BRIGHTNESS_KEY = "override_minimum_brightness";
++    private static final String MINIMAL_BRIGHTNESS_PROPERTY = "persist.sys.overlay.minimal_brightness";
++
++    private SwitchPreference mSwitchPreference;
++
++    public OverrideMinimumBrightnessPreferenceController(Context context) {
++        super(context, OVERRIDE_MINIMUM_BRIGHTNESS_KEY);
++    }
++
++    @Override
++    public int getAvailabilityStatus() {
++        return AVAILABLE;
++    }
++
++    @Override
++    public String getPreferenceKey() {
++        return OVERRIDE_MINIMUM_BRIGHTNESS_KEY;
++    }
++
++    @Override
++    public void displayPreference(PreferenceScreen screen) {
++        mSwitchPreference = screen.findPreference(getPreferenceKey());
++        super.displayPreference(screen);
++    }
++
++    @Override
++    public void updateState(Preference preference) {
++        boolean checked = SystemProperties.getBoolean(MINIMAL_BRIGHTNESS_PROPERTY, false);
++        mSwitchPreference.setChecked(checked);
++    }
++
++    @Override
++    public boolean onPreferenceChange(Preference preference, Object newValue) {
++        SystemProperties.set(MINIMAL_BRIGHTNESS_PROPERTY, String.valueOf((boolean) newValue));
++        mSwitchPreference.setChecked((boolean) newValue);
++        return true;
++    }
++
++}
+diff --git a/src/com/android/settings/treble/TrebleSettings.java b/src/com/android/settings/treble/TrebleSettings.java
+index 09aa001e82..39a0e19972 100644
+--- a/src/com/android/settings/treble/TrebleSettings.java
++++ b/src/com/android/settings/treble/TrebleSettings.java
+@@ -38,6 +38,7 @@ public class TrebleSettings extends DashboardFragment {
+         controllers.add(new UseAlternativeAudioJackDetectionPreferenceController(context));
+         controllers.add(new ScreenResolutionRefreshRatePreferenceController(context));
+         controllers.add(new UseAlternativeBacklightScalePreferenceController(context));
++        controllers.add(new OverrideMinimumBrightnessPreferenceController(context));
+         controllers.add(new InstallImsApkPreferenceController(context));
+         controllers.add(new OverrideVolteAvailabilityPreferenceController(context));
+         return controllers;
+-- 
+2.25.1
+
diff --git a/patches_treble/packages_apps_Settings/0007-TrebleSettings-Override-navbar-availability.patch b/patches_treble/packages_apps_Settings/0007-TrebleSettings-Override-navbar-availability.patch
new file mode 100644
index 0000000..a2ee0fc
--- /dev/null
+++ b/patches_treble/packages_apps_Settings/0007-TrebleSettings-Override-navbar-availability.patch
@@ -0,0 +1,128 @@
+From ce30fb743f306ecacc3515f382b41999591aa3df Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sat, 17 Dec 2022 11:00:38 +0000
+Subject: [PATCH 7/8] TrebleSettings: Override navbar availability
+
+Change-Id: I7c771caf6274543fed23a8cc47411bf8c369ac2c
+---
+ res/values/strings.xml                        |  4 ++
+ res/xml/treble_settings.xml                   |  9 ++++
+ ...avbarAvailabilityPreferenceController.java | 53 +++++++++++++++++++
+ .../settings/treble/TrebleSettings.java       |  1 +
+ 4 files changed, 67 insertions(+)
+ create mode 100644 src/com/android/settings/treble/OverrideNavbarAvailabilityPreferenceController.java
+
+diff --git a/res/values/strings.xml b/res/values/strings.xml
+index 649182030e..bad4ed1ca7 100644
+--- a/res/values/strings.xml
++++ b/res/values/strings.xml
+@@ -8468,6 +8468,8 @@
+     <string name="treble_settings_category_name_display">Display</string>
+     <!-- IMS category name [CHAR LIMIT=none] -->
+     <string name="treble_settings_category_name_ims">IMS</string>
++    <!-- UI category name [CHAR LIMIT=none] -->
++    <string name="treble_settings_category_name_ui">UI</string>
+ 
+     <!-- Treble settings screen, use alternative audio policy title -->
+     <string name="use_alternative_audio_policy_title">Use alternative audio policy</string>
+@@ -8490,6 +8492,8 @@
+     <string name="install_ims_apk_toast_completed">IMS APK installed. Reboot required.</string>
+     <!-- Treble settings screen, override VoLTE availability title -->
+     <string name="override_volte_availability_title">Override VoLTE availability</string>
++    <!-- Treble settings screen, override navbar availability title -->
++    <string name="override_navbar_availability_title">Override navigation bar availability</string>
+ 
+     <!-- Title for setting tile leading to network and Internet settings [CHAR LIMIT=40]-->
+     <string name="network_dashboard_title">Network &amp; internet</string>
+diff --git a/res/xml/treble_settings.xml b/res/xml/treble_settings.xml
+index 5c18461b69..250a8ee75a 100644
+--- a/res/xml/treble_settings.xml
++++ b/res/xml/treble_settings.xml
+@@ -57,4 +57,13 @@
+ 
+     </PreferenceCategory>
+ 
++    <PreferenceCategory
++        android:title="@string/treble_settings_category_name_ui">
++
++        <SwitchPreference
++            android:key="override_navbar_availability"
++            android:title="@string/override_navbar_availability_title" />
++
++    </PreferenceCategory>
++
+ </PreferenceScreen>
+diff --git a/src/com/android/settings/treble/OverrideNavbarAvailabilityPreferenceController.java b/src/com/android/settings/treble/OverrideNavbarAvailabilityPreferenceController.java
+new file mode 100644
+index 0000000000..d6baa33739
+--- /dev/null
++++ b/src/com/android/settings/treble/OverrideNavbarAvailabilityPreferenceController.java
+@@ -0,0 +1,53 @@
++package com.android.settings.treble;
++
++import android.content.Context;
++import android.os.SystemProperties;
++
++import androidx.preference.Preference;
++import androidx.preference.PreferenceScreen;
++import androidx.preference.SwitchPreference;
++
++import com.android.settings.core.BasePreferenceController;
++
++public class OverrideNavbarAvailabilityPreferenceController extends BasePreferenceController
++        implements Preference.OnPreferenceChangeListener {
++
++    private static final String OVERRIDE_NAVBAR_AVAILABILITY_KEY = "override_navbar_availability";
++    private static final String TREBLE_MAINKEYS_PROPERTY = "persist.sys.treble.mainkeys";
++
++    private SwitchPreference mSwitchPreference;
++
++    public OverrideNavbarAvailabilityPreferenceController(Context context) {
++        super(context, OVERRIDE_NAVBAR_AVAILABILITY_KEY);
++    }
++
++    @Override
++    public int getAvailabilityStatus() {
++        return AVAILABLE;
++    }
++
++    @Override
++    public String getPreferenceKey() {
++        return OVERRIDE_NAVBAR_AVAILABILITY_KEY;
++    }
++
++    @Override
++    public void displayPreference(PreferenceScreen screen) {
++        mSwitchPreference = screen.findPreference(getPreferenceKey());
++        super.displayPreference(screen);
++    }
++
++    @Override
++    public void updateState(Preference preference) {
++        boolean checked = (SystemProperties.getInt(TREBLE_MAINKEYS_PROPERTY, 0) == 0);
++        mSwitchPreference.setChecked(checked);
++    }
++
++    @Override
++    public boolean onPreferenceChange(Preference preference, Object newValue) {
++        SystemProperties.set(TREBLE_MAINKEYS_PROPERTY, ((boolean) newValue) ? "0" : "1");
++        mSwitchPreference.setChecked((boolean) newValue);
++        return true;
++    }
++
++}
+diff --git a/src/com/android/settings/treble/TrebleSettings.java b/src/com/android/settings/treble/TrebleSettings.java
+index 39a0e19972..634b7ce3ce 100644
+--- a/src/com/android/settings/treble/TrebleSettings.java
++++ b/src/com/android/settings/treble/TrebleSettings.java
+@@ -41,6 +41,7 @@ public class TrebleSettings extends DashboardFragment {
+         controllers.add(new OverrideMinimumBrightnessPreferenceController(context));
+         controllers.add(new InstallImsApkPreferenceController(context));
+         controllers.add(new OverrideVolteAvailabilityPreferenceController(context));
++        controllers.add(new OverrideNavbarAvailabilityPreferenceController(context));
+         return controllers;
+     }
+ 
+-- 
+2.25.1
+
diff --git a/patches_treble/packages_apps_Settings/0008-TrebleSettings-Securize-on-demand.patch b/patches_treble/packages_apps_Settings/0008-TrebleSettings-Securize-on-demand.patch
new file mode 100644
index 0000000..9fd8b3e
--- /dev/null
+++ b/patches_treble/packages_apps_Settings/0008-TrebleSettings-Securize-on-demand.patch
@@ -0,0 +1,133 @@
+From 9b1a3e0cc42698946fd9453fdadfe0bcf2be3c15 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sat, 17 Dec 2022 14:30:52 +0000
+Subject: [PATCH 8/8] TrebleSettings: Securize on-demand
+
+Change-Id: I76f54620277ccdc41636d74d1afa6330c382ce6a
+---
+ res/values/strings.xml                        |  6 +++
+ res/xml/treble_settings.xml                   | 10 ++++
+ .../treble/SecurizePreferenceController.java  | 53 +++++++++++++++++++
+ .../settings/treble/TrebleSettings.java       |  1 +
+ 4 files changed, 70 insertions(+)
+ create mode 100644 src/com/android/settings/treble/SecurizePreferenceController.java
+
+diff --git a/res/values/strings.xml b/res/values/strings.xml
+index bad4ed1ca7..a6860abcea 100644
+--- a/res/values/strings.xml
++++ b/res/values/strings.xml
+@@ -8468,6 +8468,8 @@
+     <string name="treble_settings_category_name_display">Display</string>
+     <!-- IMS category name [CHAR LIMIT=none] -->
+     <string name="treble_settings_category_name_ims">IMS</string>
++    <!-- System category name [CHAR LIMIT=none] -->
++    <string name="treble_settings_category_name_system">System</string>
+     <!-- UI category name [CHAR LIMIT=none] -->
+     <string name="treble_settings_category_name_ui">UI</string>
+ 
+@@ -8492,6 +8494,10 @@
+     <string name="install_ims_apk_toast_completed">IMS APK installed. Reboot required.</string>
+     <!-- Treble settings screen, override VoLTE availability title -->
+     <string name="override_volte_availability_title">Override VoLTE availability</string>
++    <!-- Treble settings screen, securize title -->
++    <string name="securize_title">Spoof system properties</string>
++    <!-- Treble settings screen, securize summary -->
++    <string name="securize_summary">For better chances of passing SafetyNet\nMight cause bootloop on some devices</string>
+     <!-- Treble settings screen, override navbar availability title -->
+     <string name="override_navbar_availability_title">Override navigation bar availability</string>
+ 
+diff --git a/res/xml/treble_settings.xml b/res/xml/treble_settings.xml
+index 250a8ee75a..1f24352421 100644
+--- a/res/xml/treble_settings.xml
++++ b/res/xml/treble_settings.xml
+@@ -57,6 +57,16 @@
+ 
+     </PreferenceCategory>
+ 
++    <PreferenceCategory
++        android:title="@string/treble_settings_category_name_system">
++
++        <SwitchPreference
++            android:key="securize"
++            android:title="@string/securize_title"
++            android:summary="@string/securize_summary" />
++
++    </PreferenceCategory>
++
+     <PreferenceCategory
+         android:title="@string/treble_settings_category_name_ui">
+ 
+diff --git a/src/com/android/settings/treble/SecurizePreferenceController.java b/src/com/android/settings/treble/SecurizePreferenceController.java
+new file mode 100644
+index 0000000000..0b59bbad81
+--- /dev/null
++++ b/src/com/android/settings/treble/SecurizePreferenceController.java
+@@ -0,0 +1,53 @@
++package com.android.settings.treble;
++
++import android.content.Context;
++import android.os.SystemProperties;
++
++import androidx.preference.Preference;
++import androidx.preference.PreferenceScreen;
++import androidx.preference.SwitchPreference;
++
++import com.android.settings.core.BasePreferenceController;
++
++public class SecurizePreferenceController extends BasePreferenceController
++        implements Preference.OnPreferenceChangeListener {
++
++    private static final String SECURIZE_KEY = "securize";
++    private static final String SECURIZE_PROPERTY = "persist.sys.treble.securize";
++
++    private SwitchPreference mSwitchPreference;
++
++    public SecurizePreferenceController(Context context) {
++        super(context, SECURIZE_KEY);
++    }
++
++    @Override
++    public int getAvailabilityStatus() {
++        return AVAILABLE;
++    }
++
++    @Override
++    public String getPreferenceKey() {
++        return SECURIZE_KEY;
++    }
++
++    @Override
++    public void displayPreference(PreferenceScreen screen) {
++        mSwitchPreference = screen.findPreference(getPreferenceKey());
++        super.displayPreference(screen);
++    }
++
++    @Override
++    public void updateState(Preference preference) {
++        boolean checked = SystemProperties.getBoolean(SECURIZE_PROPERTY, false);
++        mSwitchPreference.setChecked(checked);
++    }
++
++    @Override
++    public boolean onPreferenceChange(Preference preference, Object newValue) {
++        SystemProperties.set(SECURIZE_PROPERTY, String.valueOf((boolean) newValue));
++        mSwitchPreference.setChecked((boolean) newValue);
++        return true;
++    }
++
++}
+diff --git a/src/com/android/settings/treble/TrebleSettings.java b/src/com/android/settings/treble/TrebleSettings.java
+index 634b7ce3ce..149c18f231 100644
+--- a/src/com/android/settings/treble/TrebleSettings.java
++++ b/src/com/android/settings/treble/TrebleSettings.java
+@@ -41,6 +41,7 @@ public class TrebleSettings extends DashboardFragment {
+         controllers.add(new OverrideMinimumBrightnessPreferenceController(context));
+         controllers.add(new InstallImsApkPreferenceController(context));
+         controllers.add(new OverrideVolteAvailabilityPreferenceController(context));
++        controllers.add(new SecurizePreferenceController(context));
+         controllers.add(new OverrideNavbarAvailabilityPreferenceController(context));
+         return controllers;
+     }
+-- 
+2.25.1
+
diff --git a/patches_treble/system_vold/0001-Exfat-can-be-mounted-with-exfat-kernel-fs-driver-or-.patch b/patches_treble/system_vold/0001-Exfat-can-be-mounted-with-exfat-kernel-fs-driver-or-.patch
new file mode 100644
index 0000000..1524810
--- /dev/null
+++ b/patches_treble/system_vold/0001-Exfat-can-be-mounted-with-exfat-kernel-fs-driver-or-.patch
@@ -0,0 +1,60 @@
+From 1c1e3e209c687d9ef0e86c80a113208251a375b9 Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Tue, 18 Oct 2022 16:08:09 -0400
+Subject: [PATCH] Exfat can be mounted with "exfat" kernel fs driver, or
+ "sdfat" or "texfat" (Samsung and Sony variants)
+
+@AndyCGYan: Adapt to LineageOS vold
+
+Change-Id: I331e66d8cb37664adbd493b9190123e29f01fd9d
+---
+ Utils.cpp    |  5 +++++
+ fs/Exfat.cpp | 11 +++++++++--
+ 2 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/Utils.cpp b/Utils.cpp
+index a7e85f2..fb67067 100644
+--- a/Utils.cpp
++++ b/Utils.cpp
+@@ -1059,6 +1059,11 @@ bool IsFilesystemSupported(const std::string& fsType) {
+     /* fuse filesystems */
+     supported.append("fuse\tntfs\n");
+ 
++    /* treat sdfat/texfat as exfat */
++    if (supported.find("sdfat\n") != std::string::npos || supported.find("texfat\n") != std::string::npos) {
++        supported.append("\texfat\n");
++    }
++
+     return supported.find(fsType + "\n") != std::string::npos;
+ }
+ 
+diff --git a/fs/Exfat.cpp b/fs/Exfat.cpp
+index c8b19e0..46a0e2d 100644
+--- a/fs/Exfat.cpp
++++ b/fs/Exfat.cpp
+@@ -61,13 +61,20 @@ status_t Mount(const std::string& source, const std::string& target, int ownerUi
+     auto mountData = android::base::StringPrintf("uid=%d,gid=%d,fmask=%o,dmask=%o", ownerUid,
+                                                  ownerGid, permMask, permMask);
+ 
+-    if (mount(source.c_str(), target.c_str(), "exfat", mountFlags, mountData.c_str()) == 0) {
++    const char *fs = "exfat";
++    if (IsFilesystemSupported("sdfat")) {
++        fs = "sdfat";
++    } else if (IsFilesystemSupported("texfat")) {
++        fs = "texfat";
++    }
++
++    if (mount(source.c_str(), target.c_str(), fs, mountFlags, mountData.c_str()) == 0) {
+         return 0;
+     }
+ 
+     PLOG(ERROR) << "Mount failed; attempting read-only";
+     mountFlags |= MS_RDONLY;
+-    if (mount(source.c_str(), target.c_str(), "exfat", mountFlags, mountData.c_str()) == 0) {
++    if (mount(source.c_str(), target.c_str(), fs, mountFlags, mountData.c_str()) == 0) {
+         return 0;
+     }
+ 
+-- 
+2.25.1
+
diff --git a/patches_treble/vendor_lineage/0001-vendor_lineage-Commonly-build-some-packages.patch b/patches_treble/vendor_lineage/0001-vendor_lineage-Commonly-build-some-packages.patch
index 8d82678..162f7f7 100644
--- a/patches_treble/vendor_lineage/0001-vendor_lineage-Commonly-build-some-packages.patch
+++ b/patches_treble/vendor_lineage/0001-vendor_lineage-Commonly-build-some-packages.patch
@@ -1,21 +1,21 @@
-From 1193bdf321a07cbffbad383cf3a9968d293099c1 Mon Sep 17 00:00:00 2001
+From d20969f3b2cbc3e913bdc7e0dffaa5ed344f218a Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 24 Sep 2022 11:40:52 +0000
 Subject: [PATCH 1/2] vendor_lineage: Commonly build some packages
 
 These were in handheld_product.mk and thus weren't included in GSI targets:
-Contacts, DeskClock, Gallery2, fwb overlays
+Contacts, DeskClock, Gallery2, SettingsIntelligence, fwb overlays
 
 Change-Id: I00cc5918164ed70c612c5caa31eb8d2d0cd05b62
 ---
- config/common_mobile.mk | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
+ config/common_mobile.mk | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/config/common_mobile.mk b/config/common_mobile.mk
-index 547804ce..3c58d9ff 100644
+index 547804ce..6487e727 100644
 --- a/config/common_mobile.mk
 +++ b/config/common_mobile.mk
-@@ -10,12 +10,16 @@ PRODUCT_PRODUCT_PROPERTIES += \
+@@ -10,12 +10,17 @@ PRODUCT_PRODUCT_PROPERTIES += \
  PRODUCT_PACKAGES += \
      Aperture \
      Backgrounds \
@@ -29,6 +29,7 @@ index 547804ce..3c58d9ff 100644
      Profiles \
 -    Seedvault
 +    Seedvault \
++    SettingsIntelligence \
 +    frameworks-base-overlays
  
  ifneq ($(TARGET_EXCLUDES_AUDIOFX),true)
diff --git a/patches_treble/vendor_lineage/0002-vendor_lineage-Disable-ADB-authentication.patch b/patches_treble/vendor_lineage/0002-vendor_lineage-Disable-ADB-authentication.patch
index accdbbf..f59ba50 100644
--- a/patches_treble/vendor_lineage/0002-vendor_lineage-Disable-ADB-authentication.patch
+++ b/patches_treble/vendor_lineage/0002-vendor_lineage-Disable-ADB-authentication.patch
@@ -1,4 +1,4 @@
-From 60803f4939a1df05b7c29925a987efe7e899ba7c Mon Sep 17 00:00:00 2001
+From 5e40aa0d5977938ffcd1f788c2bbc8d2707631b5 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Tue, 19 Oct 2021 15:48:43 +0000
 Subject: [PATCH 2/2] vendor_lineage: Disable ADB authentication
@@ -9,7 +9,7 @@ Change-Id: I4370583ecab1c88ef6f42e29d3eaa52c24d13f09
  1 file changed, 5 deletions(-)
 
 diff --git a/config/common.mk b/config/common.mk
-index 52a4bfd4..a57536c3 100644
+index bb84f0cd..a6703855 100644
 --- a/config/common.mk
 +++ b/config/common.mk
 @@ -13,16 +13,11 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \