Changes for June 2023, syncing up to 20230614

patches_platform/frameworks_base/0001-Add-SPenPointerOverlay.patch

@@ -1,126 +0,0 @@
-From d2d9150fee51378f34efff4ba7f50a194bb85064 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/23] Add SPenPointerOverlay
-
-Toggle this overlay with property "persist.ui.spen.pointer"
-
-Change-Id: I21f7e05cf8ebd74c950dfb20cf7eee99bfe22988
----
- packages/overlays/Android.mk                  |   1 +
- .../overlays/SPenPointerOverlay/Android.bp    |  28 ++++++++++++++++++
- .../SPenPointerOverlay/AndroidManifest.xml    |  23 ++++++++++++++
- .../sem_pointer_spot_hovering_spen.png        | Bin 0 -> 411 bytes
- .../res/drawable/pointer_arrow_icon.xml       |   5 ++++
- 5 files changed, 57 insertions(+)
- create mode 100644 packages/overlays/SPenPointerOverlay/Android.bp
- create mode 100644 packages/overlays/SPenPointerOverlay/AndroidManifest.xml
- create mode 100644 packages/overlays/SPenPointerOverlay/res/drawable-xxhdpi/sem_pointer_spot_hovering_spen.png
- create mode 100644 packages/overlays/SPenPointerOverlay/res/drawable/pointer_arrow_icon.xml
-
-diff --git a/packages/overlays/Android.mk b/packages/overlays/Android.mk
-index 69641e69a9f2..36ec11af3068 100644
---- a/packages/overlays/Android.mk
-+++ b/packages/overlays/Android.mk
-@@ -31,6 +31,7 @@ LOCAL_REQUIRED_MODULES := \
- 	NavigationBarModeGesturalOverlayNarrowBack \
- 	NavigationBarModeGesturalOverlayWideBack \
- 	NavigationBarModeGesturalOverlayExtraWideBack \
-+	SPenPointerOverlay \
- 	preinstalled-packages-platform-overlays.xml
- 
- include $(BUILD_PHONY_PACKAGE)
-diff --git a/packages/overlays/SPenPointerOverlay/Android.bp b/packages/overlays/SPenPointerOverlay/Android.bp
-new file mode 100644
-index 000000000000..7632ebd43ef6
---- /dev/null
-+++ b/packages/overlays/SPenPointerOverlay/Android.bp
-@@ -0,0 +1,28 @@
-+//
-+//  Copyright 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 {
-+    // See: http://go/android-license-faq
-+    // A large-scale-change added 'default_applicable_licenses' to import
-+    // all of the 'license_kinds' from "frameworks_base_license"
-+    // to get the below license kinds:
-+    //   SPDX-license-identifier-Apache-2.0
-+    default_applicable_licenses: ["frameworks_base_license"],
-+}
-+
-+runtime_resource_overlay {
-+    name: "SPenPointerOverlay",
-+    product_specific: true,
-+}
-diff --git a/packages/overlays/SPenPointerOverlay/AndroidManifest.xml b/packages/overlays/SPenPointerOverlay/AndroidManifest.xml
-new file mode 100644
-index 000000000000..b785214f854b
---- /dev/null
-+++ b/packages/overlays/SPenPointerOverlay/AndroidManifest.xml
-@@ -0,0 +1,23 @@
-+<!--
-+  ~ 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.
-+  -->
-+
-+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-+        package="com.samsung.android.spenpointer.overlay"
-+        android:versionCode="1"
-+        android:versionName="1.0">
-+    <overlay android:targetPackage="android" android:priority="5932" android:isStatic="true"
-+        android:requiredSystemPropertyName="persist.ui.spen.pointer" android:requiredSystemPropertyValue="true"/>
-+</manifest>
-diff --git a/packages/overlays/SPenPointerOverlay/res/drawable-xxhdpi/sem_pointer_spot_hovering_spen.png b/packages/overlays/SPenPointerOverlay/res/drawable-xxhdpi/sem_pointer_spot_hovering_spen.png
-new file mode 100644
-index 0000000000000000000000000000000000000000..b73246c80a95e0bceeb8c09aacd2653722fca2d2
-GIT binary patch
-literal 411
-zcmeAS@N?(olHy`uVBq!ia0vp^av;pX3?zBp#Z3TG?EyX^u0VPYDww}y>9XB>H{O1*
-z{q+Z+%%XMcH{QCp_4%7Ek6&zi^&Z52_8N#bKYY6T$G`bYmOylGdHNEl2EyKW`#w-H
-zMEkav?|=xXa@&iyKv|#(o9;XSGJv*hefA2d9ViRrHpmHroTOV4<QL2kefT?*&XynF
-zf9jt6d~bTxr(K#H%-fm6)$T^@`96*P!_O$D=#P=#_iokL5u<mvYQ}e<#%Z1|jv*T7
-z-(HO6Z&DCpO9*-59T;HT8)CHh%)kHdv-@V7U0D0tD*XMooHrlj82&Lg8FU>wkZ<5N
-zBf!g`Yhiojq)$5MjpwPIIqY#_(VA78COitTt~#=3<I2pBClgEGRn7j@r_s({E14^`
-zzN)C=(stXhXOBPbPTyLVZ~8%?D9+x@`{Nq(tjK9wr(Jhj*%s6+*nEHflkLxVMFlvw
-UdB5Fp8R$X=Pgg&ebxsLQ0B%Ow$N&HU
-
-literal 0
-HcmV?d00001
-
-diff --git a/packages/overlays/SPenPointerOverlay/res/drawable/pointer_arrow_icon.xml b/packages/overlays/SPenPointerOverlay/res/drawable/pointer_arrow_icon.xml
-new file mode 100644
-index 000000000000..f35255c5f961
---- /dev/null
-+++ b/packages/overlays/SPenPointerOverlay/res/drawable/pointer_arrow_icon.xml
-@@ -0,0 +1,5 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<pointer-icon xmlns:android="http://schemas.android.com/apk/res/android"
-+    android:bitmap="@drawable/sem_pointer_spot_hovering_spen"
-+    android:hotSpotX="5dp"
-+    android:hotSpotY="5dp" />
--- 
-2.34.1
-

patches_platform/frameworks_base/0001-Check-null-FingerprintManager-first-in-onStartedWaki.patch

@@ -0,0 +1,28 @@
+From 9fb18df98c435af869b08b4796e45b9b8fe8c7cf Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sun, 18 Jun 2023 19:56:36 +0800
+Subject: [PATCH 01/23] Check null FingerprintManager first in
+ onStartedWakingUp
+
+Fixes crashing when unlocking from AOD
+
+Change-Id: I80423b14bbe54989fb9a561271e84988e7427209
+---
+ .../android/systemui/statusbar/phone/CentralSurfacesImpl.java    | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
+index ec8a7a4ffdd3..5462cfdebef4 100644
+--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
++++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
+@@ -3587,6 +3587,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces, Tune
+                                     && mStatusBarStateController.getDozeAmount() == 1f
+                                     && mWakefulnessLifecycle.getLastWakeReason()
+                                     == PowerManager.WAKE_REASON_POWER_BUTTON
++                                    && mFingerprintManager.get() != null
+                                     && mFingerprintManager.get().isPowerbuttonFps()
+                                     && mFingerprintManager.get().hasEnrolledFingerprints()
+                                     && !touchToUnlockAnytime;
+-- 
+2.34.1
+

patches_platform/frameworks_base/0002-Disable-FP-lockouts-optionally.patch

@@ -1,4 +1,4 @@
-From 80b9721f6e8da1f45ca5ebff8870f235efcb2c1e Mon Sep 17 00:00:00 2001
+From ecfa5198eff7f7ce4276cd11469f53bd7aabe8ca Mon Sep 17 00:00:00 2001
 From: AndyCGYan <GeForce8800Ultra@gmail.com>
 Date: Fri, 22 Mar 2019 00:41:20 +0800
 Subject: [PATCH 02/23] Disable FP lockouts optionally

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

@@ -1,4 +1,4 @@
-From 908593ecda65f87bbcbda662f9e35de0d7ba94f4 Mon Sep 17 00:00:00 2001
+From 42a0b3f0599704873de0ac0aca2c1e67adc18c26 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 03/23] Disable vendor mismatch warning
@@ -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 3e1b30b2ff25..8681bd726f3b 100644
+index 577b27b73b43..a0151468b967 100644
 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
 +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
-@@ -5859,20 +5859,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
+@@ -5869,20 +5869,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
                  }
  
                  if (!Build.isBuildConsistent()) {

patches_platform/frameworks_base/0004-Keyguard-Fix-colors-of-slices-not-updating-on-doze.patch

@@ -1,4 +1,4 @@
-From e08d2afd0c6663e9d439b9371d9aba20f3e566e5 Mon Sep 17 00:00:00 2001
+From 5be23474b8d72aa5111e78718272f23a31422295 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Tue, 17 Jan 2023 17:19:19 +0000
 Subject: [PATCH 04/23] Keyguard: Fix colors of slices not updating on doze
@@ -13,10 +13,10 @@ Change-Id: I06abd8bf2e28655cc9e6d81366fd82a13454ec5a
  2 files changed, 8 insertions(+)
 
 diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java
-index aec30632c41e..7ef624a6f184 100644
+index f4c581552bc4..c0f983551877 100644
 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java
 +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java
-@@ -99,6 +99,13 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV
+@@ -97,6 +97,13 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV
          mKeyguardSliceViewController.refresh();
      }
  
@@ -31,10 +31,10 @@ index aec30632c41e..7ef624a6f184 100644
       * Set which clock should be displayed on the keyguard. The other one will be automatically
       * hidden.
 diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
-index 731ce92099e8..3e748a0f2722 100644
+index 3dbb6e0ccedb..778261ef6d1f 100644
 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
 +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
-@@ -5718,6 +5718,7 @@ public final class NotificationPanelViewController implements Dumpable {
+@@ -4421,6 +4421,7 @@ public final class NotificationPanelViewController implements Dumpable {
          public void onDozeAmountChanged(float linearAmount, float amount) {
              mInterpolatedDarkAmount = amount;
              mLinearDarkAmount = linearAmount;

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

@@ -1,4 +1,4 @@
-From ef9cee9e51e0c3a3020a83b1e18f229c4e45498a Mon Sep 17 00:00:00 2001
+From 56a81a819bb62e59f41552ff21d4e98133049b7f 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 05/23] UI: Adjust default navbar layouts
@@ -45,7 +45,7 @@ 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 48c35ae8789d..70269b18a573 100644
+index 374cff002d29..418bbc7c7932 100644
 --- a/packages/SystemUI/res/values/config.xml
 +++ b/packages/SystemUI/res/values/config.xml
 @@ -301,7 +301,7 @@

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

@@ -1,4 +1,4 @@
-From 4bb9def8e58fa46890cdf93672e35a298bd595ff Mon Sep 17 00:00:00 2001
+From 649ce048d4f01ac4ed24ede16f7e7f185cdb1f67 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 06/23] UI: Disable wallpaper zoom
@@ -11,10 +11,10 @@ Change-Id: I78cc5484930b27f172cd8d8a5bd9042dce3478d0
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
-index 987426f56463..c2e2c91b2829 100644
+index 91dd9179c329..75941bbb8cd3 100644
 --- a/core/res/res/values/config.xml
 +++ b/core/res/res/values/config.xml
-@@ -5146,7 +5146,7 @@
+@@ -5203,7 +5203,7 @@
      <item name="config_wallpaperMinScale" format="float" type="dimen">1</item>
  
      <!-- The max scale for the wallpaper when it's zoomed in -->

patches_platform/frameworks_base/0007-UI-Follow-Monet-and-light-dark-theme-in-user-1-icon.patch

@@ -1,4 +1,4 @@
-From f439b01c40e9c9af40b40dfb80f7422775c587d6 Mon Sep 17 00:00:00 2001
+From 4766c45fdd4cf28209445a209fab52b4d09f057d 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 07/23] UI: Follow Monet and light/dark theme in user 1 icon
@@ -22,10 +22,10 @@ index ffaccd3ddc57..e2a955b89c77 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 d5875f547e91..c7711ed3e493 100644
+index b83d3b4ea298..7586684ea936 100644
 --- a/core/res/res/values/colors.xml
 +++ b/core/res/res/values/colors.xml
-@@ -174,7 +174,7 @@
+@@ -176,7 +176,7 @@
      <color name="system_notification_accent_color">#00000000</color>
  
      <!-- Default user icon colors -->

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

@@ -1,4 +1,4 @@
-From 8f0163c65d95e9ecfb4eb3e573040d22c9693ebb Mon Sep 17 00:00:00 2001
+From 22415704f766f87342d2fe61ac17d485263d8fb9 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 08/23] UI: Increase default status bar height

patches_platform/frameworks_base/0009-UI-Remove-QS-footer-background.patch

@@ -1,4 +1,4 @@
-From e3ad3c7f7bbdb5913feddced1a1a36652d849f9d Mon Sep 17 00:00:00 2001
+From 01a3d9b6958a779bad976d07c38b06f518178072 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 09/23] UI: Remove QS footer background

patches_platform/frameworks_base/0010-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch

@@ -1,4 +1,4 @@
-From 4a51c5c42de7b550ce9a13322d63c44a8bbd76d8 Mon Sep 17 00:00:00 2001
+From 15e2a02275c1de3c194f18079b12bb3220afb862 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 10/23] UI: Restore split-screen divider to pre-Sv2 looks
@@ -8,28 +8,57 @@ Subject: [PATCH 10/23] UI: Restore split-screen divider to pre-Sv2 looks
 
 Change-Id: I240b627793b615c82bd07ebd77638cde180ef80f
 ---
- .../res/color/split_divider_background.xml    |  4 ++--
+ .../Shell/res/values-sw600dp/colors.xml       | 21 +++++++++++++++++++
- .../wm/shell/common/split/SplitLayout.java    | 19 ++-----------------
+ .../WindowManager/Shell/res/values/colors.xml |  2 +-
- 2 files changed, 4 insertions(+), 19 deletions(-)
+ .../wm/shell/common/split/SplitLayout.java    | 19 ++---------------
+ 3 files changed, 24 insertions(+), 18 deletions(-)
+ create mode 100644 libs/WindowManager/Shell/res/values-sw600dp/colors.xml
 
-diff --git a/libs/WindowManager/Shell/res/color/split_divider_background.xml b/libs/WindowManager/Shell/res/color/split_divider_background.xml
+diff --git a/libs/WindowManager/Shell/res/values-sw600dp/colors.xml b/libs/WindowManager/Shell/res/values-sw600dp/colors.xml
-index 049980803ee3..cd54ac26a7fd 100644
+new file mode 100644
---- a/libs/WindowManager/Shell/res/color/split_divider_background.xml
+index 000000000000..79db59cad3c2
-+++ b/libs/WindowManager/Shell/res/color/split_divider_background.xml
+--- /dev/null
-@@ -15,5 +15,5 @@
++++ b/libs/WindowManager/Shell/res/values-sw600dp/colors.xml
-   ~ limitations under the License.
+@@ -0,0 +1,21 @@
-   -->
++<?xml version="1.0" encoding="utf-8"?>
- <selector xmlns:android="http://schemas.android.com/apk/res/android">
++<!--
--    <item android:color="@android:color/system_neutral1_500" android:lStar="15" />
++/*
--</selector>
++ * Copyright 2020, The Android Open Source Project
-\ No newline at end of file
++ *
-+    <item android:color="@android:color/black" />
++ * Licensed under the Apache License, Version 2.0 (the "License");
-+</selector>
++ * 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.
++ */
++-->
++<resources>
++    <color name="split_divider_background">@color/taskbar_background</color>
++</resources>
+diff --git a/libs/WindowManager/Shell/res/values/colors.xml b/libs/WindowManager/Shell/res/values/colors.xml
+index 6fb70006e67f..906dc71d623a 100644
+--- a/libs/WindowManager/Shell/res/values/colors.xml
++++ b/libs/WindowManager/Shell/res/values/colors.xml
+@@ -18,7 +18,7 @@
+ -->
+ <resources>
+     <color name="docked_divider_handle">#000000</color>
+-    <color name="split_divider_background">@color/taskbar_background</color>
++    <color name="split_divider_background">@android:color/black</color>
+     <drawable name="forced_resizable_background">#59000000</drawable>
+     <color name="minimize_dock_shadow_start">#60000000</color>
+     <color name="minimize_dock_shadow_end">#00000000</color>
 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 45b234a6398a..f0b1ff3999bc 100644
+index b4acd6046182..b0a05d7c80d9 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
-@@ -153,23 +153,8 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange
+@@ -154,23 +154,8 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange
      }
  
      private void updateDividerConfig(Context context) {

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

@@ -1,4 +1,4 @@
-From fd92d595cd2d3caa015c1ab1749c1a06c472ba82 Mon Sep 17 00:00:00 2001
+From 4b24750cb511cb2666335b46e053d2b3791e1d94 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 11/23] UI: Revive navbar layout tuning via sysui_nav_bar

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

@@ -1,4 +1,4 @@
-From ae22c5903fb6bd176d1df8de0292df0c386f1f80 Mon Sep 17 00:00:00 2001
+From 6957050c84f0fd86972408b016f3835e450de13b 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 12/23] UI: Use SNAP_FIXED_RATIO for multi-window globally
@@ -78,10 +78,10 @@ index 34b6a54be493..3921c9edfeac 100644
           Only applies if the device display is not square. -->
      <bool name="config_navBarCanMove">false</bool>
 diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
-index c2e2c91b2829..8f81427cbe67 100644
+index 75941bbb8cd3..87e3ddcf8fdf 100644
 --- a/core/res/res/values/config.xml
 +++ b/core/res/res/values/config.xml
-@@ -3829,7 +3829,7 @@
+@@ -3882,7 +3882,7 @@
               1 - 3 snap targets: fixed ratio, 1:1, (1 - fixed ratio)
               2 - 1 snap target: 1:1
      -->

patches_platform/frameworks_base/0013-core-Remove-old-app-target-SDK-dialog.patch

@@ -1,4 +1,4 @@
-From 519ee96fabf6d29ed22641f3a587012d92cc6846 Mon Sep 17 00:00:00 2001
+From 37a4d23386f038939c42819f050d22bd23627292 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Tue, 3 Nov 2020 22:43:12 -0800
 Subject: [PATCH 13/23] core: Remove old app target SDK dialog

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

@@ -1,4 +1,4 @@
-From b715efda04efd69a0bfd4a9fd003e519b1255e96 Mon Sep 17 00:00:00 2001
+From ad6e9615c4473cb86b36ef383dfb74f4df078901 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Tue, 5 Oct 2021 21:01:50 -0700
 Subject: [PATCH 14/23] Paint: Enable subpixel text positioning by default

patches_platform/frameworks_base/0015-Add-support-for-app-signature-spoofing.patch

@@ -1,4 +1,4 @@
-From 8b06ea31edf57c5b6252a188f2035c92c6c2bd31 Mon Sep 17 00:00:00 2001
+From d6f40aec4b7a24c61f37c0c46240b4a263e4e796 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Sat, 16 Oct 2021 05:27:57 -0700
 Subject: [PATCH 15/23] Add support for app signature spoofing
@@ -58,10 +58,10 @@ index 487e57d114c9..04e69741b9fd 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 bbe31240f5f3..7d717b2106a1 100644
+index bbc3a7369423..af04d9d18fbd 100644
 --- a/core/res/AndroidManifest.xml
 +++ b/core/res/AndroidManifest.xml
-@@ -3572,6 +3572,21 @@
+@@ -3577,6 +3577,21 @@
          android:description="@string/permdesc_getPackageSize"
          android:protectionLevel="normal" />
  
@@ -84,10 +84,10 @@ index bbe31240f5f3..7d717b2106a1 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 9410e0682106..7ed7a03f1b61 100644
+index 2091c0502b6f..6888edcf7d3c 100644
 --- a/core/res/res/values/strings.xml
 +++ b/core/res/res/values/strings.xml
-@@ -977,6 +977,18 @@
+@@ -982,6 +982,18 @@
  
      <!--  Permissions -->
  

patches_platform/frameworks_base/0016-Spoof-product-name-for-Google-Play-Services.patch

@@ -1,4 +1,4 @@
-From dff8fbe5dfceacfd51b3606d7b137616911a6cf6 Mon Sep 17 00:00:00 2001
+From ecbc82fa7365a4fd123a7ad945c41c0b6b78658c Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Mon, 11 Oct 2021 19:59:51 -0700
 Subject: [PATCH 16/23] Spoof product name for Google Play Services

patches_platform/frameworks_base/0017-keystore-Block-key-attestation-for-SafetyNet.patch

@@ -1,4 +1,4 @@
-From bf57e2c0560a94601c465de9cce8ae77111ba37f Mon Sep 17 00:00:00 2001
+From 229fe76ca5e1980981668fa0fc926b0982e91fba Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Mon, 11 Oct 2021 20:00:44 -0700
 Subject: [PATCH 17/23] keystore: Block key attestation for SafetyNet

patches_platform/frameworks_base/0018-Limit-SafetyNet-workarounds-to-unstable-GMS-process.patch

@@ -1,4 +1,4 @@
-From 4b2da805e60f7456b60fbef0399b42270bd6d1d8 Mon Sep 17 00:00:00 2001
+From 56dbd5d3d3a54582731fcfeacaed9fa8ac542ea6 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Mon, 1 Nov 2021 20:06:48 -0700
 Subject: [PATCH 18/23] Limit SafetyNet workarounds to unstable GMS process

patches_platform/frameworks_base/0019-gmscompat-Apply-the-SafetyNet-workaround-to-Play-Sto.patch

@@ -1,4 +1,4 @@
-From 3e127f227f91e2cda68ae28c531c7f7034693b9e Mon Sep 17 00:00:00 2001
+From 502ad20c8b29c937821a70f26be83f481b941e4f Mon Sep 17 00:00:00 2001
 From: Dyneteve <dyneteve@hentaios.com>
 Date: Tue, 23 Aug 2022 18:57:05 +0200
 Subject: [PATCH 19/23] gmscompat: Apply the SafetyNet workaround to Play Store

patches_platform/frameworks_base/0020-gmscompat-Use-Nexus-6P-fingerprint-for-CTS-Integrity.patch

@@ -1,4 +1,4 @@
-From 408d79cb171d9d9d4e78c068601c8e08047b18d0 Mon Sep 17 00:00:00 2001
+From 643dcbbac4e1955c62f7760fefad20d261797e5b Mon Sep 17 00:00:00 2001
 From: Dyneteve <dyneteve@hentaios.com>
 Date: Thu, 8 Sep 2022 14:39:52 +0200
 Subject: [PATCH 20/23] gmscompat: Use Nexus 6P fingerprint for CTS/Integrity

patches_platform/frameworks_base/0021-gmscompat-Use-actual-device-model-name.patch

@@ -1,4 +1,4 @@
-From 9e51495edc14e3cf1609eccf3d65a71720c17a09 Mon Sep 17 00:00:00 2001
+From 3f021fc317d07d0d9443832bc568161707013746 Mon Sep 17 00:00:00 2001
 From: Dyneteve <dyneteve@hentaios.com>
 Date: Tue, 6 Dec 2022 15:59:08 +0100
 Subject: [PATCH 21/23] gmscompat: Use actual device model name

patches_platform/frameworks_base/0022-gmscompat-Set-shipping-level-to-32-for-devices-33.patch

@@ -1,4 +1,4 @@
-From f7ac5b583424583d440b7f2ce6bdce96fce2e209 Mon Sep 17 00:00:00 2001
+From 721c979c994c6cdf4f92dfb283d28cfeaf649a51 Mon Sep 17 00:00:00 2001
 From: Anirudh Gupta <anirudhgupta109@aosip.dev>
 Date: Wed, 4 Jan 2023 18:20:56 +0000
 Subject: [PATCH 22/23] gmscompat: Set shipping level to 32 for devices >=33

patches_platform/frameworks_base/0023-gmscompat-Make-CTS-Play-Integrity-pass-again.patch

@@ -1,4 +1,4 @@
-From ebbe0af4cff77d27ab5b7b23c5d86f947428b4c4 Mon Sep 17 00:00:00 2001
+From 69908af269c76085862d4034abf615e5416838a1 Mon Sep 17 00:00:00 2001
 From: Dyneteve <dyneteve@hentaios.com>
 Date: Wed, 8 Feb 2023 15:21:01 +0000
 Subject: [PATCH 23/23] gmscompat: Make CTS/Play Integrity pass again

patches_platform/packages_apps_Messaging/0001-Messaging-Add-Mark-as-read-quick-action-for-message-.patch

@@ -1,4 +1,4 @@
-From 3f7f3f9546f9f23d66381f7dff887cd562285ce6 Mon Sep 17 00:00:00 2001
+From c93f729acb568f290085cea4014fbe384ec40289 Mon Sep 17 00:00:00 2001
 From: Paul Keith <javelinanddart@gmail.com>
 Date: Tue, 30 Oct 2018 15:46:18 +0100
 Subject: [PATCH] Messaging: Add "Mark as read" quick action for message
@@ -7,6 +7,7 @@ Subject: [PATCH] Messaging: Add "Mark as read" quick action for message
 Change-Id: I7194dca022e5062926fa35709de282721ca64320
 ---
  res/drawable/ic_wear_read.xml                      |  9 +++++++++
+ res/values-zh-rCN/cm_strings.xml                   |  1 +
  res/values/cm_strings.xml                          |  3 +++
  .../messaging/datamodel/BugleNotifications.java    | 14 ++++++++++++++
  .../datamodel/MessageNotificationState.java        |  8 ++++++++
@@ -14,7 +15,7 @@ Change-Id: I7194dca022e5062926fa35709de282721ca64320
  .../messaging/receiver/NotificationReceiver.java   | 12 +++++++++++-
  src/com/android/messaging/ui/UIIntents.java        | 11 +++++++++++
  src/com/android/messaging/ui/UIIntentsImpl.java    | 14 ++++++++++++++
- 8 files changed, 81 insertions(+), 2 deletions(-)
+ 9 files changed, 82 insertions(+), 2 deletions(-)
  create mode 100644 res/drawable/ic_wear_read.xml
 
 diff --git a/res/drawable/ic_wear_read.xml b/res/drawable/ic_wear_read.xml
@@ -32,6 +33,17 @@ index 0000000..9d017e6
 +        android:fillColor="#ffffff"
 +        android:pathData="M0.41,13.41L6,19L7.41,17.58L1.83,12M22.24,5.58L11.66,16.17L7.5,12L6.07,13.41L11.66,19L23.66,7M18,7L16.59,5.58L10.24,11.93L11.66,13.34L18,7Z" />
 +</vector>
+diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
+index 3cfebff..f1ffeab 100644
+--- a/res/values-zh-rCN/cm_strings.xml
++++ b/res/values-zh-rCN/cm_strings.xml
+@@ -19,5 +19,6 @@
+     <string name="swipe_to_delete_conversation_pref_summary">向右滑动以删除会话</string>
+     <string name="show_emoticons_pref_title">访问表情符号</string>
+     <string name="show_emoticons_pref_summary">在键盘上显示表情符号键</string>
++    <string name="notification_mark_as_read">标记为已读</string>
+     <string name="notification_channel_messages_title">短信</string>
+ </resources>
 diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
 index f285555..858f093 100644
 --- a/res/values/cm_strings.xml
@@ -219,5 +231,5 @@ index d64082d..9281899 100644
       * Gets a PendingIntent associated with an Intent to start an Activity. All notifications
       * that starts an Activity must use this method to get a PendingIntent, which achieves two
 -- 
-2.25.1
+2.34.1
 

patches_platform_personal/frameworks_base/0001-Add-keylayout-for-Backbone-One-for-Android-with-AB-X.patch

@@ -0,0 +1,52 @@
+From 64c0e12dc7a4eb6add7631a84dda17e2012f687c Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sun, 18 Jun 2023 19:33:27 +0800
+Subject: [PATCH 01/21] Add keylayout for Backbone One for Android, with AB/XY
+ keys swapped
+
+Change-Id: Ia057c084099015b544c926cd57c37b4ac314867a
+---
+ data/keyboards/Vendor_358a_Product_0201.kl | 31 ++++++++++++++++++++++
+ 1 file changed, 31 insertions(+)
+ create mode 100644 data/keyboards/Vendor_358a_Product_0201.kl
+
+diff --git a/data/keyboards/Vendor_358a_Product_0201.kl b/data/keyboards/Vendor_358a_Product_0201.kl
+new file mode 100644
+index 000000000000..e15907f9c6f2
+--- /dev/null
++++ b/data/keyboards/Vendor_358a_Product_0201.kl
+@@ -0,0 +1,31 @@
++#
++# Backbone One for Android
++#
++
++# AB/XY swapped
++key 305 BUTTON_A
++key 304 BUTTON_B
++key 308 BUTTON_X
++key 307 BUTTON_Y
++
++key 310 BUTTON_L1
++key 311 BUTTON_R1
++key 312 BUTTON_L2
++key 313 BUTTON_R2
++
++key 317 BUTTON_THUMBL
++key 318 BUTTON_THUMBR
++
++axis 0x00 X flat 4096
++axis 0x01 Y flat 4096
++axis 0x02 Z flat 4096
++axis 0x05 RZ flat 4096
++
++axis 0x0a LTRIGGER
++axis 0x09 RTRIGGER
++
++axis 0x10 HAT_X
++axis 0x11 HAT_Y
++
++key 315 BUTTON_START
++key 314 BUTTON_SELECT
+-- 
+2.34.1
+

patches_platform_personal/frameworks_base/0002-Add-MiuiNavbarOverlay.patch

@@ -1,7 +1,7 @@
-From fe9ef4702e81d02d75fb9e6df73fcf013fb955af Mon Sep 17 00:00:00 2001
+From 2e9df83d63b2c316a6cec6fcbc253ef0919cf5d3 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 02/21] Add MiuiNavbarOverlay
 
 Change-Id: I0e6791abc3c9521d7dc612df2fec2b041affe7e9
 ---
@@ -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 := \

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

@@ -1,7 +1,7 @@
-From 964e570909040dc8de452f5269f633c4b4fe9519 Mon Sep 17 00:00:00 2001
+From cf35535a94712e9f81d9532fa4a494a8628b4641 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 03/21] Disable Bluetooth by default
 
 Change-Id: Iea5d24f977928bf01cd7a46b98c75c0a4bd6a23c
 ---

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

@@ -1,7 +1,7 @@
-From 0db4a23679a9c74790cc618abeeeadaf0a202665 Mon Sep 17 00:00:00 2001
+From 8201fef9ab532374796549c938ea2fc172bf20f5 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 04/21] Disable cursor drag by default for editable TextViews
 
 Requested by @TadiT7
 

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

@@ -1,7 +1,7 @@
-From 6a0d86399b5d61301d2184a6b10152462380dc10 Mon Sep 17 00:00:00 2001
+From 0dba3680960846702881fed2b3e716825af92d58 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 05/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 a6f47d4e4908..ac7cabba3ddc 100644
+index b27ff411dd58..5ce49bd98c5c 100644
 --- a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
 +++ b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
-@@ -1781,25 +1781,7 @@ public class AppStandbyController
+@@ -1792,25 +1792,7 @@ public class AppStandbyController
                          .noteRestrictionAttempt(packageName, userId, elapsedRealtime, reason);
  
                  if (isForcedByUser) {

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

@@ -1,7 +1,7 @@
-From 64d1e22f654f996d3cc46334f4a75b6c37c16268 Mon Sep 17 00:00:00 2001
+From c16a1a66b9e311a2dfbf1925d8f17783933571e5 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 06/21] Keyguard: Adjust clock style
 
 Thinner font, less padding and unintrusive colors
 
@@ -57,26 +57,26 @@ index 000000000000..f80af4376ff1
 +    <color name="clock_default_color_light">@*android:color/primary_text_material_light</color>
 +</resources>
 diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/AnimatableClockView.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/AnimatableClockView.kt
-index 462b90a10aee..d5fdb185d042 100644
+index 86bd5f2bff5a..b99a8ba487cb 100644
 --- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/AnimatableClockView.kt
 +++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/AnimatableClockView.kt
-@@ -147,7 +147,7 @@ class AnimatableClockView @JvmOverloads constructor(
+@@ -146,7 +146,7 @@ class AnimatableClockView @JvmOverloads constructor(
      fun refreshTime() {
          time.timeInMillis = timeOverrideInMillis ?: System.currentTimeMillis()
          contentDescription = DateFormat.format(descFormat, time)
 -        val formattedText = DateFormat.format(format, time)
 +        val formattedText = DateFormat.format(format, time).toString() + ' '
-         logBuffer?.log(tag, DEBUG,
+         logBuffer?.log(TAG, DEBUG,
                  { str1 = formattedText?.toString() },
                  { "refreshTime: new formattedText=$str1" }
 diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt
-index e138ef8a1ea8..fa7979a0b598 100644
+index 4df7a44d3e1d..447160a8cb63 100644
 --- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt
 +++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt
-@@ -131,9 +131,9 @@ class DefaultClockController(
+@@ -143,9 +143,9 @@ class DefaultClockController(
-         fun updateColor() {
+                 if (seedColor != null) {
-             val color =
+                     seedColor!!
-                 if (isRegionDark) {
+                 } else if (isRegionDark) {
 -                    resources.getColor(android.R.color.system_accent1_100)
 +                    resources.getColor(R.color.clock_default_color_dark)
                  } else {
@@ -99,10 +99,10 @@ 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 c5ffdc0051da..b3f3d46c5dcd 100644
+index edd6eff92c1c..14df77dc4a4e 100644
 --- a/packages/SystemUI/res-keyguard/values/dimens.xml
 +++ b/packages/SystemUI/res-keyguard/values/dimens.xml
-@@ -94,10 +94,10 @@
+@@ -91,10 +91,10 @@
      <dimen name="num_pad_key_margin_end">12dp</dimen>
  
      <!-- additional offset for clock switch area items -->
@@ -143,10 +143,10 @@ index 8b8594032816..9135e78f3e4c 100644
          android:singleLine="true"
          systemui:showMissingSim="true"
 diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
-index dfc6ba4720f2..6c5e6d73feb7 100644
+index 892c2f4caa39..6996e41e08da 100644
 --- a/packages/SystemUI/res/values/styles.xml
 +++ b/packages/SystemUI/res/values/styles.xml
-@@ -301,7 +301,7 @@
+@@ -302,7 +302,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>
@@ -155,7 +155,7 @@ index dfc6ba4720f2..6c5e6d73feb7 100644
          <item name="android:colorError">@*android:color/error_color_material_dark</item>
          <item name="*android:lockPatternStyle">@style/LockPatternViewStyle</item>
          <item name="lockPatternStyle">@style/LockPatternContainerStyle</item>
-@@ -323,7 +323,7 @@
+@@ -324,7 +324,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>

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

@@ -1,7 +1,7 @@
-From abc2207876e23d1c01e0c45fe604dcef3967e1b7 Mon Sep 17 00:00:00 2001
+From c9d2af70d90a8cf81dae5bfba93d6f59c0373bdb 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 07/21] Keyguard: Hide padlock unless UDFPS is in use
 
 Fair enough Google, but don't give me that otherwise
 
@@ -11,7 +11,7 @@ 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 1322f16a5a59..3df030b50ed5 100644
+index 0887b220dee1..423549dd3ab2 100644
 --- a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
 +++ b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
 @@ -295,20 +295,14 @@ public class LockIconViewController extends ViewController<LockIconView> impleme

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

@@ -1,7 +1,7 @@
-From 86a90de31bc9c05b3124d573dcd93eb5a3ddf5ec Mon Sep 17 00:00:00 2001
+From ff1164da64003d5a6d6e57fd75ba1d8684167dd7 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 08/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 788f1200d603..45d045785e2d 100644
+index ba217804c96e..ab3391372e2c 100644
 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
 +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
-@@ -392,7 +392,7 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
+@@ -470,7 +470,7 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
  
      private void updateDoubleLineClock() {
          mCanShowDoubleLineClock = mSecureSettings.getIntForUser(

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

@@ -1,17 +1,17 @@
-From 6254335e8e470501a24b678aa006536fadd0f7c0 Mon Sep 17 00:00:00 2001
+From a8a951832a14ed9fb5e718a14c4dc9ec73d24693 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 09/21] Keyguard: Refine indication text
 
 Change-Id: Ib771c35610f712a1de34736e817bcfe616ac37d8
 ---
  .../SystemUI/res-keyguard/values/styles.xml   |  2 --
  .../res/layout/keyguard_bottom_area.xml       |  1 +
  packages/SystemUI/res/values/dimens.xml       |  3 +--
- ...ardIndicationRotateTextViewController.java | 12 +++++++++-
+ ...ardIndicationRotateTextViewController.java | 12 ++++++++++-
- .../KeyguardIndicationController.java         | 23 ++++---------------
+ .../KeyguardIndicationController.java         | 21 ++-----------------
  .../phone/KeyguardIndicationTextView.java     |  2 +-
- 6 files changed, 18 insertions(+), 25 deletions(-)
+ 6 files changed, 16 insertions(+), 25 deletions(-)
 
 diff --git a/packages/SystemUI/res-keyguard/values/styles.xml b/packages/SystemUI/res-keyguard/values/styles.xml
 index c81e018702bb..cc87f9f3d7cf 100644
@@ -27,7 +27,7 @@ index c81e018702bb..cc87f9f3d7cf 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 6120863f23ab..5fd81bad8226 100644
+index 4048a39344bd..2f884baf0bd5 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 6120863f23ab..5fd81bad8226 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 1165c0d1eda1..750fb574c30c 100644
+index ceebab2b08ef..e2c65f5542b7 100644
 --- a/packages/SystemUI/res/values/dimens.xml
 +++ b/packages/SystemUI/res/values/dimens.xml
-@@ -774,11 +774,10 @@
+@@ -815,11 +815,10 @@
      <dimen name="keyguard_lock_height">42dp</dimen>
      <dimen name="keyguard_lock_padding">20dp</dimen>
  
@@ -56,10 +56,10 @@ index 1165c0d1eda1..750fb574c30c 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 9235e10209d4..42e710d9c9a3 100644
+index 0745456b3e43..0fc0b9e29fb7 100644
 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java
 +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java
-@@ -220,12 +220,22 @@ public class KeyguardIndicationRotateTextViewController extends
+@@ -224,12 +224,22 @@ public class KeyguardIndicationRotateTextViewController extends
      }
  
      /**
@@ -84,23 +84,10 @@ index 9235e10209d4..42e710d9c9a3 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 3301d6907a25..15a7555e1381 100644
+index 2b3444e64acb..b8567d17785a 100644
 --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
 +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
-@@ -270,10 +270,12 @@ public class KeyguardIndicationController {
+@@ -407,7 +407,6 @@ public class KeyguardIndicationController {
-             public void handleMessage(Message msg) {
-                 if (msg.what == MSG_HIDE_TRANSIENT) {
-                     hideTransientIndication();
-+                    updateLockScreenIndications(false /* animate */, KeyguardUpdateMonitor.getCurrentUser());
-                 } else if (msg.what == MSG_SHOW_ACTION_TO_UNLOCK) {
-                     showActionToUnlock();
-                 } 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;
-                 }
-@@ -377,7 +379,6 @@ public class KeyguardIndicationController {
          updateLockScreenDisclosureMsg();
          updateLockScreenOwnerInfo();
          updateLockScreenBatteryMsg(animate);
@@ -108,7 +95,7 @@ index 3301d6907a25..15a7555e1381 100644
          updateLockScreenTrustMsg(userId, getTrustGrantedIndication(), getTrustManagedIndication());
          updateLockScreenAlignmentMsg();
          updateLockScreenLogoutView();
-@@ -486,22 +487,6 @@ public class KeyguardIndicationController {
+@@ -518,22 +517,6 @@ public class KeyguardIndicationController {
          }
      }
  
@@ -131,7 +118,7 @@ index 3301d6907a25..15a7555e1381 100644
      private void updateBiometricMessage() {
          if (mDozing) {
              updateDeviceEntryIndication(false);
-@@ -594,11 +579,11 @@ public class KeyguardIndicationController {
+@@ -626,11 +609,11 @@ public class KeyguardIndicationController {
      }
  
      private void updateLockScreenPersistentUnlockMsg() {
@@ -146,7 +133,7 @@ index 3301d6907a25..15a7555e1381 100644
                              .build(),
                      true);
 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 d24469e8421e..647c766aa0f0 100644
+index 9d30cb4c4852..f179194fb0e1 100644
 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java
 +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java
 @@ -46,7 +46,7 @@ public class KeyguardIndicationTextView extends TextView {

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

@@ -1,7 +1,7 @@
-From 4eebadc9bacc35b94ac2fec83e68b4fd0a6eab21 Mon Sep 17 00:00:00 2001
+From 0425dac4b2f22dc37e117b55a0fdefe91f6e2ebb 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 2023/03/22, targeting T QPR2
@@ -25,16 +25,16 @@ Change-Id: Ic91fa398813e1907297bb0892c444d96405950e7
  packages/SystemUI/res/values-sw600dp/dimens.xml        |  3 ---
  packages/SystemUI/res/values/dimens.xml                |  2 +-
  packages/SystemUI/res/xml/qqs_header.xml               |  4 ++--
- .../systemui/shade/LargeScreenShadeHeaderController.kt | 10 +++++++---
+ .../android/systemui/shade/ShadeHeaderController.kt    | 10 +++++++---
  .../statusbar/phone/KeyguardStatusBarView.java         |  7 -------
  7 files changed, 12 insertions(+), 18 deletions(-)
 
 diff --git a/packages/SystemUI/res/layout/combined_qs_header.xml b/packages/SystemUI/res/layout/combined_qs_header.xml
-index 4b78f2839255..7ac024a97eee 100644
+index 828a4535e656..65c8e52d00ac 100644
 --- a/packages/SystemUI/res/layout/combined_qs_header.xml
 +++ b/packages/SystemUI/res/layout/combined_qs_header.xml
-@@ -148,4 +148,4 @@
+@@ -151,4 +151,4 @@
-         <include layout="@layout/ongoing_privacy_chip"/>
+ 
      </FrameLayout>
  
 -</com.android.systemui.util.NoRemeasureMotionLayout>
@@ -54,24 +54,24 @@ index 9135e78f3e4c..ddaea938c858 100644
          android:gravity="center_vertical"
          android:ellipsize="marquee"
 diff --git a/packages/SystemUI/res/values-sw600dp/dimens.xml b/packages/SystemUI/res/values-sw600dp/dimens.xml
-index 599bf30a5135..f9911fda7dbe 100644
+index 59becc69506c..9168a5ce1ced 100644
 --- a/packages/SystemUI/res/values-sw600dp/dimens.xml
 +++ b/packages/SystemUI/res/values-sw600dp/dimens.xml
-@@ -27,9 +27,6 @@
+@@ -28,9 +28,6 @@
      <!-- The width of user avatar when on Keyguard -->
      <dimen name="multi_user_avatar_keyguard_size">30dp</dimen>
  
 -    <!-- Margin on the left side of the carrier text on Keyguard -->
 -    <dimen name="keyguard_carrier_text_margin">24dp</dimen>
 -
-     <!-- The width/height of the phone/camera/unlock icon on keyguard. -->
+     <!-- Screen pinning request width -->
-     <dimen name="keyguard_affordance_height">80dp</dimen>
+     <dimen name="screen_pinning_request_width">400dp</dimen>
-     <dimen name="keyguard_affordance_width">120dp</dimen>
+     <!-- Screen pinning request bottom button circle widths -->
 diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
-index 750fb574c30c..b5854568c117 100644
+index e2c65f5542b7..d0a9055e1905 100644
 --- a/packages/SystemUI/res/values/dimens.xml
 +++ b/packages/SystemUI/res/values/dimens.xml
-@@ -748,7 +748,7 @@
+@@ -790,7 +790,7 @@
      <dimen name="kg_framed_avatar_size">32dp</dimen>
  
      <!-- Margin on the left side of the carrier text on Keyguard -->
@@ -81,7 +81,7 @@ index 750fb574c30c..b5854568c117 100644
      <!-- Additional translation (downwards) for appearing notifications when going to the full shade
           from Keyguard. -->
 diff --git a/packages/SystemUI/res/xml/qqs_header.xml b/packages/SystemUI/res/xml/qqs_header.xml
-index e56e5d557c2f..6378705f9db4 100644
+index 00a0444a1c9d..a5c3f8e982ca 100644
 --- a/packages/SystemUI/res/xml/qqs_header.xml
 +++ b/packages/SystemUI/res/xml/qqs_header.xml
 @@ -44,7 +44,7 @@
@@ -93,29 +93,29 @@ index e56e5d557c2f..6378705f9db4 100644
              app:layout_constrainedWidth="true"
              app:layout_constraintStart_toEndOf="@id/clock"
              app:layout_constraintEnd_toStartOf="@id/barrier"
-@@ -110,4 +110,4 @@
+@@ -109,4 +109,4 @@
              app:layout_constraintHorizontal_bias="1"
          />
      </Constraint>
 -</ConstraintSet>
 \ No newline at end of file
 +</ConstraintSet>
-diff --git a/packages/SystemUI/src/com/android/systemui/shade/LargeScreenShadeHeaderController.kt b/packages/SystemUI/src/com/android/systemui/shade/LargeScreenShadeHeaderController.kt
+diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt
-index a3dffa2ec4d8..dca955008ad3 100644
+index a6b88370f836..e7632971d37e 100644
---- a/packages/SystemUI/src/com/android/systemui/shade/LargeScreenShadeHeaderController.kt
+--- a/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt
-+++ b/packages/SystemUI/src/com/android/systemui/shade/LargeScreenShadeHeaderController.kt
++++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt
-@@ -140,6 +140,8 @@ class LargeScreenShadeHeaderController @Inject constructor(
+@@ -132,6 +132,8 @@ constructor(
-     private var cutoutLeft = 0
+ 
-     private var cutoutRight = 0
      private var roundedCorners = 0
+     private var cutout: DisplayCutout? = null
 +    private var statusBarPaddingStart = 0
 +    private var statusBarPaddingEnd = 0
      private var lastInsets: WindowInsets? = null
      private var textColorPrimary = Color.TRANSPARENT
  
-@@ -376,14 +378,17 @@ class LargeScreenShadeHeaderController @Inject constructor(
+@@ -364,14 +366,17 @@ constructor(
-         cutoutLeft = sbInsets.first
+         val cutoutLeft = sbInsets.first
-         cutoutRight = sbInsets.second
+         val cutoutRight = sbInsets.second
          val hasCornerCutout: Boolean = insetsProvider.currentRotationHasCornerCutout()
 +        roundedCorners = resources.getDimensionPixelSize(R.dimen.rounded_corner_content_padding)
 +        statusBarPaddingStart = resources.getDimensionPixelSize(R.dimen.status_bar_padding_start)
@@ -123,8 +123,8 @@ index a3dffa2ec4d8..dca955008ad3 100644
          updateQQSPaddings()
          // Set these guides as the left/right limits for content that lives in the top row, using
          // cutoutLeft and cutoutRight
-         var changes = combinedShadeHeadersConstraintManager
+         var changes =
-             .edgesGuidelinesConstraints(
+             combinedShadeHeadersConstraintManager.edgesGuidelinesConstraints(
 -                if (view.isLayoutRtl) cutoutRight else cutoutLeft,
 +                (if (view.isLayoutRtl) cutoutRight else cutoutLeft) + statusBarPaddingStart,
                  header.paddingStart,
@@ -133,7 +133,7 @@ index a3dffa2ec4d8..dca955008ad3 100644
                  header.paddingEnd
              )
  
-@@ -502,7 +507,6 @@ class LargeScreenShadeHeaderController @Inject constructor(
+@@ -483,7 +488,6 @@ constructor(
      }
  
      private fun updateResources() {

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

@@ -1,7 +1,7 @@
-From 29973bff7d5cad945ec8cb4b378d4d099b2ccf6e Mon Sep 17 00:00:00 2001
+From 4803ddab6f362587e769b2aa5d60a041345d26af Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Tue, 31 May 2022 00:00:08 +0000
-Subject: [PATCH 10/20] Revert "SystemUI: Add left padding for keyguard slices"
+Subject: [PATCH 11/21] Revert "SystemUI: Add left padding for keyguard slices"
 
 This reverts commit 4a7a4426944e28e70a3eca6a696ff6c7599fb896.
 ---

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

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

patches_platform_personal/frameworks_base/0013-Revert-Use-the-default-top-clock-margin-on-h800-devi.patch

@@ -1,7 +1,7 @@
-From 9ca4c9ed59f2d710e2ed65d266c346f6c76bf06d Mon Sep 17 00:00:00 2001
+From 15e59be158a3305a17e14cc18883d323d2afc54b 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 12/20] Revert "Use the default top clock margin on h800
+Subject: [PATCH 13/21] Revert "Use the default top clock margin on h800
  devices"
 
 This reverts commits 50ba380f4d8d1c2523e0f76295ca556038796bfd

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

@@ -1,7 +1,7 @@
-From b4f02e5a5d70915148a826fd5adbc80005c2d893 Mon Sep 17 00:00:00 2001
+From 6927e68fa4ec001ec72e9f68e4454a37c8bc7bb5 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 13/20] UI: Always render windows into cutouts
+Subject: [PATCH 14/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
@@ -52,10 +52,10 @@ index 33641f72b2ff..6e201970ac03 100644
      }
  
 diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java
-index ebeb189000a3..5c4cde643e82 100644
+index 1468360b37b7..a1f70e4c8deb 100644
 --- a/services/core/java/com/android/server/wm/DisplayPolicy.java
 +++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
-@@ -1550,6 +1550,7 @@ public class DisplayPolicy {
+@@ -1558,6 +1558,7 @@ public class DisplayPolicy {
          displayFrames = win.getDisplayFrames(displayFrames);
  
          final WindowManager.LayoutParams attrs = win.mAttrs.forRotation(displayFrames.mRotation);

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

@@ -1,7 +1,7 @@
-From b780aa348b0807a89c393330d2727b5d69c59238 Mon Sep 17 00:00:00 2001
+From 89c565bf1a9ce56a64191059424bf9f5fe04f1d9 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 14/20] UI: Kill rounded corners in notification scrim
+Subject: [PATCH 15/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
 
@@ -11,10 +11,10 @@ Change-Id: I09ed59e0e658ebd512a9d02a8ef3edfe2c9888da
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
-index b5854568c117..1d6a7dd284a5 100644
+index d0a9055e1905..30881992795d 100644
 --- a/packages/SystemUI/res/values/dimens.xml
 +++ b/packages/SystemUI/res/values/dimens.xml
-@@ -684,7 +684,7 @@
+@@ -726,7 +726,7 @@
      <!-- With the large clock, move up slightly from the center -->
      <dimen name="keyguard_large_clock_top_margin">-60dp</dimen>
  

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

@@ -1,7 +1,7 @@
-From 7e764a4f7f2314bbaf5d7271115be30baa46e893 Mon Sep 17 00:00:00 2001
+From be2477f3314d044e1d7581905a4d358aa0f0a2a7 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 15/20] UI: Reconfigure power menu items
+Subject: [PATCH 16/21] UI: Reconfigure power menu items
 
 Change-Id: I32cca6e2c6bb64d891efee959127edf7c0802cbc
 ---
@@ -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 8f81427cbe67..349ff65ecde6 100644
+index 87e3ddcf8fdf..64d592b2230b 100644
 --- a/core/res/res/values/config.xml
 +++ b/core/res/res/values/config.xml
-@@ -3252,13 +3252,10 @@
+@@ -3305,13 +3305,10 @@
           "logout" =  Logout the current user
           -->
      <string-array translatable="false" name="config_globalActionsList">

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

@@ -1,7 +1,7 @@
-From dbbe5afc40f68420da0e808c89b34f284b09f8d9 Mon Sep 17 00:00:00 2001
+From f22928416285a9ac0ab6f8cd683c8dd5d95bf15b 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 16/20] UI: Reconfigure quick settings tiles
+Subject: [PATCH 17/21] UI: Reconfigure quick settings tiles
 
 Change-Id: I743f52ef3a95db0ca2c02ae973faa4629e41885d
 ---
@@ -9,7 +9,7 @@ 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 70269b18a573..38b654b64418 100644
+index 418bbc7c7932..245bde4c543a 100644
 --- a/packages/SystemUI/res/values/config.xml
 +++ b/packages/SystemUI/res/values/config.xml
 @@ -68,7 +68,7 @@

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

@@ -1,7 +1,7 @@
-From 07b9d619fefc8b722dd154e0cf68249b3d9fffe2 Mon Sep 17 00:00:00 2001
+From fe8362152cdb0a17376ffedb37030cc57d14b375 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 17/20] UI: Relax requirement for HINT_SUPPORTS_DARK_TEXT
+Subject: [PATCH 18/21] UI: Relax requirement for HINT_SUPPORTS_DARK_TEXT
 
 I decide what's good enough for a wallpaper!
 
@@ -11,10 +11,10 @@ Change-Id: I5ccd85b3df12e53746a4ac6cbc37ba8d11f6c336
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/core/java/android/app/WallpaperColors.java b/core/java/android/app/WallpaperColors.java
-index 067a4c3c047e..a8d3c14e1d9d 100644
+index a34a50c4b7b0..028f77fb21b0 100644
 --- a/core/java/android/app/WallpaperColors.java
 +++ b/core/java/android/app/WallpaperColors.java
-@@ -577,7 +577,7 @@ public final class WallpaperColors implements Parcelable {
+@@ -580,7 +580,7 @@ public final class WallpaperColors implements Parcelable {
  
          int hints = 0;
          double meanLuminance = totalLuminance / pixels.length;

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

@@ -1,7 +1,7 @@
-From 6d5e98d6f14462e0921eee4b223dcce4daa47b73 Mon Sep 17 00:00:00 2001
+From a0cd4caf1cd92218e44db206ec2f67839ce4dbe8 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 18/20] UI: Remove privacy dot
+Subject: [PATCH 19/21] UI: Remove privacy dot
 
 Change-Id: I5d2e2b3e36f027b4348a83030d4b4d3c4f0209d1
 ---
@@ -9,10 +9,10 @@ Change-Id: I5d2e2b3e36f027b4348a83030d4b4d3c4f0209d1
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
-index 1d6a7dd284a5..0ebbcdb16f79 100644
+index 30881992795d..7ead38868815 100644
 --- a/packages/SystemUI/res/values/dimens.xml
 +++ b/packages/SystemUI/res/values/dimens.xml
-@@ -1014,12 +1014,12 @@
+@@ -1059,12 +1059,12 @@
      <dimen name="ongoing_appops_chip_min_width">56dp</dimen>
      <!--  Three privacy items. This value must not be exceeded  -->
      <dimen name="ongoing_appops_chip_max_width">76dp</dimen>

patches_platform_personal/frameworks_base/0020-UI-Restore-quick-settings-fonts-to-pre-T-QPR2.patch

@@ -1,7 +1,7 @@
-From 31ed8c48f604dbab1f0097737886fb800929c101 Mon Sep 17 00:00:00 2001
+From 7cacf0df0092432cd2347e0cbae0c1c3d0f5dcf9 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Wed, 22 Mar 2023 00:29:13 +0000
-Subject: [PATCH 19/20] UI: Restore quick settings fonts to pre-T-QPR2
+Subject: [PATCH 20/21] UI: Restore quick settings fonts to pre-T-QPR2
 
 TODO: Large header clock looks better in Regular - perhaps figure out how to transition smoothly?
 Change-Id: If2e57fee61b6bd4b6b7fedc7e3011164cd2cb56f
@@ -10,7 +10,7 @@ Change-Id: If2e57fee61b6bd4b6b7fedc7e3011164cd2cb56f
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
-index 6c5e6d73feb7..1bbd930443a2 100644
+index 6996e41e08da..5e6d45ac9305 100644
 --- a/packages/SystemUI/res/values/styles.xml
 +++ b/packages/SystemUI/res/values/styles.xml
 @@ -134,7 +134,7 @@

patches_platform_personal/frameworks_base/0021-UI-Revert-to-HSL-luminance-for-wallpaper-dark-hints.patch

@@ -1,7 +1,7 @@
-From be2c9c3bfaac6b3b9fc705ceb3799decc99d5a3d Mon Sep 17 00:00:00 2001
+From 9732bf6c88d489f587e62d9f6b382e876295cbd6 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?
 
@@ -11,10 +11,10 @@ Change-Id: Ie5663bdf518b4ef93d6deb634e707a32d052ac55
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/core/java/android/app/WallpaperColors.java b/core/java/android/app/WallpaperColors.java
-index a8d3c14e1d9d..88609f3d7052 100644
+index 028f77fb21b0..63ccf961a2d8 100644
 --- a/core/java/android/app/WallpaperColors.java
 +++ b/core/java/android/app/WallpaperColors.java
-@@ -552,15 +552,15 @@ public final class WallpaperColors implements Parcelable {
+@@ -555,15 +555,15 @@ public final class WallpaperColors implements Parcelable {
          float[] tmpHsl = new float[3];
          for (int i = 0; i < pixels.length; i++) {
              int pixelColor = pixels[i];
@@ -33,7 +33,7 @@ index a8d3c14e1d9d..88609f3d7052 100644
  
              // Make sure we don't have a dark pixel mass that will
              // make text illegible.
-@@ -572,7 +572,7 @@ public final class WallpaperColors implements Parcelable {
+@@ -575,7 +575,7 @@ public final class WallpaperColors implements Parcelable {
                      pixels[i] = Color.RED;
                  }
              }

patches_platform_personal/packages_apps_DeskClock/0002-DeskClock-Remove-night-mode.patch

@@ -1,28 +1,29 @@
-From 8ffb863199ed6e09068a41aa8e701732bed271e6 Mon Sep 17 00:00:00 2001
+From ef3810b1d55f079278f3ac3ef83f7b5b2eaaa7c1 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 3/5] DeskClock: Remove night mode
+Subject: [PATCH 2/4] DeskClock: Remove night mode
 
 Change-Id: I885f39027e78fcda397f1be59d17bc24bc66671a
 ---
- res/xml/screensaver_settings.xml                   | 6 ------
+ res/xml/screensaver_settings.xml                   | 7 -------
  src/com/android/deskclock/Screensaver.java         | 5 ++---
  src/com/android/deskclock/ScreensaverActivity.java | 2 +-
- 3 files changed, 3 insertions(+), 10 deletions(-)
+ 3 files changed, 3 insertions(+), 11 deletions(-)
 
 diff --git a/res/xml/screensaver_settings.xml b/res/xml/screensaver_settings.xml
-index 49a7f1d89..73375dcfa 100644
+index 7b8c9764a..908f76fef 100644
 --- a/res/xml/screensaver_settings.xml
 +++ b/res/xml/screensaver_settings.xml
-@@ -24,10 +24,4 @@
+@@ -26,11 +26,4 @@
-         android:key="screensaver_clock_style"
+         android:title="@string/clock_style"
-         android:title="@string/clock_style" />
+         app:iconSpaceReserved="false" />
  
 -    <CheckBoxPreference
 -        android:defaultValue="true"
 -        android:key="screensaver_night_mode"
 -        android:summary="@string/night_mode_summary"
--        android:title="@string/night_mode_title" />
+-        android:title="@string/night_mode_title"
+-        app:iconSpaceReserved="false" />
 -
  </PreferenceScreen>
 diff --git a/src/com/android/deskclock/Screensaver.java b/src/com/android/deskclock/Screensaver.java

patches_platform_personal/packages_apps_DeskClock/0002-Revert-DeskClock-update-digital-widget.patch

@@ -1,156 +0,0 @@
-From 7ee7d93a6596567c0b799ba00091db3950b83fe0 Mon Sep 17 00:00:00 2001
-From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
-Date: Sun, 7 May 2023 14:24:32 +0000
-Subject: [PATCH 2/5] Revert "DeskClock: update digital widget"
-
-This reverts commit a9e6a18d1abd5f3ee2ec816d031f2a69ea1f6028.
----
- res/layout/digital_widget.xml       | 5 +++--
- res/layout/digital_widget_sizer.xml | 5 +++--
- res/values-h560dp/dimens.xml        | 2 +-
- res/values-h650dp/dimens.xml        | 2 +-
- res/values-sw600dp-land/dimens.xml  | 2 +-
- res/values-sw600dp/dimens.xml       | 2 +-
- res/values-sw720dp/dimens.xml       | 2 +-
- res/values/dimens.xml               | 2 +-
- res/values/styles.xml               | 6 ++----
- 9 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/res/layout/digital_widget.xml b/res/layout/digital_widget.xml
-index d09cba64c..5cf896a84 100644
---- a/res/layout/digital_widget.xml
-+++ b/res/layout/digital_widget.xml
-@@ -24,7 +24,7 @@
- 
-     <TextClock
-         android:id="@+id/clock"
--        style="@style/widget_big"
-+        style="@style/widget_big_thin"
-         android:layout_width="wrap_content"
-         android:layout_height="wrap_content"
-         android:layout_gravity="center_horizontal|top"
-@@ -32,7 +32,8 @@
-         android:format12Hour="@string/lock_screen_12_hour_format"
-         android:format24Hour="@string/lock_screen_24_hour_format"
-         android:includeFontPadding="false"
--        android:singleLine="true" />
-+        android:singleLine="true"
-+        android:textColor="@color/white" />
- 
-     <LinearLayout
-         android:layout_width="wrap_content"
-diff --git a/res/layout/digital_widget_sizer.xml b/res/layout/digital_widget_sizer.xml
-index be7677ba7..f524cf536 100644
---- a/res/layout/digital_widget_sizer.xml
-+++ b/res/layout/digital_widget_sizer.xml
-@@ -21,7 +21,7 @@
- 
-     <TextClock
-         android:id="@+id/clock"
--        style="@style/widget_big"
-+        style="@style/widget_big_thin"
-         android:layout_width="wrap_content"
-         android:layout_height="wrap_content"
-         android:layout_gravity="center_horizontal|top"
-@@ -29,7 +29,8 @@
-         android:ellipsize="none"
-         android:format12Hour="@string/lock_screen_12_hour_format"
-         android:format24Hour="@string/lock_screen_24_hour_format"
--        android:singleLine="true" />
-+        android:singleLine="true"
-+        android:textColor="@color/white" />
- 
-     <LinearLayout
-         android:layout_width="wrap_content"
-diff --git a/res/values-h560dp/dimens.xml b/res/values-h560dp/dimens.xml
-index 403e19f93..7bf0909b1 100644
---- a/res/values-h560dp/dimens.xml
-+++ b/res/values-h560dp/dimens.xml
-@@ -16,5 +16,5 @@
- 
- <resources>
-     <!-- The maximum size of the font for the time in widgets. -->
--    <dimen name="widget_max_clock_font_size">86dp</dimen>
-+    <dimen name="widget_max_clock_font_size">96dp</dimen>
- </resources>
-diff --git a/res/values-h650dp/dimens.xml b/res/values-h650dp/dimens.xml
-index de043fd26..7c52196c0 100644
---- a/res/values-h650dp/dimens.xml
-+++ b/res/values-h650dp/dimens.xml
-@@ -16,5 +16,5 @@
- 
- <resources>
-     <!-- The maximum size of the font for the time in widgets. -->
--    <dimen name="widget_max_clock_font_size">90dp</dimen>
-+    <dimen name="widget_max_clock_font_size">100dp</dimen>
- </resources>
-diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml
-index f647ef5b4..157e8b4ba 100644
---- a/res/values-sw600dp-land/dimens.xml
-+++ b/res/values-sw600dp-land/dimens.xml
-@@ -24,5 +24,5 @@
-     <dimen name="analog_clock_margin">48dp</dimen>
- 
-     <!-- The maximum size of the font for the time in widgets. -->
--    <dimen name="widget_max_clock_font_size">90dp</dimen>
-+    <dimen name="widget_max_clock_font_size">100dp</dimen>
- </resources>
-diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
-index bde6b225c..2c3a50de6 100644
---- a/res/values-sw600dp/dimens.xml
-+++ b/res/values-sw600dp/dimens.xml
-@@ -63,5 +63,5 @@
-     <!-- The fixed size of the font for the city name / day of week in the city widget. -->
-     <dimen name="city_widget_name_font_size">20dp</dimen>
-     <!-- The maximum size of the font for the time in widgets. -->
--    <dimen name="widget_max_clock_font_size">112dp</dimen>
-+    <dimen name="widget_max_clock_font_size">125dp</dimen>
- </resources>
-diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
-index 8b786f0e9..92f495a76 100644
---- a/res/values-sw720dp/dimens.xml
-+++ b/res/values-sw720dp/dimens.xml
-@@ -22,5 +22,5 @@
-     <dimen name="analog_clock_size">312dp</dimen>
- 
-     <!-- The maximum size of the font for the time in widgets. -->
--    <dimen name="widget_max_clock_font_size">124dp</dimen>
-+    <dimen name="widget_max_clock_font_size">138dp</dimen>
- </resources>
-diff --git a/res/values/dimens.xml b/res/values/dimens.xml
-index c26d93ddd..c136fe25a 100644
---- a/res/values/dimens.xml
-+++ b/res/values/dimens.xml
-@@ -95,7 +95,7 @@
-     <!-- The fixed size of the font for the city name / day of week in the city widget. -->
-     <dimen name="city_widget_name_font_size">10dp</dimen>
-     <!-- The maximum size of the font for the time in widgets. -->
--    <dimen name="widget_max_clock_font_size">80dp</dimen>
-+    <dimen name="widget_max_clock_font_size">88dp</dimen>
-     <dimen name="widget_min_world_city_list_size">80dp</dimen>
- 
-     <!-- shadow styles for widget text with drop shadows -->
-diff --git a/res/values/styles.xml b/res/values/styles.xml
-index 683df4ee5..8c6364344 100644
---- a/res/values/styles.xml
-+++ b/res/values/styles.xml
-@@ -72,14 +72,12 @@
-         <item name="android:fontFamily">sans-serif-thin</item>
-     </style>
- 
--    <style name="widget_big" parent="big_thin">
-+    <style name="widget_big_thin" parent="big_thin">
-         <item name="android:shadowRadius">@dimen/widget_shadow_radius</item>
-         <item name="android:shadowColor">@color/widget_shadow_color</item>
-         <item name="android:shadowDx">@dimen/widget_shadow_dx</item>
-         <item name="android:shadowDy">@dimen/widget_shadow_dy</item>
--        <item name="android:fontFamily">sans-serif-condensed</item>
--        <item name="android:textColor">@*android:color/system_accent2_100</item>
--        <item name="android:scaleY">0.9</item>
-+        <item name="android:fontFamily">sans-serif-thin</item>
-     </style>
- 
-     <style name="PrimaryLabelTextParentAppearance">
--- 
-2.34.1
-

patches_platform_personal/packages_apps_DeskClock/0003-DeskClock-Adapt-digital-clocks-to-S-style.patch

@@ -1,7 +1,7 @@
-From acb86d43b61a02dbad16bd56a2a0bc3f770b46f9 Mon Sep 17 00:00:00 2001
+From 3430de2c592c9d9b4a08c16477fff4ad1a4ca775 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 4/5] DeskClock: Adapt digital clocks to S style
+Subject: [PATCH 3/4] DeskClock: Adapt digital clocks to S style
 
 Lollipop is so yesterday...
 Bring the layouts of various digital clocks (app, widget, daydream)

patches_platform_personal/packages_apps_DeskClock/0004-DeskClock-Wallpaper-based-text-coloring-for-digital-.patch

@@ -1,7 +1,7 @@
-From cb345f3431711b6df77eadfe88cee2101d34bea3 Mon Sep 17 00:00:00 2001
+From 169570068c3a78f7294d581b2df864ccd3057579 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 5/5] DeskClock: Wallpaper-based text coloring for digital
+Subject: [PATCH 4/4] DeskClock: Wallpaper-based text coloring for digital
  clock widget
 
 RemoteViews is such a restrictive PITA

patches_platform_personal/packages_apps_Trebuchet/0001-Trebuchet-Make-overview-scrim-transparent-again.patch

@@ -1,4 +1,4 @@
-From 1f218b4e6572822d99ec46c1bfd65e7ff023c0d3 Mon Sep 17 00:00:00 2001
+From f32dde0ff88ec58029be1fe4a1b42b94ff1bdbab Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Thu, 28 Oct 2021 02:30:59 +0000
 Subject: [PATCH 1/2] Trebuchet: Make overview scrim transparent again
@@ -7,18 +7,18 @@ Also revert texts/buttons to workspace color
 
 Change-Id: I78c84865eb06b8e59c9c271cd2e267ae4cd7cc08
 ---
- quickstep/res/values/styles.xml                            | 4 ++--
+ quickstep/res/values/styles.xml                            | 2 +-
  quickstep/src/com/android/quickstep/views/RecentsView.java | 2 +-
  res/color-v31/overview_scrim.xml                           | 2 +-
  res/color-v31/overview_scrim_dark.xml                      | 2 +-
  res/color/overview_button.xml                              | 6 +++---
- 5 files changed, 8 insertions(+), 8 deletions(-)
+ 5 files changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml
-index 7225220876..59cce932a2 100644
+index 8eea37f6c2..623f60f81a 100644
 --- a/quickstep/res/values/styles.xml
 +++ b/quickstep/res/values/styles.xml
-@@ -142,7 +142,7 @@
+@@ -176,7 +176,7 @@
          parent="@android:style/Widget.DeviceDefault.Button.Borderless">
          <item name="android:textColor">@color/overview_button</item>
          <item name="android:drawableTint">@color/overview_button</item>
@@ -27,18 +27,11 @@ index 7225220876..59cce932a2 100644
          <item name="android:drawablePadding">8dp</item>
          <item name="android:textAllCaps">false</item>
      </style>
-@@ -182,4 +182,4 @@
-         <item name="android:textSize">24sp</item>
-         <item name="android:lines">2</item>
-     </style>
--</resources>
-\ No newline at end of file
-+</resources>
 diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
-index 4a4202ecc6..58e8c2508a 100644
+index 9222e456e5..678c0dfd80 100644
 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java
 +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
-@@ -717,7 +717,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
+@@ -783,7 +783,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
          mEmptyIcon.setCallback(this);
          mEmptyMessage = context.getText(R.string.recents_empty_message);
          mEmptyMessagePaint = new TextPaint();
@@ -89,5 +82,5 @@ index aa48b78604..e638ac2d4a 100644
 \ No newline at end of file
 +</selector>
 -- 
-2.25.1
+2.34.1
 

patches_platform_personal/packages_apps_Trebuchet/0002-Trebuchet-Kill-haptics-in-recents.patch

@@ -1,4 +1,4 @@
-From 3b51af674b9aa916e86fcfe0034ba3dfc0359ae1 Mon Sep 17 00:00:00 2001
+From c04fae6b45b624a39d684c4b6cf02440a3fe83b5 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Fri, 18 Mar 2022 08:42:18 +0000
 Subject: [PATCH 2/2] Trebuchet: Kill haptics in recents
@@ -13,14 +13,14 @@ Change-Id: Ie3b0eabe8cc0421e696720740edc492cae2f5153
  3 files changed, 32 deletions(-)
 
 diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
-index 53dc9dd873..c8d89edb97 100644
+index 847114a960..eef4be2964 100644
 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
 +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
-@@ -429,14 +429,6 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
+@@ -419,14 +419,6 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
              nonOverviewAnim.setFloatValues(startProgress, endProgress);
              mNonOverviewAnim.dispatchOnStart();
          }
--        if (targetState == QUICK_SWITCH) {
+-        if (targetState == QUICK_SWITCH_FROM_HOME) {
 -            // Navigating to quick switch, add scroll feedback since the first time is not
 -            // considered a scroll by the RecentsView.
 -            VibratorWrapper.INSTANCE.get(mLauncher).vibrate(
@@ -32,10 +32,10 @@ index 53dc9dd873..c8d89edb97 100644
          nonOverviewAnim.setDuration(Math.max(xDuration, yDuration));
          mNonOverviewAnim.setEndAction(() -> onAnimationToStateCompleted(targetState));
 diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
-index ca7f633bbc..61ee609535 100644
+index eddc50c64f..09f253b08d 100644
 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
 +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
-@@ -367,11 +367,6 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
+@@ -369,11 +369,6 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
          mCurrentAnimation.startWithVelocity(mActivity, goingToEnd,
                  velocity * orientationHandler.getSecondaryTranslationDirectionFactor(),
                  mEndDisplacement, animationDuration);
@@ -48,10 +48,10 @@ index ca7f633bbc..61ee609535 100644
  
      private void clearState() {
 diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
-index 58e8c2508a..786db49be5 100644
+index 678c0dfd80..8e75a7c18d 100644
 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java
 +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
-@@ -1339,25 +1339,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
+@@ -1466,25 +1466,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
          }
      }
  
@@ -78,5 +78,5 @@ index 58e8c2508a..786db49be5 100644
      protected void determineScrollingStart(MotionEvent ev, float touchSlopScale) {
          // Enables swiping to the left or right only if the task overlay is not modal.
 -- 
-2.25.1
+2.34.1
 

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

@@ -1,4 +1,4 @@
-From cdc58cf7521058bf50f6835fa41a2cedc6dab008 Mon Sep 17 00:00:00 2001
+From 563e108c7b4ed5328da2b7e679a32f895143a7b9 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/9] treble: Set BOARD_EXT4_SHARE_DUP_BLOCKS explicitly

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

@@ -1,4 +1,4 @@
-From 637ec8c42fd5946eb7e9df549b980d605b22dad6 Mon Sep 17 00:00:00 2001
+From 2aecfd767a70bf3453ff5b1d6248acb66c216237 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/9] treble: Set TARGET_NO_KERNEL_OVERRIDE

patches_treble/device_phh_treble/0004-treble-Enable-call-recording.patch

@@ -1,4 +1,4 @@
-From eec1dc55bfe0733d1c6d8a5d870cd6411b02bd0d Mon Sep 17 00:00:00 2001
+From 037d75cd9b7001493c29b9ef998fb61ec77bee49 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/9] treble: Enable call recording

patches_treble/device_phh_treble/0005-treble-Switch-to-MindTheGapps.patch

@@ -1,4 +1,4 @@
-From be808ccab89637aa591c6ec13ab6187848e2c55c Mon Sep 17 00:00:00 2001
+From 406d4622bf17d63dee581ee2d1645827708211d1 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 5/9] treble: Switch to MindTheGapps

patches_treble/device_phh_treble/0006-treble-Stop-securing-ADB.patch

@@ -1,4 +1,4 @@
-From 4901e97f452afa7eccffa22d50d6ccaa7eae8ffe Mon Sep 17 00:00:00 2001
+From 59403a7591029a82ca2201f95b97a17019caa7a7 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/9] treble: Stop securing ADB
@@ -9,14 +9,14 @@ Build-time macro coupled with vendor/lineage might do better...
 
 Change-Id: I0215b3ed970dd53a124f48e30ca2cf4b0c6d2899
 ---
- rw-system.sh | 4 ----
+ rw-system.sh | 3 ---
- 1 file changed, 4 deletions(-)
+ 1 file changed, 3 deletions(-)
 
 diff --git a/rw-system.sh b/rw-system.sh
-index e1ad994..d78655e 100644
+index 5dc493f..9c7cc42 100644
 --- a/rw-system.sh
 +++ b/rw-system.sh
-@@ -772,14 +772,10 @@ if [ -f /system/phh/secure ] || [ -f /metadata/phh/secure ];then
+@@ -776,13 +776,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
@@ -26,7 +26,6 @@ index e1ad994..d78655e 100644
      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

patches_treble/device_phh_treble/0007-treble-Securize-on-demand.patch

@@ -1,4 +1,4 @@
-From 4a2ed5f6bf414ac6d493f78c0ad89572b1aef5f2 Mon Sep 17 00:00:00 2001
+From e3df20ed1f82e8cefe0914bdf7a6cb0b34736c25 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/9] treble: Securize on-demand
@@ -8,14 +8,14 @@ Status is stored in /metadata and controlled by persist prop
 Change-Id: I8069b6f471ad87ab34c18b743689ab3584cee35b
 ---
  phh-prop-handler.sh | 14 ++++++++++++++
- vndk.rc             |  2 ++
+ vndk.rc             |  3 +++
- 2 files changed, 16 insertions(+)
+ 2 files changed, 17 insertions(+)
 
 diff --git a/phh-prop-handler.sh b/phh-prop-handler.sh
-index 4371632..a8cea3f 100644
+index 32a1f19..a6ddab8 100644
 --- a/phh-prop-handler.sh
 +++ b/phh-prop-handler.sh
-@@ -210,3 +210,17 @@ if [ "$1" == "persist.sys.phh.disable_soundvolume_effect" ];then
+@@ -218,3 +218,17 @@ if [ "$1" == "persist.bluetooth.system_audio_hal.enabled" ]; then
      restartAudio
      exit
  fi
@@ -34,13 +34,14 @@ index 4371632..a8cea3f 100644
 +    exit
 +fi
 diff --git a/vndk.rc b/vndk.rc
-index d1fffde..7db62b7 100644
+index 478bc37..674977d 100644
 --- a/vndk.rc
 +++ b/vndk.rc
-@@ -82,3 +82,5 @@ on property:sys.phh.uninstall-ota=true
+@@ -81,3 +81,6 @@ service watchdogd-gsi /system/bin/watchdogd 10 20
- on property:ro.vendor.radio.default_network=*
+     class core
-     setprop ro.telephony.default_network ${ro.vendor.radio.default_network}
+     oneshot
- 
+     seclabel u:r:watchdogd:s0
++
 +on property:persist.sys.phh.securize=*
 +    exec u:r:phhsu_daemon:s0 root -- /system/bin/phh-prop-handler.sh "persist.sys.phh.securize"
 -- 

patches_treble/device_phh_treble/0008-treble-Also-use-data-adb-for-securize-status.patch

@@ -1,4 +1,4 @@
-From c8537ab48366a14bf90706fc44667fc1b6003b73 Mon Sep 17 00:00:00 2001
+From adbae267d33896e4904b95d0960e6f118c91e265 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Wed, 22 Mar 2023 23:37:05 +0000
 Subject: [PATCH 8/9] treble: Also use /data/adb for securize status
@@ -10,10 +10,10 @@ Change-Id: I778f2be5407ae0a548a098c72031cce9be83cf96
  2 files changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/phh-prop-handler.sh b/phh-prop-handler.sh
-index a8cea3f..3739eb4 100644
+index a6ddab8..0ad7a1f 100644
 --- a/phh-prop-handler.sh
 +++ b/phh-prop-handler.sh
-@@ -217,10 +217,13 @@ if [ "$1" == "persist.sys.phh.securize" ];then
+@@ -225,10 +225,13 @@ if [ "$1" == "persist.sys.phh.securize" ];then
      fi
  
      if [[ "$prop_value" == "true" ]]; then
@@ -29,10 +29,10 @@ index a8cea3f..3739eb4 100644
      exit
  fi
 diff --git a/rw-system.sh b/rw-system.sh
-index d78655e..7291547 100644
+index 9c7cc42..8a188f7 100644
 --- a/rw-system.sh
 +++ b/rw-system.sh
-@@ -735,7 +735,7 @@ copyprop() {
+@@ -739,7 +739,7 @@ copyprop() {
          resetprop_phh "$1" "$(getprop "$2")"
      fi
  }

patches_treble/device_phh_treble/0009-treble-Include-androidx.window.extensions.patch

@@ -1,4 +1,4 @@
-From 267d881c8ad8a6626ea64768b20e0a86897091a8 Mon Sep 17 00:00:00 2001
+From ada7dfd43781e97480001f24365a76d55548928f Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Fri, 24 Mar 2023 00:13:01 +0000
 Subject: [PATCH 9/9] treble: Include androidx.window.extensions
@@ -11,13 +11,13 @@ Change-Id: I2503c1c510151ea8463c86521a9164727467c551
  1 file changed, 4 insertions(+)
 
 diff --git a/base.mk b/base.mk
-index 17bfdc3..49c4da6 100644
+index 98a8c59..aea10fa 100644
 --- a/base.mk
 +++ b/base.mk
-@@ -255,3 +255,7 @@ PRODUCT_COPY_FILES += \
+@@ -257,3 +257,7 @@ PRODUCT_PACKAGES += \
- # QCOM in-call audio fix as a standalone app
+ 
  PRODUCT_PACKAGES += \
-     QcRilAm
+ 	slsi-booted
 +
 +# Two-pane layout in Settings
 +PRODUCT_PACKAGES += \

patches_treble_td/platform_bionic/0001-Disable-vndklite-handling.patch

@@ -1,7 +1,7 @@
-From 5e1a02d51745e80b32a720c907ad335e7273cb52 Mon Sep 17 00:00:00 2001
+From 26b9c0d76d940676fc12d7f27c13180a4d4bd8e1 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 27 Oct 2021 14:39:29 -0400
-Subject: [PATCH 1/3] Disable vndklite handling
+Subject: [PATCH 1/4] Disable vndklite handling
 
 Change-Id: Ic4474cf80fc4b45a9a2760dd51e2ca29c4d961e2
 ---
@@ -32,5 +32,5 @@ index 5df379936..ceaba7d95 100644
    size_t insert_pos = ld_config_file_vndk.find_last_of('.');
    if (insert_pos == std::string::npos) {
 -- 
-2.25.1
+2.34.1
 

patches_treble_td/platform_bionic/0002-Add-new-mechanism-to-fake-vendor-props-on-a-per-proc.patch

@@ -1,7 +1,7 @@
-From 86e0672d6cac30d38a9f0a7260e6a6f265dcc866 Mon Sep 17 00:00:00 2001
+From 3cc1f7f548906eaac5f7347c897494fc10ad6aa9 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 19 Feb 2022 08:20:25 -0500
-Subject: [PATCH 2/3] Add new mechanism to fake vendor props on a per-process
+Subject: [PATCH 2/4] Add new mechanism to fake vendor props on a per-process
  basis
 
 This reads debug.phh.props.<process name>. If its value is "vendor",
@@ -74,5 +74,5 @@ index 1cb15c3df..d6e7e3e68 100644
  
    if (pi != nullptr) {
 -- 
-2.25.1
+2.34.1
 

patches_treble_td/platform_bionic/0003-Rework-property-overriding.patch

@@ -1,7 +1,7 @@
-From 4daa38527f099ce9826ced79afbd84cab2e0f6c7 Mon Sep 17 00:00:00 2001
+From 8b21b5d2efbe2d2c7966885342ed093a43f74af9 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 19 Jan 2023 16:44:01 -0500
-Subject: [PATCH 3/3] Rework property overriding
+Subject: [PATCH 3/4] Rework property overriding
 
 - Support property read with callback in addition to previous
   constant-size property_get
@@ -141,5 +141,5 @@ index d6e7e3e68..40ff48bad 100644
  
    if (pi != nullptr) {
 -- 
-2.25.1
+2.34.1
 

patches_treble_td/platform_bionic/0004-Add-some-properties-to-fake-in-keymaster-prop-replac.patch

@@ -0,0 +1,31 @@
+From b9ad9ef613bcc1c7fb7713b5091e98343669d393 Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Sun, 28 May 2023 16:46:46 -0400
+Subject: [PATCH 4/4] Add some properties to fake in "keymaster" prop
+ replacement mode, to expose unlocked vbmeta state and orange
+ verifiedbootstate
+
+---
+ libc/system_properties/system_properties.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/libc/system_properties/system_properties.cpp b/libc/system_properties/system_properties.cpp
+index 40ff48bad..057199318 100644
+--- a/libc/system_properties/system_properties.cpp
++++ b/libc/system_properties/system_properties.cpp
+@@ -121,6 +121,12 @@ static const char* redirectToProp(const char *name) {
+     if(strcmp(name, "ro.build.version.security_patch") == 0) {
+       return "ro.keymaster.xxx.security_patch";
+     }
++    if(strcmp(name, "ro.boot.vbmeta.device_state") == 0) {
++      return "ro.keymaster.xxx.vbmeta_state";
++    }
++    if(strcmp(name, "ro.boot.verifiedbootstate") == 0) {
++      return "ro.keymaster.xxx.verifiedbootstate";
++    }
+   }
+   return name;
+ }
+-- 
+2.34.1
+

patches_treble_td/platform_frameworks_av/0001-APM-Restore-S-R-and-Q-behavior-respectively-for-tele.patch

@@ -1,7 +1,7 @@
-From 210f25d815fae5cdbcaf2381b4a704f30013716a Mon Sep 17 00:00:00 2001
+From cb6c37a57fcbfe2b78ec56effe1f881ea6a5a8d5 Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Thu, 18 Aug 2022 15:44:46 -0400
-Subject: [PATCH 01/27] APM: Restore S, R and Q behavior respectively for
+Subject: [PATCH 01/26] APM: Restore S, R and Q behavior respectively for
  telephony audio
 
 This conditionally reverts part of b2e5cb (T), 51c9cc (S) and afd4ce (R)
@@ -36,7 +36,7 @@ Change-Id: I56d36d2aef4319935cb88a3e4771b23c6d5b2145
  2 files changed, 143 insertions(+), 57 deletions(-)
 
 diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
-index 4573382a06..b7d0dbcca4 100644
+index f625fdb3be..6c45696005 100644
 --- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
 +++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
 @@ -675,6 +675,17 @@ status_t AudioPolicyManager::updateCallRoutingInternal(
@@ -148,7 +148,7 @@ index 4573382a06..b7d0dbcca4 100644
  bool AudioPolicyManager::isDeviceOfModule(
          const sp<DeviceDescriptor>& devDesc, const char *moduleId) const {
      sp<HwModule> module = mHwModules.getModuleFromName(moduleId);
-@@ -4541,78 +4605,97 @@ status_t AudioPolicyManager::createAudioPatchInternal(const struct audio_patch *
+@@ -4550,78 +4614,97 @@ status_t AudioPolicyManager::createAudioPatchInternal(const struct audio_patch *
                  // in config XML to reach the sink so that is can be declared as available.
                  audio_io_handle_t output = AUDIO_IO_HANDLE_NONE;
                  sp<SwAudioOutputDescriptor> outputDesc;

patches_treble_td/platform_frameworks_av/0002-Fix-BT-in-call-on-CAF-devices.patch

@@ -1,7 +1,7 @@
-From 135ca4926b066565661b999ddc93aec82f54579e Mon Sep 17 00:00:00 2001
+From b2067fffebd035a5649a22e7f9887517e3c4c74e Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 5 Aug 2019 18:09:50 +0200
-Subject: [PATCH 02/27] Fix BT in-call on CAF devices
+Subject: [PATCH 02/26] Fix BT in-call on CAF devices
 
 See https://github.com/phhusson/treble_experimentations/issues/374
 

patches_treble_td/platform_frameworks_av/0003-Add-partial-cam-id-is-hardcoded-support-for-Asus-ZF6.patch

@@ -1,7 +1,7 @@
-From 1b41c02cc71aeda0b3c17d17059a3848ad7f369a Mon Sep 17 00:00:00 2001
+From 6c82041ec3be8a58afbbb506b97eb4527e58e814 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 1 Oct 2019 13:35:49 +0200
-Subject: [PATCH 03/27] Add (partial, cam id is hardcoded) support for Asus ZF6
+Subject: [PATCH 03/26] Add (partial, cam id is hardcoded) support for Asus ZF6
  motor camera
 
 Change-Id: Iea6e1370780a1d16f728748d1d948d092532d8fe
@@ -11,7 +11,7 @@ Change-Id: Iea6e1370780a1d16f728748d1d948d092532d8fe
  2 files changed, 29 insertions(+)
 
 diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
-index 3f8a0317e1..688c1e7270 100644
+index bfd3120f73..653666b15c 100644
 --- a/services/camera/libcameraservice/CameraService.cpp
 +++ b/services/camera/libcameraservice/CameraService.cpp
 @@ -26,6 +26,7 @@
@@ -30,7 +30,7 @@ index 3f8a0317e1..688c1e7270 100644
          mEventLog(DEFAULT_EVENT_LOG_LENGTH),
          mNumberOfCameras(0),
          mNumberOfCamerasWithoutSystemCamera(0),
-@@ -2039,6 +2041,7 @@ Status CameraService::connectHelper(const sp<CALLBACK>& cameraCb, const String8&
+@@ -2044,6 +2046,7 @@ Status CameraService::connectHelper(const sp<CALLBACK>& cameraCb, const String8&
              mServiceLock.lock();
          } else {
              // Otherwise, add client to active clients list
@@ -38,7 +38,7 @@ index 3f8a0317e1..688c1e7270 100644
              finishConnectLocked(client, partial, oomScoreOffset, systemNativeClient);
          }
  
-@@ -2157,6 +2160,27 @@ status_t CameraService::addOfflineClient(String8 cameraId, sp<BasicClient> offli
+@@ -2163,6 +2166,27 @@ status_t CameraService::addOfflineClient(String8 cameraId, sp<BasicClient> offli
      return OK;
  }
  
@@ -66,7 +66,7 @@ index 3f8a0317e1..688c1e7270 100644
  Status CameraService::turnOnTorchWithStrengthLevel(const String16& cameraId, int32_t torchStrength,
          const sp<IBinder>& clientBinder) {
      Mutex::Autolock lock(mServiceLock);
-@@ -3388,6 +3412,8 @@ binder::Status CameraService::BasicClient::disconnect() {
+@@ -3394,6 +3418,8 @@ binder::Status CameraService::BasicClient::disconnect() {
      }
      mDisconnected = true;
  
@@ -76,7 +76,7 @@ index 3f8a0317e1..688c1e7270 100644
      sCameraService->logDisconnected(mCameraIdStr, mClientPid, String8(mClientPackageName));
      sCameraService->mCameraProviderManager->removeRef(CameraProviderManager::DeviceMode::CAMERA,
 diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h
-index 840e9b6412..b15f988d9e 100644
+index 70293f4c5b..4ab725230c 100644
 --- a/services/camera/libcameraservice/CameraService.h
 +++ b/services/camera/libcameraservice/CameraService.h
 @@ -227,6 +227,9 @@ public:

patches_treble_td/platform_frameworks_av/0004-APM-Optionally-force-load-audio-policy-for-system-si.patch

@@ -1,7 +1,7 @@
-From 59a7bf23df24f65402cab9df4bdfc0489f51a913 Mon Sep 17 00:00:00 2001
+From 52e8dbd65b0e119ea95d4c77d6aa71983d14f07c Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Wed, 24 Aug 2022 15:42:39 -0400
-Subject: [PATCH 04/27] APM: Optionally force-load audio policy for system-side
+Subject: [PATCH 04/26] APM: Optionally force-load audio policy for system-side
  bt audio HAL
 
 Required to support our system-side bt audio implementation, i.e.

patches_treble_td/platform_frameworks_av/0005-APM-Remove-A2DP-audio-ports-from-the-primary-HAL.patch

@@ -1,7 +1,7 @@
-From dd0a14fbd41d80fc3a2abdf0e09d9ef88900b327 Mon Sep 17 00:00:00 2001
+From d8562da99ed769e3bdadacb95e9bb5d0d47607cb Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Thu, 25 Aug 2022 13:30:29 -0400
-Subject: [PATCH 05/27] APM: Remove A2DP audio ports from the primary HAL
+Subject: [PATCH 05/26] APM: Remove A2DP audio ports from the primary HAL
 
 These ports defined in the primary HAL are intended for A2DP offloading,
 however they do not work in general on GSIs, and will interfere with

patches_treble_td/platform_frameworks_av/0006-audiopolicy-try-again-with-trimmed-audio-port-name-i.patch

@@ -1,7 +1,7 @@
-From 997d411b208d12e76a6da8197ad92483a925a3a8 Mon Sep 17 00:00:00 2001
+From 073693679231981063a1f72494f611197e87e1eb Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Thu, 23 Jan 2020 11:13:43 +0800
-Subject: [PATCH 06/27] audiopolicy: try again with trimmed audio port name if
+Subject: [PATCH 06/26] audiopolicy: try again with trimmed audio port name if
  not found
 
 * In Spreadtrum BSP, some audio routes may contain ports with extra

patches_treble_td/platform_frameworks_av/0007-camera-Implement-property-to-override-default-camera.patch

@@ -1,7 +1,7 @@
-From 17cda9abd3ce0eb6571565ac6f4c8f5222fb3587 Mon Sep 17 00:00:00 2001
+From 6f1e2e575733e8720adb3f7076a58604a74d6cff Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Wed, 1 Jun 2022 16:56:46 -0400
-Subject: [PATCH 07/27] camera: Implement property to override default camera
+Subject: [PATCH 07/26] camera: Implement property to override default camera
 
 Complement to the frameworks/base patch.
 
@@ -11,7 +11,7 @@ Change-Id: I002bfa974bafc2cc01365eeea31c7a5dcb5a2028
  1 file changed, 22 insertions(+)
 
 diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
-index 3132787608..5e1ba965b7 100644
+index 43f92a9927..d9fc2ef135 100644
 --- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
 +++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
 @@ -36,6 +36,7 @@

patches_treble_td/platform_frameworks_av/0008-There-are-three-SCO-devices.-Fallback-from-one-to-th.patch

@@ -1,7 +1,7 @@
-From 0cd9a1341279236b0b49129afbfab7b534cd6870 Mon Sep 17 00:00:00 2001
+From 6a19995756f43d79a6cc5588849e6b4dbc537f92 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 13 Apr 2020 21:01:16 +0200
-Subject: [PATCH 08/27] There are three SCO devices. Fallback from one to the
+Subject: [PATCH 08/26] There are three SCO devices. Fallback from one to the
  others if needed
 
 Change-Id: I414dcb6b154855c00cb8520b23dc1069827864b2

patches_treble_td/platform_frameworks_av/0009-Add-persist.sys.phh.samsung.camera_ids-property-to-a.patch

@@ -1,7 +1,7 @@
-From d85a10ed9a1171b94eebb7d43bd1124aa38a4009 Mon Sep 17 00:00:00 2001
+From 5b1cae905f25ba99cc7c85a94a519fb80fa9d5eb Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 14 May 2020 19:54:55 +0200
-Subject: [PATCH 09/27] Add persist.sys.phh.samsung.camera_ids property to
+Subject: [PATCH 09/26] Add persist.sys.phh.samsung.camera_ids property to
  access hidden Samsung cameras
 
 Change-Id: I2c7bf535272acc28ed2277e96c78ddd28a0b4593
@@ -23,7 +23,7 @@ index 981c56942c..7c4e4d9bcd 100644
      ],
  
 diff --git a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
-index 1df6ec4449..ac579b4f7d 100644
+index 630090b4ac..1acf9c2990 100644
 --- a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
 +++ b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
 @@ -27,6 +27,7 @@

patches_treble_td/platform_frameworks_av/0010-Add-a-property-to-force-camera-timestamp-source.patch

@@ -1,7 +1,7 @@
-From 2b7924156adfdbf101b94aff0b11f29378d074c5 Mon Sep 17 00:00:00 2001
+From 2562c9ac80280aaaa4bad2faadc04a43251296be Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 19 May 2020 14:01:14 +0200
-Subject: [PATCH 11/27] Add a property to force camera timestamp source
+Subject: [PATCH 10/26] Add a property to force camera timestamp source
 
 Some devices wrongly report their timesource
 Camera's timesource can either be CLOCK_MONOTONIC, or CLOCK_BOOTTIME
@@ -18,10 +18,10 @@ timestamp source.
  1 file changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
-index 48cc2280ff..830ab0aa9f 100644
+index 6fb7dfd71f..082428beb0 100644
 --- a/services/camera/libcameraservice/device3/Camera3Device.cpp
 +++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
-@@ -191,8 +191,16 @@ status_t Camera3Device::initializeCommonLocked() {
+@@ -194,8 +194,16 @@ status_t Camera3Device::initializeCommonLocked() {
      mTimestampOffset = getMonoToBoottimeOffset();
      camera_metadata_entry timestampSource =
              mDeviceInfo.find(ANDROID_SENSOR_INFO_TIMESTAMP_SOURCE);

patches_treble_td/platform_frameworks_av/0010-Camera-Avoid-unnecessary-close-of-buffer-acquire-fen.patch

@@ -1,43 +0,0 @@
-From 6af7e6d774b0a2797cf0844bbcf866fe614af127 Mon Sep 17 00:00:00 2001
-From: Emilian Peev <epeev@google.com>
-Date: Fri, 5 Aug 2022 17:28:06 -0700
-Subject: [PATCH 10/27] Camera: Avoid unnecessary close of buffer acquire fence
- fds
-
-According to the gralloc lock documentation:
-The ownership of acquireFence is always transferred to the callee, even
-on errors.
-
-Bug: 241455881
-Test: Manual using camera application
-Change-Id: Ieec34b54aaa7f0d773eccb593c3daaa3e41bae0b
-Merged-In: Ieec34b54aaa7f0d773eccb593c3daaa3e41bae0b
----
- .../camera/libcameraservice/device3/Camera3OutputStream.cpp   | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/services/camera/libcameraservice/device3/Camera3OutputStream.cpp b/services/camera/libcameraservice/device3/Camera3OutputStream.cpp
-index 396104c4fd..c725aadb79 100644
---- a/services/camera/libcameraservice/device3/Camera3OutputStream.cpp
-+++ b/services/camera/libcameraservice/device3/Camera3OutputStream.cpp
-@@ -331,7 +331,7 @@ status_t Camera3OutputStream::fixUpHidlJpegBlobHeader(ANativeWindowBuffer* anwBu
-     status_t res =
-             gbLocker.lockAsync(
-                     GraphicBuffer::USAGE_SW_READ_OFTEN | GraphicBuffer::USAGE_SW_WRITE_RARELY,
--                    &mapped, fenceFd.get());
-+                    &mapped, fenceFd.release());
-     if (res != OK) {
-         ALOGE("%s: Failed to lock the buffer: %s (%d)", __FUNCTION__, strerror(-res), res);
-         return res;
-@@ -1327,7 +1327,7 @@ void Camera3OutputStream::dumpImageToDisk(nsecs_t timestamp,
-     void* mapped = nullptr;
-     base::unique_fd fenceFd(dup(fence));
-     status_t res = graphicBuffer->lockAsync(GraphicBuffer::USAGE_SW_READ_OFTEN, &mapped,
--            fenceFd.get());
-+            fenceFd.release());
-     if (res != OK) {
-         ALOGE("%s: Failed to lock the buffer: %s (%d)", __FUNCTION__, strerror(-res), res);
-         return;
--- 
-2.34.1
-

patches_treble_td/platform_frameworks_av/0011-FIH-devices-Fix-Earpiece-audio-output.patch

@@ -1,7 +1,7 @@
-From 92ed24d529880069ae92c2ace3a8a0d857f92a8a Mon Sep 17 00:00:00 2001
+From 85c4a39093b25f29812543429344fe0f4ae3df36 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 24 Apr 2018 00:14:28 +0200
-Subject: [PATCH 12/27] FIH devices: Fix "Earpiece" audio output
+Subject: [PATCH 11/26] FIH devices: Fix "Earpiece" audio output
 
 On some FIH devices (confirmed on Razer, and probably on Aquos SS2),
 Earpiece is not listed in attachedDevices, and devicePort's profile

patches_treble_td/platform_frameworks_av/0012-No-longer-make-re-assigning-legacy-audio-groups-fata.patch

@@ -1,7 +1,7 @@
-From 4bc269b014047a61d649b2722144c09b123c7818 Mon Sep 17 00:00:00 2001
+From 870ab4cd819f5e1fcd365f78eb3b878aed8cfb79 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 12 Sep 2020 12:32:50 +0200
-Subject: [PATCH 13/27] No longer make re-assigning legacy audio groups fatal.
+Subject: [PATCH 12/26] No longer make re-assigning legacy audio groups fatal.
  Mi9 declares AUDIO_STREAM_PATCH and AUDIO_STREAM_REROUTING which is defined
  by framework too
 

patches_treble_td/platform_frameworks_av/0013-Make-camera-IDs-filter-out-optional.patch

@@ -1,7 +1,7 @@
-From 3e0ed9d77b0856878315c4c784d342ee284b24ea Mon Sep 17 00:00:00 2001
+From 0f756fe5abcc7f88525d6c99ac6b1ba5c24a24a8 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 21 Dec 2020 20:19:11 +0100
-Subject: [PATCH 14/27] Make camera IDs filter-out optional
+Subject: [PATCH 13/26] Make camera IDs filter-out optional
 
 Nowadays most people have Camera 2 apps, and would like to have all
 cameras, rather than limit which cameras are available.
@@ -11,7 +11,7 @@ Add a property for that.
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
-index 5e1ba965b7..2cb27f4ee5 100644
+index d9fc2ef135..292342238d 100644
 --- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
 +++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
 @@ -260,7 +260,9 @@ std::vector<std::string> CameraProviderManager::getAPI1CompatibleCameraDeviceIds

patches_treble_td/platform_frameworks_av/0014-Support-Samsung-R-multi-cams.patch

@@ -1,7 +1,7 @@
-From 6449c086ae493c949106ee7ad79251b3ba21506d Mon Sep 17 00:00:00 2001
+From 16a72adcdbf2e9769deb88ed369d88a4103e7913 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 13 Mar 2021 14:20:03 -0500
-Subject: [PATCH 15/27] Support Samsung R multi-cams
+Subject: [PATCH 14/26] Support Samsung R multi-cams
 
 Change-Id: If46f385e8dd16185cbf37ab083e6a1242e1d1555
 ---
@@ -22,7 +22,7 @@ index 7c4e4d9bcd..1faeb60ba7 100644
      ],
  
 diff --git a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
-index ac579b4f7d..070c9aeeae 100644
+index 1acf9c2990..367ffb8cdc 100644
 --- a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
 +++ b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
 @@ -28,6 +28,7 @@

patches_treble_td/platform_frameworks_av/0015-Don-t-crash-on-unknown-audio-devices.patch

@@ -1,7 +1,7 @@
-From a359f6ea0efe0f07163c7920448440a9f2725348 Mon Sep 17 00:00:00 2001
+From 6d192a969db7a9e24cd597f0f0f274390473cf5d Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 23 Mar 2021 00:16:42 +0100
-Subject: [PATCH 16/27] Don't crash on unknown audio devices
+Subject: [PATCH 15/26] Don't crash on unknown audio devices
 
 Change-Id: I2df8d88f742da6a84aa8888cdf19de25444de919
 ---

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

@@ -1,7 +1,7 @@
-From 0879f806e8a6da5dc751de71c3c57342cd16ea5d Mon Sep 17 00:00:00 2001
+From b2f7b7bbbd9eb1943c7f14bd2a9158c8ee10937d Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 28 Mar 2021 18:54:47 +0200
-Subject: [PATCH 17/27] Not all sources in a route are valid. Dont ignore the
+Subject: [PATCH 16/26] Not all sources in a route are valid. Dont ignore the
  whole route because of one broken source
 
 Change-Id: If8a51740e71bef3a4738262ad7b43a337b0ec36d

patches_treble_td/platform_frameworks_av/0017-Use-a-fake-volume-policy-when-none-has-been-found.patch

@@ -1,7 +1,7 @@
-From f58ed8113a8bb271a3180f3f140b67f7e8ad5fe8 Mon Sep 17 00:00:00 2001
+From 71a2e7c525ff8c93a678c0c9baa3b43dc725de4c Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 28 Mar 2021 14:48:49 +0200
-Subject: [PATCH 18/27] Use a fake volume policy when none has been found
+Subject: [PATCH 17/26] Use a fake volume policy when none has been found
 
 This is useful, because on Samsung devices, the "real"
 (=non-gsi-cheating) audio policy doesn't have any volume policy.

patches_treble_td/platform_frameworks_av/0018-When-aux-cameras-are-enabled-ignore-system-only-came.patch

@@ -1,7 +1,7 @@
-From c9c0a6cc8fd9479853c1d06cec72aa796ce7023c Mon Sep 17 00:00:00 2001
+From 5809e5b3935b98d46a81e3e4fe684d878668d400 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 7 Aug 2021 11:11:39 +0200
-Subject: [PATCH 19/27] When aux cameras are enabled, ignore "system only"
+Subject: [PATCH 18/26] When aux cameras are enabled, ignore "system only"
  camera flag (it shouldnt be q security issue since secure cameras are listed
  otherwise)
 
@@ -10,7 +10,7 @@ Subject: [PATCH 19/27] When aux cameras are enabled, ignore "system only"
  1 file changed, 6 insertions(+), 4 deletions(-)
 
 diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
-index 2cb27f4ee5..99fc7247b0 100644
+index 292342238d..4a2fb94da3 100644
 --- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
 +++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
 @@ -978,10 +978,12 @@ SystemCameraKind CameraProviderManager::ProviderInfo::DeviceInfo3::getSystemCame

patches_treble_td/platform_frameworks_av/0019-Revert-Remove-support-for-audio-HAL-V2-from-the-fram.patch

@@ -1,7 +1,7 @@
-From 53784b10ffda24be164ef134b91ffca3d08954da Mon Sep 17 00:00:00 2001
+From 8e3d68f0c713c4a759421a7981661bbde249e8ef Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 11 Oct 2021 16:10:42 -0400
-Subject: [PATCH 20/27] Revert "Remove support for audio HAL V2 from the
+Subject: [PATCH 19/26] Revert "Remove support for audio HAL V2 from the
  framework"
 
 This reverts commit cbf517f837f7bf8a59f3ff8aa1e0e3e19612e251.

patches_treble_td/platform_frameworks_av/0020-Fix-parsing-audio-hal-7.0-audio-policies.patch

@@ -1,7 +1,7 @@
-From b9bf555e37b304194c602e4eeb806fad45ad77ba Mon Sep 17 00:00:00 2001
+From bbce086c423807c7b0566bf4a6167cd234ac1b8f Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 30 Jan 2022 07:40:19 -0500
-Subject: [PATCH 21/27] Fix parsing audio hal 7.0 audio policies
+Subject: [PATCH 20/26] Fix parsing audio hal 7.0 audio policies
 
 Google changed separator from natural "," to weird " "
 We broke its support in "FIH devices: Fix "Earpiece" audio output"

patches_treble_td/platform_frameworks_av/0021-fixup-Not-all-sources-in-a-route-are-valid.-Dont-ign.patch

@@ -1,7 +1,7 @@
-From 92c8febfbe746f602e91f3be74538eac3a9f9907 Mon Sep 17 00:00:00 2001
+From dce9b06ef349b7f63fb048e20c6e537db290e53e Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 12 Mar 2022 18:07:43 -0500
-Subject: [PATCH 22/27] fixup! Not all sources in a route are valid. Dont
+Subject: [PATCH 21/26] fixup! Not all sources in a route are valid. Dont
  ignore the whole route because of one broken source
 
 ---

patches_treble_td/platform_frameworks_av/0022-Add-a-prop-to-change-Samsung-flash-strength.patch

@@ -1,7 +1,7 @@
-From 9df56d42780a25e76bf020eeee234de665fa58e3 Mon Sep 17 00:00:00 2001
+From 8e6856f46c09f34adde7f29d82a061b82f8ad061 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 16 Apr 2022 14:30:14 -0400
-Subject: [PATCH 23/27] Add a prop to change Samsung flash strength
+Subject: [PATCH 22/26] Add a prop to change Samsung flash strength
 
 ---
  services/camera/libcameraservice/Android.bp        |  1 +
@@ -21,7 +21,7 @@ index 1faeb60ba7..8c588065cf 100644
      ],
  
 diff --git a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
-index 070c9aeeae..41830f2c82 100644
+index 367ffb8cdc..362945a1ea 100644
 --- a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
 +++ b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
 @@ -29,6 +29,7 @@

patches_treble_td/platform_frameworks_av/0023-Support-variable-flash-strength-on-samsung-hal-4.0.patch

@@ -1,7 +1,7 @@
-From 32b048f47465f94e2a4f75c975cd7697715c4c58 Mon Sep 17 00:00:00 2001
+From af599ed508e955ecf25492020b4f6f6bf08abdce Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 2 May 2022 17:37:09 -0400
-Subject: [PATCH 24/27] Support variable flash strength on samsung hal 4.0
+Subject: [PATCH 23/26] Support variable flash strength on samsung hal 4.0
 
 ---
  services/camera/libcameraservice/Android.bp                 | 1 +
@@ -21,7 +21,7 @@ index 8c588065cf..769862aaa2 100644
      ],
  
 diff --git a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
-index 41830f2c82..a84b58201c 100644
+index 362945a1ea..62c57cd4f7 100644
 --- a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
 +++ b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
 @@ -30,6 +30,7 @@

patches_treble_td/platform_frameworks_av/0024-voip-Fix-high-pitched-voice-on-Qualcomm-devices.patch

@@ -1,7 +1,7 @@
-From a4c965105e5684d1990b8d1ba26252dc09103815 Mon Sep 17 00:00:00 2001
+From 091266e8f3534f3fc0d20a0d8f14fa1ab3a1cab8 Mon Sep 17 00:00:00 2001
 From: ponces <ponces26@gmail.com>
 Date: Mon, 24 Oct 2022 09:38:34 +0100
-Subject: [PATCH 25/27] voip: Fix high pitched voice on Qualcomm devices
+Subject: [PATCH 24/26] voip: Fix high pitched voice on Qualcomm devices
 
 ---
  .../common/managerdefinitions/src/Serializer.cpp         | 9 +++++++++

patches_treble_td/platform_frameworks_av/0025-Fix-audio-hal-2.0-support.-Fixup-of-Revert-Remove-su.patch

@@ -1,7 +1,7 @@
-From 52aaedd8730d117a34ad3fc40a808d218dfcce59 Mon Sep 17 00:00:00 2001
+From c484da1761e5fa9df14b81ca95deaf51dcdd3a47 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 9 Nov 2022 17:10:52 -0500
-Subject: [PATCH 26/27] Fix audio hal 2.0 support. Fixup of Revert "Remove
+Subject: [PATCH 25/26] Fix audio hal 2.0 support. Fixup of Revert "Remove
  support for audio HAL V2 from the framework"
 
 ---

patches_treble_td/platform_frameworks_av/0026-audiopolicy-Fix-broken-mic-while-video-recording-on-.patch

@@ -0,0 +1,64 @@
+From fdd219ba505320ea7f065f8b1f3a8166c6847453 Mon Sep 17 00:00:00 2001
+From: Alberto Ponces <ponces26@gmail.com>
+Date: Sun, 30 Apr 2023 23:29:04 +0100
+Subject: [PATCH 26/26] audiopolicy: Fix broken mic while video recording on
+ some Exynos devices This should fix
+ https://github.com/phhusson/treble_experimentations/issues/2021 and
+ https://github.com/phhusson/treble_experimentations/issues/2384. Credits to
+ @haridhayal11.
+
+---
+ .../managerdefinitions/src/Serializer.cpp     | 29 ++++++++++++-------
+ 1 file changed, 18 insertions(+), 11 deletions(-)
+
+diff --git a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
+index ef310977b2..da2842656a 100644
+--- a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
++++ b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
+@@ -660,6 +660,9 @@ std::variant<status_t, RouteTraits::Element> PolicySerializer::deserialize<Route
+     }
+     route->setSink(sink);
+ 
++    // This fixes broken mic while video record on some Exynos devices
++    bool disableBackMic = property_get_bool("persist.sys.phh.disable_back_mic", false);
++
+     std::string sourcesAttr = getXmlAttribute(cur, Attributes::sources);
+     if (sourcesAttr.empty()) {
+         ALOGE("%s: No %s found", __func__, Attributes::sources);
+@@ -672,18 +675,22 @@ std::variant<status_t, RouteTraits::Element> PolicySerializer::deserialize<Route
+     char *devTag = strtok(sourcesLiteral.get(), ",");
+     while (devTag != NULL) {
+         if (strlen(devTag) != 0) {
+-            sp<PolicyAudioPort> source = ctx->findPortByTagName(devTag);
+-            if (source == NULL) {
+-                source = ctx->findPortByTagName(trim(devTag));
+-	    }
+-            if (source == NULL && false) {
+-                ALOGE("%s: no source found with name=%s", __func__, devTag);
+-                return BAD_VALUE;
+-            } else if (source == NULL) {
+-                ALOGW("Skipping route source \"%s\" as it likely has vendor extension type",
+-                        devTag);
++            if (disableBackMic && strcmp(devTag, "Built-In Back Mic") == 0) {
++                ALOGW("Skipping route source \"%s\" as it breaks video recording mic", devTag);
+             } else {
+-                sources.add(source);
++                sp<PolicyAudioPort> source = ctx->findPortByTagName(devTag);
++                if (source == NULL) {
++                    source = ctx->findPortByTagName(trim(devTag));
++                }
++                if (source == NULL && false) {
++                    ALOGE("%s: no source found with name=%s", __func__, devTag);
++                    return BAD_VALUE;
++                } else if (source == NULL) {
++                    ALOGW("Skipping route source \"%s\" as it likely has vendor extension type",
++                            devTag);
++                } else {
++                    sources.add(source);
++                }
+             }
+         }
+         devTag = strtok(NULL, ",");
+-- 
+2.34.1
+

patches_treble_td/platform_frameworks_av/0027-Allow-uname-syscall-in-all-seccomp-This-is-needed-be.patch

@@ -1,168 +0,0 @@
-From 1479c498dd8d720bdfc47c3e36653af9baa829d3 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Wed, 29 Mar 2023 16:53:18 -0400
-Subject: [PATCH 27/27] Allow uname syscall in all seccomp -- This is needed
- because of the getCallingSid change in fw/n libbinder
-
----
- services/mediacodec/seccomp_policy/mediacodec-arm.policy        | 2 ++
- services/mediacodec/seccomp_policy/mediacodec-arm64.policy      | 2 ++
- services/mediacodec/seccomp_policy/mediacodec-x86.policy        | 2 ++
- services/mediacodec/seccomp_policy/mediacodec-x86_64.policy     | 2 ++
- services/mediacodec/seccomp_policy/mediaswcodec-arm.policy      | 2 ++
- services/mediacodec/seccomp_policy/mediaswcodec-arm64.policy    | 2 ++
- services/mediacodec/seccomp_policy/mediaswcodec-x86.policy      | 2 ++
- services/mediacodec/seccomp_policy/mediaswcodec-x86_64.policy   | 2 ++
- .../mediaextractor/seccomp_policy/mediaextractor-arm.policy     | 2 ++
- .../mediaextractor/seccomp_policy/mediaextractor-arm64.policy   | 2 ++
- .../mediaextractor/seccomp_policy/mediaextractor-x86.policy     | 2 ++
- .../mediaextractor/seccomp_policy/mediaextractor-x86_64.policy  | 2 ++
- 12 files changed, 24 insertions(+)
-
-diff --git a/services/mediacodec/seccomp_policy/mediacodec-arm.policy b/services/mediacodec/seccomp_policy/mediacodec-arm.policy
-index b4a9ff6249..aa6fc70d45 100644
---- a/services/mediacodec/seccomp_policy/mediacodec-arm.policy
-+++ b/services/mediacodec/seccomp_policy/mediacodec-arm.policy
-@@ -58,6 +58,8 @@ ugetrlimit: 1
- getdents64: 1
- getrandom: 1
- 
-+uname: 1
-+
- @include /system/etc/seccomp_policy/crash_dump.arm.policy
- 
- @include /system/etc/seccomp_policy/code_coverage.arm.policy
-diff --git a/services/mediacodec/seccomp_policy/mediacodec-arm64.policy b/services/mediacodec/seccomp_policy/mediacodec-arm64.policy
-index b4a9ff6249..aa6fc70d45 100644
---- a/services/mediacodec/seccomp_policy/mediacodec-arm64.policy
-+++ b/services/mediacodec/seccomp_policy/mediacodec-arm64.policy
-@@ -58,6 +58,8 @@ ugetrlimit: 1
- getdents64: 1
- getrandom: 1
- 
-+uname: 1
-+
- @include /system/etc/seccomp_policy/crash_dump.arm.policy
- 
- @include /system/etc/seccomp_policy/code_coverage.arm.policy
-diff --git a/services/mediacodec/seccomp_policy/mediacodec-x86.policy b/services/mediacodec/seccomp_policy/mediacodec-x86.policy
-index 4bcc077ce8..3a08ff6f09 100644
---- a/services/mediacodec/seccomp_policy/mediacodec-x86.policy
-+++ b/services/mediacodec/seccomp_policy/mediacodec-x86.policy
-@@ -69,5 +69,7 @@ sched_yield: 1
- getpid: 1
- gettid: 1
- 
-+uname: 1
-+
- @include /system/etc/seccomp_policy/crash_dump.x86.policy
- @include /system/etc/seccomp_policy/code_coverage.x86.policy
-diff --git a/services/mediacodec/seccomp_policy/mediacodec-x86_64.policy b/services/mediacodec/seccomp_policy/mediacodec-x86_64.policy
-index 4bcc077ce8..3a08ff6f09 100644
---- a/services/mediacodec/seccomp_policy/mediacodec-x86_64.policy
-+++ b/services/mediacodec/seccomp_policy/mediacodec-x86_64.policy
-@@ -69,5 +69,7 @@ sched_yield: 1
- getpid: 1
- gettid: 1
- 
-+uname: 1
-+
- @include /system/etc/seccomp_policy/crash_dump.x86.policy
- @include /system/etc/seccomp_policy/code_coverage.x86.policy
-diff --git a/services/mediacodec/seccomp_policy/mediaswcodec-arm.policy b/services/mediacodec/seccomp_policy/mediaswcodec-arm.policy
-index 41efce08b1..3c74e077c6 100644
---- a/services/mediacodec/seccomp_policy/mediaswcodec-arm.policy
-+++ b/services/mediacodec/seccomp_policy/mediaswcodec-arm.policy
-@@ -86,4 +86,6 @@ getegid32: 1
- getgroups32: 1
- sysinfo: 1
- 
-+uname: 1
-+
- @include /apex/com.android.media.swcodec/etc/seccomp_policy/code_coverage.arm.policy
-diff --git a/services/mediacodec/seccomp_policy/mediaswcodec-arm64.policy b/services/mediacodec/seccomp_policy/mediaswcodec-arm64.policy
-index 4317cccfdd..9d9b11538f 100644
---- a/services/mediacodec/seccomp_policy/mediaswcodec-arm64.policy
-+++ b/services/mediacodec/seccomp_policy/mediaswcodec-arm64.policy
-@@ -90,4 +90,6 @@ sysinfo: 1
- setsockopt: 1
- sendmsg: 1
- 
-+uname: 1
-+
- @include /apex/com.android.media.swcodec/etc/seccomp_policy/code_coverage.arm64.policy
-diff --git a/services/mediacodec/seccomp_policy/mediaswcodec-x86.policy b/services/mediacodec/seccomp_policy/mediaswcodec-x86.policy
-index 9bafe7bc55..4d9192cfe9 100644
---- a/services/mediacodec/seccomp_policy/mediaswcodec-x86.policy
-+++ b/services/mediacodec/seccomp_policy/mediaswcodec-x86.policy
-@@ -69,5 +69,7 @@ sched_yield: 1
- getpid: 1
- gettid: 1
- 
-+uname: 1
-+
- @include /apex/com.android.media.swcodec/etc/seccomp_policy/crash_dump.x86.policy
- @include /apex/com.android.media.swcodec/etc/seccomp_policy/code_coverage.x86.policy
-diff --git a/services/mediacodec/seccomp_policy/mediaswcodec-x86_64.policy b/services/mediacodec/seccomp_policy/mediaswcodec-x86_64.policy
-index b0ed0402bb..607d8dadd8 100644
---- a/services/mediacodec/seccomp_policy/mediaswcodec-x86_64.policy
-+++ b/services/mediacodec/seccomp_policy/mediaswcodec-x86_64.policy
-@@ -69,5 +69,7 @@ sched_yield: 1
- getpid: 1
- gettid: 1
- 
-+uname: 1
-+
- @include /apex/com.android.media.swcodec/etc/seccomp_policy/crash_dump.x86_64.policy
- @include /apex/com.android.media.swcodec/etc/seccomp_policy/code_coverage.x86_64.policy
-diff --git a/services/mediaextractor/seccomp_policy/mediaextractor-arm.policy b/services/mediaextractor/seccomp_policy/mediaextractor-arm.policy
-index e1f7fe7265..435f76cf9d 100644
---- a/services/mediaextractor/seccomp_policy/mediaextractor-arm.policy
-+++ b/services/mediaextractor/seccomp_policy/mediaextractor-arm.policy
-@@ -60,5 +60,7 @@ mremap: arg3 == 3 || arg3 == MREMAP_MAYMOVE
- readlinkat: 1
- _llseek: 1
- 
-+uname: 1
-+
- @include /apex/com.android.media/etc/seccomp_policy/crash_dump.arm.policy
- @include /apex/com.android.media/etc/seccomp_policy/code_coverage.arm.policy
-diff --git a/services/mediaextractor/seccomp_policy/mediaextractor-arm64.policy b/services/mediaextractor/seccomp_policy/mediaextractor-arm64.policy
-index e54c9187e7..c2be7cf820 100644
---- a/services/mediaextractor/seccomp_policy/mediaextractor-arm64.policy
-+++ b/services/mediaextractor/seccomp_policy/mediaextractor-arm64.policy
-@@ -57,5 +57,7 @@ setsockopt: 1
- sendmsg: 1
- set_tid_address: 1
- 
-+uname: 1
-+
- @include /apex/com.android.media/etc/seccomp_policy/crash_dump.arm64.policy
- @include /apex/com.android.media/etc/seccomp_policy/code_coverage.arm64.policy
-diff --git a/services/mediaextractor/seccomp_policy/mediaextractor-x86.policy b/services/mediaextractor/seccomp_policy/mediaextractor-x86.policy
-index 5b3762712d..5897402ca1 100644
---- a/services/mediaextractor/seccomp_policy/mediaextractor-x86.policy
-+++ b/services/mediaextractor/seccomp_policy/mediaextractor-x86.policy
-@@ -59,5 +59,7 @@ sched_yield: 1
- getpid: 1
- gettid: 1
- 
-+uname: 1
-+
- @include /apex/com.android.media/etc/seccomp_policy/crash_dump.x86.policy
- @include /apex/com.android.media/etc/seccomp_policy/code_coverage.x86.policy
-diff --git a/services/mediaextractor/seccomp_policy/mediaextractor-x86_64.policy b/services/mediaextractor/seccomp_policy/mediaextractor-x86_64.policy
-index 51df1a238d..6846c01d0e 100644
---- a/services/mediaextractor/seccomp_policy/mediaextractor-x86_64.policy
-+++ b/services/mediaextractor/seccomp_policy/mediaextractor-x86_64.policy
-@@ -53,5 +53,7 @@ sched_yield: 1
- getpid: 1
- gettid: 1
- 
-+uname: 1
-+
- @include /apex/com.android.media/etc/seccomp_policy/crash_dump.x86_64.policy
- @include /apex/com.android.media/etc/seccomp_policy/code_coverage.x86_64.policy
--- 
-2.34.1
-

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

@@ -1,7 +1,7 @@
-From 8bb17811e9783cb9d05023b907463b4d8178ec79 Mon Sep 17 00:00:00 2001
+From 15e7893c7072a2d912a48dd2bec2b7ce368d6088 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/35] Fallback to stupid autobrightness if brightness values
+Subject: [PATCH 01/36] 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 fa812c163643..e8e2fc69e646 100644
+index c36c5b6c1e81..851162968dbe 100644
 --- a/services/core/java/com/android/server/display/DisplayDeviceConfig.java
 +++ b/services/core/java/com/android/server/display/DisplayDeviceConfig.java
-@@ -650,9 +650,14 @@ public class DisplayDeviceConfig {
+@@ -676,9 +676,14 @@ public class DisplayDeviceConfig {
       * @return A configuration instance.
       */
      public static DisplayDeviceConfig create(Context context, boolean useConfigXml) {

patches_treble_td/platform_frameworks_base/0002-Fix-env-empty-string-ANDROID_STORAGE.patch

@@ -1,7 +1,7 @@
-From 62fdde809e3ac3bb3dbfa22e64d84ffb6180d7a1 Mon Sep 17 00:00:00 2001
+From 5111abd8552dd2b97bc3ef436fc0b64001998a25 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/35] Fix env empty string - ANDROID_STORAGE
+Subject: [PATCH 02/36] 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
 ---

patches_treble_td/platform_frameworks_base/0003-Relax-requirement-for-visible-flag-to-sdcards.patch

@@ -1,7 +1,7 @@
-From 1e432153ed75c31abe94df1250ade6b3db515cfb Mon Sep 17 00:00:00 2001
+From 4236c37fb14996fef7e8341ede0a939f6afe61a0 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/35] Relax requirement for visible flag to sdcards
+Subject: [PATCH 03/36] 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,7 +13,7 @@ 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 c367dcec1b08..3680221b7f52 100644
+index c127a9f69caf..6885f2f2c583 100644
 --- a/services/core/java/com/android/server/StorageManagerService.java
 +++ b/services/core/java/com/android/server/StorageManagerService.java
 @@ -1616,7 +1616,8 @@ class StorageManagerService extends IStorageManager.Stub

patches_treble_td/platform_frameworks_base/0004-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch

@@ -1,7 +1,7 @@
-From 4628b7d028f66e72d2916cc1a28e05352284bf5b Mon Sep 17 00:00:00 2001
+From b90b81d2f3122e90da0ccdf0947289ed15aaf99d 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 04/35] Don't crash if there is IR HAL is not declared
+Subject: [PATCH 04/36] Don't crash if there is IR HAL is not declared
 
 Change-Id: I3afded27441bbee8244d5fda544b3e6d1238dc1b
 ---