Changes for April 2023, syncing up to 20230417

patches_platform/frameworks_base/0001-Add-SPenPointerOverlay.patch

@@ -1,7 +1,7 @@
-From 107b0eaf96413e3faac0bcbe7e761d98d3595d76 Mon Sep 17 00:00:00 2001
+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/24] Add SPenPointerOverlay
+Subject: [PATCH 01/23] Add SPenPointerOverlay
 
 Toggle this overlay with property "persist.ui.spen.pointer"
 

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

@@ -1,7 +1,7 @@
-From c37fef3e91e035f05f3a9a6ab2f744f6e2051b38 Mon Sep 17 00:00:00 2001
+From 80b9721f6e8da1f45ca5ebff8870f235efcb2c1e Mon Sep 17 00:00:00 2001
 From: AndyCGYan <GeForce8800Ultra@gmail.com>
 Date: Fri, 22 Mar 2019 00:41:20 +0800
-Subject: [PATCH 02/24] Disable FP lockouts optionally
+Subject: [PATCH 02/23] Disable FP lockouts optionally
 
 Both timed and permanent lockouts - GET THE FUCK OUT
 Now targeting LockoutFramework, introduced in Android 12

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

@@ -1,7 +1,7 @@
-From c51f1b93e9e69cd50959a7d5b8936adabbb98b8c Mon Sep 17 00:00:00 2001
+From 908593ecda65f87bbcbda662f9e35de0d7ba94f4 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/24] Disable vendor mismatch warning
+Subject: [PATCH 03/23] Disable vendor mismatch warning
 
 Change-Id: Ieb8fe91e2f02462f074312ed0f4885d183e9780b
 ---

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

@@ -1,7 +1,7 @@
-From 53944713b59f662f2a19ea3ccd3cfdcec9f3593a Mon Sep 17 00:00:00 2001
+From e08d2afd0c6663e9d439b9371d9aba20f3e566e5 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/24] Keyguard: Fix colors of slices not updating on doze
+Subject: [PATCH 04/23] Keyguard: Fix colors of slices not updating on doze
 
 Slices were invisible (black) in doze when using light wallpapers
 Introduced in https://github.com/LineageOS/android_frameworks_base/commit/a19e59d717ec6d573c11c7e8277bba3c4de189c2

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

@@ -1,7 +1,7 @@
-From d7612a2bd79c4fbc738bfb4cee56a3a88839d415 Mon Sep 17 00:00:00 2001
+From ef9cee9e51e0c3a3020a83b1e18f229c4e45498a 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/24] UI: Adjust default navbar layouts
+Subject: [PATCH 05/23] UI: Adjust default navbar layouts
 
 - Slightly tighten nodpi layout
 - Remove sw372dp layout - looks terrible, probably meant for legacy phablets, but most modern phones qualify

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

@@ -1,7 +1,7 @@
-From 132cfec6f7d245e867a2be7939931076d721405d Mon Sep 17 00:00:00 2001
+From 4bb9def8e58fa46890cdf93672e35a298bd595ff 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/24] UI: Disable wallpaper zoom
+Subject: [PATCH 06/23] UI: Disable wallpaper zoom
 
 It does little more than inducing motion sickness
 

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

@@ -1,7 +1,7 @@
-From 3cea896b28374cb5975b470134bf572e004c5329 Mon Sep 17 00:00:00 2001
+From f439b01c40e9c9af40b40dfb80f7422775c587d6 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/24] UI: Follow Monet and light/dark theme in user 1 icon
+Subject: [PATCH 07/23] UI: Follow Monet and light/dark theme in user 1 icon
 
 Change-Id: I755077c6003c39ddc9428da1defe6a6ddd0e5ff8
 ---

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

@@ -1,7 +1,7 @@
-From 9999d9887ec0fc9f3227bac752126d98b2adc07e Mon Sep 17 00:00:00 2001
+From 8f0163c65d95e9ecfb4eb3e573040d22c9693ebb 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/24] UI: Increase default status bar height
+Subject: [PATCH 08/23] UI: Increase default status bar height
 
 Change-Id: Ibbcf63159e19bb2bb2b1094ea07ab85917630b07
 ---

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

@@ -1,7 +1,7 @@
-From b85e925a3accec749a28d5edd6bff3ce20f68924 Mon Sep 17 00:00:00 2001
+From e3ad3c7f7bbdb5913feddced1a1a36652d849f9d 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/24] UI: Remove QS footer background
+Subject: [PATCH 09/23] UI: Remove QS footer background
 
 Change-Id: I68e82e0c5e3eddb2d3f767fe792b1436eae506ef
 ---

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

@@ -1,7 +1,7 @@
-From 289c535bf6f0decf2c1ce58650ec7dd6721880a8 Mon Sep 17 00:00:00 2001
+From 4a51c5c42de7b550ce9a13322d63c44a8bbd76d8 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/24] UI: Restore split-screen divider to pre-Sv2 looks
+Subject: [PATCH 10/23] UI: Restore split-screen divider to pre-Sv2 looks
 
 - Kill rounded corners - where two rectangles collide should be perfectly straight
 - Make it black again - taskbar should mind its own business

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

@@ -1,7 +1,7 @@
-From 0697f6baa9ffb4f69b90e9c4f8469e7bd130d6bc Mon Sep 17 00:00:00 2001
+From fd92d595cd2d3caa015c1ab1749c1a06c472ba82 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/24] UI: Revive navbar layout tuning via sysui_nav_bar
+Subject: [PATCH 11/23] UI: Revive navbar layout tuning via sysui_nav_bar
  tunable
 
 Google keeps fixing what ain't broken.

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

@@ -1,7 +1,7 @@
-From 9f0fb3f042124da5731232dffa1bda623c395a22 Mon Sep 17 00:00:00 2001
+From ae22c5903fb6bd176d1df8de0292df0c386f1f80 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/24] UI: Use SNAP_FIXED_RATIO for multi-window globally
+Subject: [PATCH 12/23] UI: Use SNAP_FIXED_RATIO for multi-window globally
 
 Enables multiple snap targets under landscape for phone UI
 

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

@@ -1,7 +1,7 @@
-From 30a3637fe457193166cc324af29c306d7748adfa Mon Sep 17 00:00:00 2001
+From 519ee96fabf6d29ed22641f3a587012d92cc6846 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/24] core: Remove old app target SDK dialog
+Subject: [PATCH 13/23] core: Remove old app target SDK dialog
 
 If an app is old, users should already know that, and there's usually no
 point in warning them about it because they would already be using a

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

@@ -1,7 +1,7 @@
-From 964346e2b9e8ceaa7c6b2b9a4c74a401af0fc9e0 Mon Sep 17 00:00:00 2001
+From b715efda04efd69a0bfd4a9fd003e519b1255e96 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/24] Paint: Enable subpixel text positioning by default
+Subject: [PATCH 14/23] Paint: Enable subpixel text positioning by default
 
 On desktop Linux, subpixel text positioning is necessary to avoid
 kerning issues, and Android is no different. Even though most phone

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

@@ -1,7 +1,7 @@
-From d5b5deb95a8bf6737973cde8460d05b19a70032c Mon Sep 17 00:00:00 2001
+From 8b06ea31edf57c5b6252a188f2035c92c6c2bd31 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Sat, 16 Oct 2021 05:27:57 -0700
-Subject: [PATCH 16/24] Add support for app signature spoofing
+Subject: [PATCH 15/23] Add support for app signature spoofing
 
 This is needed by microG GmsCore to pretend to be the official Google
 Play Services package, because client apps check the package signature

patches_platform/frameworks_base/0015-SystemUI-add-burnIn-protection.patch

@@ -1,320 +0,0 @@
-From 4fa320b2eacab5be5b9fb3f2ebe24f39e8b54cc1 Mon Sep 17 00:00:00 2001
-From: Park Ju Hyung <qkrwngud825@gmail.com>
-Date: Sun, 15 Jan 2017 03:33:04 +0900
-Subject: [PATCH 15/24] SystemUI: add burnIn protection
-
-Devices with AMOLED display suffer from
-status-bar's notification items and nagivation bar's software keys
-causing permanent burn-ins when used long-term.
-
-Moving all items in the area
-both horizontally and vertically workarounds this problem.
-
-jrizzoli: integrate with runtime cmsdk preference
-
-Linux4: Removed toggle from settings - the burnIn protection is always
-enabled if the corresponding AOSP overlay is set to true
-Updated for T
-
-Change-Id: I35b04d1edff86a556adb3ad349569e5d82653f16
-Signed-off-by: Park Ju Hyung <qkrwngud825@gmail.com>
-Signed-off-by: Alex Naidis <alex.naidis@linux.com>
-Signed-off-by: Thecrazyskull <anaskarbila@gmail.com>
-Signed-off-by: Joey Rizzoli <joey@lineageos.org>
----
- .../SystemUI/res/values/lineage_dimens.xml    |   3 +
- .../navigationbar/NavigationBarView.java      |  26 +++++
- .../statusbar/phone/CentralSurfacesImpl.java  |  14 +++
- .../statusbar/phone/PhoneStatusBarView.java   |  27 +++++
- .../policy/BurnInProtectionController.java    | 105 ++++++++++++++++++
- 5 files changed, 175 insertions(+)
- create mode 100644 packages/SystemUI/src/com/android/systemui/statusbar/policy/BurnInProtectionController.java
-
-diff --git a/packages/SystemUI/res/values/lineage_dimens.xml b/packages/SystemUI/res/values/lineage_dimens.xml
-index e1998ce3d3ab..dc59ccd794f7 100644
---- a/packages/SystemUI/res/values/lineage_dimens.xml
-+++ b/packages/SystemUI/res/values/lineage_dimens.xml
-@@ -21,4 +21,7 @@
- 
-     <!-- Largest size an avatar might need to be drawn in the power menu user picker -->
-     <dimen name="global_actions_avatar_size">24dp</dimen>
-+
-+    <dimen name="burnin_protection_horizontal_shift">3dp</dimen>
-+    <dimen name="burnin_protection_vertical_shift">1dp</dimen>
- </resources>
-diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java
-index 883903efb95f..2020910d88bf 100644
---- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java
-+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java
-@@ -163,6 +163,13 @@ public class NavigationBarView extends FrameLayout implements TunerService.Tunab
-     private FloatingRotationButton mFloatingRotationButton;
-     private RotationButtonController mRotationButtonController;
- 
-+    private int mBasePaddingBottom;
-+    private int mBasePaddingLeft;
-+    private int mBasePaddingRight;
-+    private int mBasePaddingTop;
-+
-+    private ViewGroup mNavigationBarContents;
-+
-     /**
-      * Helper that is responsible for showing the right toast when a disallowed activity operation
-      * occurred. In pinned mode, we show instructions on how to break out of this mode, whilst in
-@@ -880,12 +887,31 @@ public class NavigationBarView extends FrameLayout implements TunerService.Tunab
-         mContextualButtonGroup.setButtonVisibility(R.id.accessibility_button, visible);
-     }
- 
-+    public void shiftNavigationBarItems(int horizontalShift, int verticalShift) {
-+        if (mNavigationBarContents == null) {
-+            return;
-+        }
-+
-+        mNavigationBarContents.setPaddingRelative(mBasePaddingLeft + horizontalShift,
-+                mBasePaddingTop + verticalShift,
-+                mBasePaddingRight + horizontalShift,
-+                mBasePaddingBottom - verticalShift);
-+        invalidate();
-+    }
-+
-     @Override
-     public void onFinishInflate() {
-         super.onFinishInflate();
-         mNavigationInflaterView = findViewById(R.id.navigation_inflater);
-         mNavigationInflaterView.setButtonDispatchers(mButtonDispatchers);
- 
-+
-+        mNavigationBarContents = (ViewGroup) findViewById(R.id.nav_buttons);
-+
-+        mBasePaddingLeft = mNavigationBarContents.getPaddingStart();
-+        mBasePaddingTop = mNavigationBarContents.getPaddingTop();
-+        mBasePaddingRight = mNavigationBarContents.getPaddingEnd();
-+        mBasePaddingBottom = mNavigationBarContents.getPaddingBottom();
-         updateOrientationViews();
-         reloadNavIcons();
-     }
-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 83755c6591be..4e2bb5424eb8 100644
---- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
-+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
-@@ -226,6 +226,7 @@ import com.android.systemui.statusbar.phone.dagger.StatusBarPhoneModule;
- import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallController;
- import com.android.systemui.statusbar.policy.BatteryController;
- import com.android.systemui.statusbar.policy.BrightnessMirrorController;
-+import com.android.systemui.statusbar.policy.BurnInProtectionController;
- import com.android.systemui.statusbar.policy.ConfigurationController;
- import com.android.systemui.statusbar.policy.ConfigurationController.ConfigurationListener;
- import com.android.systemui.statusbar.policy.DeviceProvisionedController;
-@@ -453,6 +454,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces, Tune
-     @Nullable
-     protected LockscreenWallpaper mLockscreenWallpaper;
-     private final AutoHideController mAutoHideController;
-+    private BurnInProtectionController mBurnInProtectionController;
- 
-     private final Point mCurrentDisplaySize = new Point();
- 
-@@ -1233,6 +1235,12 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces, Tune
-                     mNotificationPanelViewController.updatePanelExpansionAndVisibility();
-                     setBouncerShowingForStatusBarComponents(mBouncerShowing);
-                     checkBarModes();
-+
-+                    if (mContext.getResources().getBoolean(
-+                            com.android.internal.R.bool.config_enableBurnInProtection)) {
-+                        mBurnInProtectionController = new BurnInProtectionController(mContext,
-+                                this, mStatusBarView);
-+                    }
-                 });
-         initializer.initializeStatusBar(mCentralSurfacesComponent);
- 
-@@ -3488,6 +3496,9 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces, Tune
- 
-             updateNotificationPanelTouchState();
-             mNotificationShadeWindowViewController.cancelCurrentTouch();
-+            if (mBurnInProtectionController != null) {
-+                mBurnInProtectionController.stopShiftTimer(true);
-+            }
-             if (mLaunchCameraOnFinishedGoingToSleep) {
-                 mLaunchCameraOnFinishedGoingToSleep = false;
- 
-@@ -3593,6 +3604,9 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces, Tune
-                 }
-             }
-             updateScrimController();
-+            if (mBurnInProtectionController != null) {
-+                mBurnInProtectionController.startShiftTimer(true);
-+            }
-         }
-     };
- 
-diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
-index 5692024fb473..3892921957b2 100644
---- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
-+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
-@@ -19,6 +19,7 @@ package com.android.systemui.statusbar.phone;
- 
- import android.annotation.Nullable;
- import android.content.Context;
-+import android.content.res.Resources;
- import android.content.res.Configuration;
- import android.graphics.Rect;
- import android.inputmethodservice.InputMethodService;
-@@ -63,6 +64,13 @@ public class PhoneStatusBarView extends FrameLayout implements Callbacks {
-     private final CommandQueue mCommandQueue;
-     private final StatusBarContentInsetsProvider mContentInsetsProvider;
- 
-+    private int mBasePaddingBottom;
-+    private int mBasePaddingLeft;
-+    private int mBasePaddingRight;
-+    private int mBasePaddingTop;
-+
-+    private ViewGroup mStatusBarContents;
-+
-     private DarkReceiver mBattery;
-     private ClockController mClockController;
-     private int mRotationOrientation = -1;
-@@ -140,6 +148,18 @@ public class PhoneStatusBarView extends FrameLayout implements Callbacks {
-         StatusBarUserChipViewBinder.bind(container, viewModel);
-     }
- 
-+    public void shiftStatusBarItems(int horizontalShift, int verticalShift) {
-+        if (mStatusBarContents == null) {
-+            return;
-+        }
-+
-+        mStatusBarContents.setPaddingRelative(mBasePaddingLeft + horizontalShift,
-+                mBasePaddingTop + verticalShift,
-+                mBasePaddingRight + horizontalShift,
-+                mBasePaddingBottom - verticalShift);
-+        invalidate();
-+    }
-+
-     @Override
-     public void onFinishInflate() {
-         super.onFinishInflate();
-@@ -147,6 +167,13 @@ public class PhoneStatusBarView extends FrameLayout implements Callbacks {
-         mClockController = new ClockController(getContext(), this);
-         mCutoutSpace = findViewById(R.id.cutout_space_view);
- 
-+        mStatusBarContents = (ViewGroup) findViewById(R.id.status_bar_contents);
-+
-+        mBasePaddingLeft = mStatusBarContents.getPaddingStart();
-+        mBasePaddingTop = mStatusBarContents.getPaddingTop();
-+        mBasePaddingRight = mStatusBarContents.getPaddingEnd();
-+        mBasePaddingBottom = mStatusBarContents.getPaddingBottom();
-+
-         updateResources();
-     }
- 
-diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BurnInProtectionController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BurnInProtectionController.java
-new file mode 100644
-index 000000000000..864d86ffd6a3
---- /dev/null
-+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BurnInProtectionController.java
-@@ -0,0 +1,105 @@
-+/*
-+ * Copyright 2017 Paranoid Android
-+ * Copyright 2020 The LineageOS Project
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ *     http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+
-+package com.android.systemui.statusbar.policy;
-+
-+import android.content.Context;
-+import android.content.res.Resources;
-+import android.os.Handler;
-+import android.os.Looper;
-+import android.util.Log;
-+
-+import com.android.systemui.R;
-+import com.android.systemui.navigationbar.NavigationBarView;
-+import com.android.systemui.statusbar.phone.PhoneStatusBarView;
-+import com.android.systemui.statusbar.phone.CentralSurfacesImpl;
-+
-+public class BurnInProtectionController {
-+    private static final String TAG = "BurnInProtectionController";
-+    private static final boolean DEBUG = false;
-+    private static final long INTERVAL = 60000; // Milliseconds
-+
-+    private int mHorizontalShift = 0;
-+    private int mVerticalShift = 0;
-+    private int mHorizontalDirection = 1;
-+    private int mVerticalDirection = 1;
-+    private int mNavigationBarHorizontalMaxShift;
-+    private int mNavigationBarVerticalMaxShift;
-+    private int mHorizontalMaxShift;
-+    private int mVerticalMaxShift;
-+    private long mShiftInterval;
-+
-+    private final Handler mHandler = new Handler();
-+    private final Runnable mRunnable = () -> {
-+            shiftItems();
-+            mHandler.postDelayed(this.mRunnable, INTERVAL);
-+    };
-+
-+    private PhoneStatusBarView mPhoneStatusBarView;
-+    private CentralSurfacesImpl mStatusBar;
-+
-+    private Context mContext;
-+
-+    public BurnInProtectionController(Context context, CentralSurfacesImpl statusBar,
-+            PhoneStatusBarView phoneStatusBarView) {
-+        mContext = context;
-+
-+        mPhoneStatusBarView = phoneStatusBarView;
-+        mStatusBar = statusBar;
-+
-+        mHorizontalMaxShift = mContext.getResources()
-+                .getDimensionPixelSize(R.dimen.burnin_protection_horizontal_shift);
-+        // total of ((vertical_max_shift - 1) * 2) pixels can be moved
-+        mVerticalMaxShift = mContext.getResources()
-+                .getDimensionPixelSize(R.dimen.burnin_protection_vertical_shift) - 1;
-+    }
-+
-+    public void startShiftTimer(boolean enabled) {
-+        if (!enabled) return;
-+        mHandler.removeCallbacks(mRunnable);
-+        mHandler.postDelayed(mRunnable, INTERVAL);
-+        if (DEBUG) Log.d(TAG, "Started shift timer");
-+    }
-+
-+    public void stopShiftTimer(boolean enabled) {
-+        if (!enabled) return;
-+        mHandler.removeCallbacks(mRunnable);
-+        if (DEBUG) Log.d(TAG, "Canceled shift timer");
-+    }
-+
-+    private void shiftItems() {
-+        mHorizontalShift += mHorizontalDirection;
-+        if ((mHorizontalShift >=  mHorizontalMaxShift) ||
-+                (mHorizontalShift <= -mHorizontalMaxShift)) {
-+            mHorizontalDirection *= -1;
-+        }
-+
-+        mVerticalShift += mVerticalDirection;
-+        if ((mVerticalShift >=  mVerticalMaxShift) ||
-+                (mVerticalShift <= -mVerticalMaxShift)) {
-+            mVerticalDirection *= -1;
-+        }
-+
-+        mPhoneStatusBarView.shiftStatusBarItems(mHorizontalShift, mVerticalShift);
-+        NavigationBarView navigationBarView = mStatusBar.getNavigationBarView();
-+
-+        if (navigationBarView != null) {
-+            navigationBarView.shiftNavigationBarItems(mHorizontalShift, mVerticalShift);
-+        }
-+        if (DEBUG) Log.d(TAG, "Shifting items\u2026");
-+    }
-+}
--- 
-2.34.1
-

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

@@ -1,7 +1,7 @@
-From 47265639ead98824ac0d176e06bcffe6a2035a42 Mon Sep 17 00:00:00 2001
+From dff8fbe5dfceacfd51b3606d7b137616911a6cf6 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Mon, 11 Oct 2021 19:59:51 -0700
-Subject: [PATCH 17/24] Spoof product name for Google Play Services
+Subject: [PATCH 16/23] Spoof product name for Google Play Services
 
 NB: This code is under the gmscompat package, but it does not depend on
 any code from gmscompat.

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

@@ -1,7 +1,7 @@
-From 838a9febd980da5a1829c75f86ecc5a519e9cdb9 Mon Sep 17 00:00:00 2001
+From bf57e2c0560a94601c465de9cce8ae77111ba37f Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Mon, 11 Oct 2021 20:00:44 -0700
-Subject: [PATCH 18/24] keystore: Block key attestation for SafetyNet
+Subject: [PATCH 17/23] keystore: Block key attestation for SafetyNet
 
 SafetyNet (part of Google Play Services) opportunistically uses
 hardware-backed key attestation via KeyStore as a strong integrity

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

@@ -1,7 +1,7 @@
-From 260b0f7a81c762b3b03b8f83dedee9c92e0f55ca Mon Sep 17 00:00:00 2001
+From 4b2da805e60f7456b60fbef0399b42270bd6d1d8 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Mon, 1 Nov 2021 20:06:48 -0700
-Subject: [PATCH 19/24] Limit SafetyNet workarounds to unstable GMS process
+Subject: [PATCH 18/23] Limit SafetyNet workarounds to unstable GMS process
 
 The unstable process is where SafetyNet attestation actually runs, so
 we only need to spoof the model in that process. Leaving other processes

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

@@ -1,7 +1,7 @@
-From 839d9d8e213a15c823aa218539993b2c23f3bd65 Mon Sep 17 00:00:00 2001
+From 3e127f227f91e2cda68ae28c531c7f7034693b9e Mon Sep 17 00:00:00 2001
 From: Dyneteve <dyneteve@hentaios.com>
 Date: Tue, 23 Aug 2022 18:57:05 +0200
-Subject: [PATCH 20/24] gmscompat: Apply the SafetyNet workaround to Play Store
+Subject: [PATCH 19/23] gmscompat: Apply the SafetyNet workaround to Play Store
  aswell
 
 Play Store is used for the new Play Integrity API, extend the hack

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

@@ -1,7 +1,7 @@
-From 030dc8f051ca98594cc037b1fe6b79d417d3a8a3 Mon Sep 17 00:00:00 2001
+From 408d79cb171d9d9d4e78c068601c8e08047b18d0 Mon Sep 17 00:00:00 2001
 From: Dyneteve <dyneteve@hentaios.com>
 Date: Thu, 8 Sep 2022 14:39:52 +0200
-Subject: [PATCH 21/24] gmscompat: Use Nexus 6P fingerprint for CTS/Integrity
+Subject: [PATCH 20/23] gmscompat: Use Nexus 6P fingerprint for CTS/Integrity
 
 Google seems to have patched the KM block to Play Store in record time,
 but is still not enforced for anything under android N.

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

@@ -1,7 +1,7 @@
-From bdd113e11896541b2e4df0fcb9dd94ce3334e933 Mon Sep 17 00:00:00 2001
+From 9e51495edc14e3cf1609eccf3d65a71720c17a09 Mon Sep 17 00:00:00 2001
 From: Dyneteve <dyneteve@hentaios.com>
 Date: Tue, 6 Dec 2022 15:59:08 +0100
-Subject: [PATCH 22/24] gmscompat: Use actual device model name
+Subject: [PATCH 21/23] gmscompat: Use actual device model name
 
 Signed-off-by: Dyneteve <dyneteve@hentaios.com>
 Change-Id: I454654d87b3ea6286e12e9a9f5ed120f06cb2aa6

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

@@ -1,7 +1,7 @@
-From b4b83ed885d8c3751220ab7270ff0819ea37fb5e Mon Sep 17 00:00:00 2001
+From f7ac5b583424583d440b7f2ce6bdce96fce2e209 Mon Sep 17 00:00:00 2001
 From: Anirudh Gupta <anirudhgupta109@aosip.dev>
 Date: Wed, 4 Jan 2023 18:20:56 +0000
-Subject: [PATCH 23/24] gmscompat: Set shipping level to 32 for devices >=33
+Subject: [PATCH 22/23] gmscompat: Set shipping level to 32 for devices >=33
 
 If ro.product.first_api_level is 33, its forced to use HW attestation even though the safteynet checker app shows BASIC
 setting it to 32 allows for software attestation and passing CTS

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

@@ -1,7 +1,7 @@
-From 2d053efcdbc7ad46ab7cae4550c3134b6ca5ba62 Mon Sep 17 00:00:00 2001
+From ebbe0af4cff77d27ab5b7b23c5d86f947428b4c4 Mon Sep 17 00:00:00 2001
 From: Dyneteve <dyneteve@hentaios.com>
 Date: Wed, 8 Feb 2023 15:21:01 +0000
-Subject: [PATCH 24/24] gmscompat: Make CTS/Play Integrity pass again
+Subject: [PATCH 23/23] gmscompat: Make CTS/Play Integrity pass again
 
 The logic behind CTS and Play Integrity has been updated today it now
 checks the product and model names against the fingerprint and if

patches_platform_personal/frameworks_base/0001-Add-MiuiNavbarOverlay.patch

@@ -1,7 +1,7 @@
-From 630ef309d41f80ba621c9646d44e1480a2c1b06b Mon Sep 17 00:00:00 2001
+From fe9ef4702e81d02d75fb9e6df73fcf013fb955af Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 20 Jun 2021 03:39:32 +0000
-Subject: [PATCH 01/21] Add MiuiNavbarOverlay
+Subject: [PATCH 01/20] Add MiuiNavbarOverlay
 
 Change-Id: I0e6791abc3c9521d7dc612df2fec2b041affe7e9
 ---

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

@@ -1,7 +1,7 @@
-From df749c8f69ea955f7ce2894ef73f0b395b6aa86d Mon Sep 17 00:00:00 2001
+From 964e570909040dc8de452f5269f633c4b4fe9519 Mon Sep 17 00:00:00 2001
 From: Hikari-no-Tenshi <kyryljan.serhij@gmail.com>
 Date: Thu, 30 Jan 2020 22:20:54 +0200
-Subject: [PATCH 02/21] Disable Bluetooth by default
+Subject: [PATCH 02/20] Disable Bluetooth by default
 
 Change-Id: Iea5d24f977928bf01cd7a46b98c75c0a4bd6a23c
 ---

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

@@ -1,7 +1,7 @@
-From 3446855cc0673b68bbd3558362e282c5b1decf51 Mon Sep 17 00:00:00 2001
+From 0db4a23679a9c74790cc618abeeeadaf0a202665 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Mon, 27 Sep 2021 16:30:00 +0000
-Subject: [PATCH 03/21] Disable cursor drag by default for editable TextViews
+Subject: [PATCH 03/20] Disable cursor drag by default for editable TextViews
 
 Requested by @TadiT7
 

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

@@ -1,7 +1,7 @@
-From 4706b07fb66ea1a0f10a5bb84cda6780cb10f4a3 Mon Sep 17 00:00:00 2001
+From 6a0d86399b5d61301d2184a6b10152462380dc10 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/21] Disable "RESTRICTED bucket" toast
+Subject: [PATCH 04/20] Disable "RESTRICTED bucket" toast
 
 Change-Id: I20a328d3c77962f3a6095bfca42d0b165a093ce8
 ---

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

@@ -1,7 +1,7 @@
-From 2362d29a436aa9483f6913e022567d6f9fd90332 Mon Sep 17 00:00:00 2001
+From 64d1e22f654f996d3cc46334f4a75b6c37c16268 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/21] Keyguard: Adjust clock style
+Subject: [PATCH 05/20] Keyguard: Adjust clock style
 
 Thinner font, less padding and unintrusive colors
 

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

@@ -1,7 +1,7 @@
-From f3928474b86986827588d05535cc045156becbde Mon Sep 17 00:00:00 2001
+From abc2207876e23d1c01e0c45fe604dcef3967e1b7 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/21] Keyguard: Hide padlock unless UDFPS is in use
+Subject: [PATCH 06/20] Keyguard: Hide padlock unless UDFPS is in use
 
 Fair enough Google, but don't give me that otherwise
 

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

@@ -1,7 +1,7 @@
-From 67e73c9aa252581a81f0dabcc6b8a7067da040ac Mon Sep 17 00:00:00 2001
+From 86a90de31bc9c05b3124d573dcd93eb5a3ddf5ec 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/21] Keyguard: Never switch to large clock
+Subject: [PATCH 07/20] Keyguard: Never switch to large clock
 
 It looks alright actually, but as always breaks under landscape
 

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

@@ -1,7 +1,7 @@
-From 5b078c1242e2d69a887b56130b0f12609269ad89 Mon Sep 17 00:00:00 2001
+From 6254335e8e470501a24b678aa006536fadd0f7c0 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/21] Keyguard: Refine indication text
+Subject: [PATCH 08/20] Keyguard: Refine indication text
 
 Change-Id: Ib771c35610f712a1de34736e817bcfe616ac37d8
 ---
@@ -84,7 +84,7 @@ 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 6a658b6ee047..632d186ac4f4 100644
+index 3301d6907a25..15a7555e1381 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 {
@@ -100,7 +100,7 @@ index 6a658b6ee047..632d186ac4f4 100644
                  } else if (msg.what == MSG_RESET_ERROR_MESSAGE_ON_SCREEN_ON) {
                      mBiometricErrorMessageToShowOnScreenOn = null;
                  }
-@@ -375,7 +377,6 @@ public class KeyguardIndicationController {
+@@ -377,7 +379,6 @@ public class KeyguardIndicationController {
          updateLockScreenDisclosureMsg();
          updateLockScreenOwnerInfo();
          updateLockScreenBatteryMsg(animate);
@@ -108,7 +108,7 @@ index 6a658b6ee047..632d186ac4f4 100644
          updateLockScreenTrustMsg(userId, getTrustGrantedIndication(), getTrustManagedIndication());
          updateLockScreenAlignmentMsg();
          updateLockScreenLogoutView();
-@@ -484,22 +485,6 @@ public class KeyguardIndicationController {
+@@ -486,22 +487,6 @@ public class KeyguardIndicationController {
          }
      }
  
@@ -131,7 +131,7 @@ index 6a658b6ee047..632d186ac4f4 100644
      private void updateBiometricMessage() {
          if (mDozing) {
              updateDeviceEntryIndication(false);
-@@ -592,11 +577,11 @@ public class KeyguardIndicationController {
+@@ -594,11 +579,11 @@ public class KeyguardIndicationController {
      }
  
      private void updateLockScreenPersistentUnlockMsg() {

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

@@ -1,7 +1,7 @@
-From 146d8cbf38f17136e1aed47d634ff833f5a5fc8d Mon Sep 17 00:00:00 2001
+From 4eebadc9bacc35b94ac2fec83e68b4fd0a6eab21 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/21] Keyguard/UI: Fix status bar / quick settings margins
+Subject: [PATCH 09/20] Keyguard/UI: Fix status bar / quick settings margins
  and paddings
 
 Last revised on 2023/03/22, targeting T QPR2
@@ -101,10 +101,10 @@ index e56e5d557c2f..6378705f9db4 100644
 \ 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
-index 9795434a6545..cc8e3f48131d 100644
+index a3dffa2ec4d8..dca955008ad3 100644
 --- a/packages/SystemUI/src/com/android/systemui/shade/LargeScreenShadeHeaderController.kt
 +++ b/packages/SystemUI/src/com/android/systemui/shade/LargeScreenShadeHeaderController.kt
-@@ -136,6 +136,8 @@ class LargeScreenShadeHeaderController @Inject constructor(
+@@ -140,6 +140,8 @@ class LargeScreenShadeHeaderController @Inject constructor(
      private var cutoutLeft = 0
      private var cutoutRight = 0
      private var roundedCorners = 0
@@ -113,7 +113,7 @@ index 9795434a6545..cc8e3f48131d 100644
      private var lastInsets: WindowInsets? = null
      private var textColorPrimary = Color.TRANSPARENT
  
-@@ -360,14 +362,17 @@ class LargeScreenShadeHeaderController @Inject constructor(
+@@ -376,14 +378,17 @@ class LargeScreenShadeHeaderController @Inject constructor(
          cutoutLeft = sbInsets.first
          cutoutRight = sbInsets.second
          val hasCornerCutout: Boolean = insetsProvider.currentRotationHasCornerCutout()
@@ -133,7 +133,7 @@ index 9795434a6545..cc8e3f48131d 100644
                  header.paddingEnd
              )
  
-@@ -486,7 +491,6 @@ class LargeScreenShadeHeaderController @Inject constructor(
+@@ -502,7 +507,6 @@ class LargeScreenShadeHeaderController @Inject constructor(
      }
  
      private fun updateResources() {

patches_platform_personal/frameworks_base/0010-Replace-NTP-server.patch

@@ -1,26 +0,0 @@
-From a893877e865d6c39bf6f7976efe5618787a1a15f Mon Sep 17 00:00:00 2001
-From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
-Date: Sun, 17 Apr 2022 08:48:42 +0000
-Subject: [PATCH 10/21] Replace NTP server
-
-Change-Id: I938ab46026d841e7536d8fc02b0ef6b28ebb6ea1
----
- core/res/res/values/config.xml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
-index 8f81427cbe67..8bd2f7aaad07 100644
---- a/core/res/res/values/config.xml
-+++ b/core/res/res/values/config.xml
-@@ -2416,7 +2416,7 @@
-     <bool name="config_actionMenuItemAllCaps">true</bool>
- 
-     <!-- Remote server that can provide NTP responses. -->
--    <string translatable="false" name="config_ntpServer">time.android.com</string>
-+    <string translatable="false" name="config_ntpServer">cn.pool.ntp.org</string>
-     <!-- Normal polling frequency in milliseconds -->
-     <integer name="config_ntpPollingInterval">64800000</integer>
-     <!-- Try-again polling interval in milliseconds, in case the network request failed -->
--- 
-2.34.1
-

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

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

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

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

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

@@ -1,7 +1,7 @@
-From 0e336e834bf43aec2c3d627140e6b6f9a5466580 Mon Sep 17 00:00:00 2001
+From 9ca4c9ed59f2d710e2ed65d266c346f6c76bf06d Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Thu, 29 Sep 2022 11:27:57 +0000
-Subject: [PATCH 13/21] Revert "Use the default top clock margin on h800
+Subject: [PATCH 12/20] Revert "Use the default top clock margin on h800
  devices"
 
 This reverts commits 50ba380f4d8d1c2523e0f76295ca556038796bfd

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

@@ -1,7 +1,7 @@
-From d4aeaae7ab4d7c2e51b86afd6fa12888a47be51a Mon Sep 17 00:00:00 2001
+From b4f02e5a5d70915148a826fd5adbc80005c2d893 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Wed, 7 Oct 2020 14:00:35 +0000
-Subject: [PATCH 14/21] UI: Always render windows into cutouts
+Subject: [PATCH 13/20] UI: Always render windows into cutouts
 
 Eliminates black/white letterboxing
 Quick and dirty way to do the latter - wait for proper fix from Google

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

@@ -1,7 +1,7 @@
-From 4565707ddbfac766a60fa90ed6c68e31badfbad3 Mon Sep 17 00:00:00 2001
+From b780aa348b0807a89c393330d2727b5d69c59238 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Wed, 1 Sep 2021 14:10:50 +0000
-Subject: [PATCH 15/21] UI: Kill rounded corners in notification scrim
+Subject: [PATCH 14/20] 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
 

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

@@ -1,7 +1,7 @@
-From c8eb0353820700a61178af90e221db5cc7ffb3e5 Mon Sep 17 00:00:00 2001
+From 7e764a4f7f2314bbaf5d7271115be30baa46e893 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Mon, 26 Oct 2020 14:06:56 +0000
-Subject: [PATCH 16/21] UI: Reconfigure power menu items
+Subject: [PATCH 15/20] UI: Reconfigure power menu items
 
 Change-Id: I32cca6e2c6bb64d891efee959127edf7c0802cbc
 ---
@@ -9,7 +9,7 @@ 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 8bd2f7aaad07..a2df7afe944c 100644
+index 8f81427cbe67..349ff65ecde6 100644
 --- a/core/res/res/values/config.xml
 +++ b/core/res/res/values/config.xml
 @@ -3252,13 +3252,10 @@

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

@@ -1,7 +1,7 @@
-From 87c266fe66b62ac138f9c1dbbc5bc0339a67526e Mon Sep 17 00:00:00 2001
+From dbbe5afc40f68420da0e808c89b34f284b09f8d9 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 5 Mar 2022 01:43:37 +0000
-Subject: [PATCH 17/21] UI: Reconfigure quick settings tiles
+Subject: [PATCH 16/20] UI: Reconfigure quick settings tiles
 
 Change-Id: I743f52ef3a95db0ca2c02ae973faa4629e41885d
 ---

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

@@ -1,7 +1,7 @@
-From 15166b73a21dfcd204ed1d5f65934cee1d972be9 Mon Sep 17 00:00:00 2001
+From 07b9d619fefc8b722dd154e0cf68249b3d9fffe2 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Tue, 29 Jun 2021 22:57:01 +0000
-Subject: [PATCH 18/21] UI: Relax requirement for HINT_SUPPORTS_DARK_TEXT
+Subject: [PATCH 17/20] UI: Relax requirement for HINT_SUPPORTS_DARK_TEXT
 
 I decide what's good enough for a wallpaper!
 

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

@@ -1,7 +1,7 @@
-From 0ee6fdb253b5568408387a8f1348d4daa790e8e5 Mon Sep 17 00:00:00 2001
+From 6d5e98d6f14462e0921eee4b223dcce4daa47b73 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Tue, 19 Oct 2021 12:09:34 +0000
-Subject: [PATCH 19/21] UI: Remove privacy dot
+Subject: [PATCH 18/20] UI: Remove privacy dot
 
 Change-Id: I5d2e2b3e36f027b4348a83030d4b4d3c4f0209d1
 ---

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

@@ -1,7 +1,7 @@
-From 3829d2d835c4dee4861e4262424a0540bc57af26 Mon Sep 17 00:00:00 2001
+From 31ed8c48f604dbab1f0097737886fb800929c101 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 20/21] UI: Restore quick settings fonts to pre-T-QPR2
+Subject: [PATCH 19/20] 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

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

@@ -1,7 +1,7 @@
-From 8eb4dba8b771a9f30db4cd58eb7509642568506b Mon Sep 17 00:00:00 2001
+From be2c9c3bfaac6b3b9fc705ceb3799decc99d5a3d Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Fri, 30 Sep 2022 16:02:16 +0000
-Subject: [PATCH 21/21] UI: Revert to HSL luminance for wallpaper dark hints
+Subject: [PATCH 20/20] UI: Revert to HSL luminance for wallpaper dark hints
 
 Y U no test for consistency, Google?
 

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

@@ -1,7 +1,7 @@
-From 478a67112b5ddfd25c7b36c92ac508d55a54a88a Mon Sep 17 00:00:00 2001
+From 210f25d815fae5cdbcaf2381b4a704f30013716a 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/26] APM: Restore S, R and Q behavior respectively for
+Subject: [PATCH 01/27] APM: Restore S, R and Q behavior respectively for
  telephony audio
 
 This conditionally reverts part of b2e5cb (T), 51c9cc (S) and afd4ce (R)

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

@@ -1,7 +1,7 @@
-From d1252392714cad0c0f71e8d381925849098122ab Mon Sep 17 00:00:00 2001
+From 135ca4926b066565661b999ddc93aec82f54579e 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/26] Fix BT in-call on CAF devices
+Subject: [PATCH 02/27] 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 209a4b20bd4125df28fcf5ba3d501e84d7454e40 Mon Sep 17 00:00:00 2001
+From 1b41c02cc71aeda0b3c17d17059a3848ad7f369a 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/26] Add (partial, cam id is hardcoded) support for Asus ZF6
+Subject: [PATCH 03/27] Add (partial, cam id is hardcoded) support for Asus ZF6
  motor camera
 
 Change-Id: Iea6e1370780a1d16f728748d1d948d092532d8fe

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

@@ -1,7 +1,7 @@
-From 8ae943d95a8c015001341238536f50968dfb8fe3 Mon Sep 17 00:00:00 2001
+From 59a7bf23df24f65402cab9df4bdfc0489f51a913 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/26] APM: Optionally force-load audio policy for system-side
+Subject: [PATCH 04/27] 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 0221bd65afca2f16be887b8d33b593d1e3c3db0c Mon Sep 17 00:00:00 2001
+From dd0a14fbd41d80fc3a2abdf0e09d9ef88900b327 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/26] APM: Remove A2DP audio ports from the primary HAL
+Subject: [PATCH 05/27] 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 e012a6fdabb37d398c3bd688e3293367d61666be Mon Sep 17 00:00:00 2001
+From 997d411b208d12e76a6da8197ad92483a925a3a8 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/26] audiopolicy: try again with trimmed audio port name if
+Subject: [PATCH 06/27] 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 7d83dd29d502262859a9fc7a8658ef9ef4dd632a Mon Sep 17 00:00:00 2001
+From 17cda9abd3ce0eb6571565ac6f4c8f5222fb3587 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/26] camera: Implement property to override default camera
+Subject: [PATCH 07/27] camera: Implement property to override default camera
 
 Complement to the frameworks/base patch.
 

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

@@ -1,7 +1,7 @@
-From 55783de99f5000569335532dace13682bde08214 Mon Sep 17 00:00:00 2001
+From 0cd9a1341279236b0b49129afbfab7b534cd6870 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/26] There are three SCO devices. Fallback from one to the
+Subject: [PATCH 08/27] 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 baee6d7460ccddc83f5e98a1af03b39784672802 Mon Sep 17 00:00:00 2001
+From d85a10ed9a1171b94eebb7d43bd1124aa38a4009 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/26] Add persist.sys.phh.samsung.camera_ids property to
+Subject: [PATCH 09/27] Add persist.sys.phh.samsung.camera_ids property to
  access hidden Samsung cameras
 
 Change-Id: I2c7bf535272acc28ed2277e96c78ddd28a0b4593

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

@@ -1,7 +1,7 @@
-From 0a985d6e98b115e5dc938e630e63dfb46b0c33bd Mon Sep 17 00:00:00 2001
+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/26] Camera: Avoid unnecessary close of buffer acquire fence
+Subject: [PATCH 10/27] Camera: Avoid unnecessary close of buffer acquire fence
  fds
 
 According to the gralloc lock documentation:

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

@@ -1,7 +1,7 @@
-From 99e678e0b3f3117c570da358198af887c94ba500 Mon Sep 17 00:00:00 2001
+From 2b7924156adfdbf101b94aff0b11f29378d074c5 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/26] Add a property to force camera timestamp source
+Subject: [PATCH 11/27] 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

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

@@ -1,7 +1,7 @@
-From af90a4845af1cfcdb918c4d7d523f926d4986e24 Mon Sep 17 00:00:00 2001
+From 92ed24d529880069ae92c2ace3a8a0d857f92a8a 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/26] FIH devices: Fix "Earpiece" audio output
+Subject: [PATCH 12/27] 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/0013-No-longer-make-re-assigning-legacy-audio-groups-fata.patch

@@ -1,7 +1,7 @@
-From 9ca08d8781150a6157c1f8824f2f6b7f36997ecc Mon Sep 17 00:00:00 2001
+From 4bc269b014047a61d649b2722144c09b123c7818 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/26] No longer make re-assigning legacy audio groups fatal.
+Subject: [PATCH 13/27] 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/0014-Make-camera-IDs-filter-out-optional.patch

@@ -1,7 +1,7 @@
-From 1401a96f282827700760cd3aaba946fd4365d351 Mon Sep 17 00:00:00 2001
+From 3e0ed9d77b0856878315c4c784d342ee284b24ea 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/26] Make camera IDs filter-out optional
+Subject: [PATCH 14/27] 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.

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

@@ -1,7 +1,7 @@
-From 406d10db45bbf22153de7e4f2dc37d50a9f937e2 Mon Sep 17 00:00:00 2001
+From 6449c086ae493c949106ee7ad79251b3ba21506d 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/26] Support Samsung R multi-cams
+Subject: [PATCH 15/27] Support Samsung R multi-cams
 
 Change-Id: If46f385e8dd16185cbf37ab083e6a1242e1d1555
 ---

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

@@ -1,7 +1,7 @@
-From 9ac250245449ad184608256fdc8b16d1b4c61af5 Mon Sep 17 00:00:00 2001
+From a359f6ea0efe0f07163c7920448440a9f2725348 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/26] Don't crash on unknown audio devices
+Subject: [PATCH 16/27] Don't crash on unknown audio devices
 
 Change-Id: I2df8d88f742da6a84aa8888cdf19de25444de919
 ---

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

@@ -1,7 +1,7 @@
-From 4fa8e746eef418f40f6545b29f8e405a96ad161f Mon Sep 17 00:00:00 2001
+From 0879f806e8a6da5dc751de71c3c57342cd16ea5d 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/26] Not all sources in a route are valid. Dont ignore the
+Subject: [PATCH 17/27] 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/0018-Use-a-fake-volume-policy-when-none-has-been-found.patch

@@ -1,7 +1,7 @@
-From 3d10c851faca305befccb4b85bc28ccc26018739 Mon Sep 17 00:00:00 2001
+From f58ed8113a8bb271a3180f3f140b67f7e8ad5fe8 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/26] Use a fake volume policy when none has been found
+Subject: [PATCH 18/27] 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/0019-When-aux-cameras-are-enabled-ignore-system-only-came.patch

@@ -1,7 +1,7 @@
-From 2322d08300341d25fe176b44e355f0bf5b6ae440 Mon Sep 17 00:00:00 2001
+From c9c0a6cc8fd9479853c1d06cec72aa796ce7023c 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/26] When aux cameras are enabled, ignore "system only"
+Subject: [PATCH 19/27] When aux cameras are enabled, ignore "system only"
  camera flag (it shouldnt be q security issue since secure cameras are listed
  otherwise)
 

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

@@ -1,7 +1,7 @@
-From 398ab59b91edeb31769d41c064dbc49afa920fd0 Mon Sep 17 00:00:00 2001
+From 53784b10ffda24be164ef134b91ffca3d08954da 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/26] Revert "Remove support for audio HAL V2 from the
+Subject: [PATCH 20/27] Revert "Remove support for audio HAL V2 from the
  framework"
 
 This reverts commit cbf517f837f7bf8a59f3ff8aa1e0e3e19612e251.

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

@@ -1,7 +1,7 @@
-From 47f94008bf4a0f98f7ef307b45bc38f88823e4ad Mon Sep 17 00:00:00 2001
+From b9bf555e37b304194c602e4eeb806fad45ad77ba 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/26] Fix parsing audio hal 7.0 audio policies
+Subject: [PATCH 21/27] 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/0022-fixup-Not-all-sources-in-a-route-are-valid.-Dont-ign.patch

@@ -1,7 +1,7 @@
-From 81dab535bb14a9b5a5996a558f85c46b1ab9640f Mon Sep 17 00:00:00 2001
+From 92c8febfbe746f602e91f3be74538eac3a9f9907 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/26] fixup! Not all sources in a route are valid. Dont
+Subject: [PATCH 22/27] 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/0023-Add-a-prop-to-change-Samsung-flash-strength.patch

@@ -1,7 +1,7 @@
-From 75503abf96c22c30b58e2b0a5677bcee7aac8865 Mon Sep 17 00:00:00 2001
+From 9df56d42780a25e76bf020eeee234de665fa58e3 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/26] Add a prop to change Samsung flash strength
+Subject: [PATCH 23/27] Add a prop to change Samsung flash strength
 
 ---
  services/camera/libcameraservice/Android.bp        |  1 +

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

@@ -1,7 +1,7 @@
-From a1d34d9638e76d772793f936278a2980b07db22c Mon Sep 17 00:00:00 2001
+From 32b048f47465f94e2a4f75c975cd7697715c4c58 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/26] Support variable flash strength on samsung hal 4.0
+Subject: [PATCH 24/27] Support variable flash strength on samsung hal 4.0
 
 ---
  services/camera/libcameraservice/Android.bp                 | 1 +

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

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

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

@@ -1,7 +1,7 @@
-From af448229e29a3f6043bc9af2dafd608349616f5b Mon Sep 17 00:00:00 2001
+From 52aaedd8730d117a34ad3fc40a808d218dfcce59 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/26] Fix audio hal 2.0 support. Fixup of Revert "Remove
+Subject: [PATCH 26/27] Fix audio hal 2.0 support. Fixup of Revert "Remove
  support for audio HAL V2 from the framework"
 
 ---

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

@@ -0,0 +1,168 @@
+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_native/0001-On-Samsung-we-need-to-send-a-hack-message-to-HAL-to-.patch

@@ -1,8 +1,8 @@
-From b0bf70b947ea0a7090490f08804932efa0632ce7 Mon Sep 17 00:00:00 2001
+From 3077fc174258024c587dd0387db26d3a711d64d4 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 14 Aug 2019 23:37:10 +0200
-Subject: [PATCH 1/9] On Samsung, we need to send a hack-message to HAL to get
+Subject: [PATCH 01/10] On Samsung, we need to send a hack-message to HAL to
- all Sensors
+ get all Sensors
 
 Change-Id: Id6a1fa48340de61c418493668e9abd22c2599376
 ---
@@ -31,5 +31,5 @@ index de050e02d0..3daeece62b 100644
          return;
      }
 -- 
-2.25.1
+2.34.1
 

patches_treble_td/platform_frameworks_native/0002-Matching-an-input-with-a-display-uses-uniqueId.patch

@@ -1,7 +1,7 @@
-From 9ef33b3c1b2fbd9049e232de2e2b9b66d83bdef9 Mon Sep 17 00:00:00 2001
+From 8401967290b4c359ad06555cf728b9430ea62db0 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 22 Oct 2020 23:22:46 +0200
-Subject: [PATCH 2/9] Matching an input with a display uses uniqueId
+Subject: [PATCH 02/10] Matching an input with a display uses uniqueId
 
 Not all devices have a `location`, notably bluetooth devices.
 However, we might still want to associate them with a screen,
@@ -31,5 +31,5 @@ index 989700f6cf..e45222103b 100644
                  const std::unordered_map<std::string, uint8_t>& ports = config->portAssociations;
                  const auto& displayPort = ports.find(inputPort);
 -- 
-2.25.1
+2.34.1
 

patches_treble_td/platform_frameworks_native/0003-unshared_oob-didn-t-exist-in-O-P-so-detect-its-suppo.patch

@@ -1,8 +1,8 @@
-From b294852aff716e1ba0b23fdd1fc9cc3fd904bd44 Mon Sep 17 00:00:00 2001
+From 632fa6e7f4491d8adecc13d2a68d0d3a4d0720ba Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 5 Jan 2021 23:44:00 +0100
-Subject: [PATCH 3/9] unshared_oob didn't exist in O/P, so detect its supported
+Subject: [PATCH 03/10] unshared_oob didn't exist in O/P, so detect its
- based on vndk version
+ supported based on vndk version
 
 ---
  cmds/installd/migrate_legacy_obb_data.sh | 2 +-
@@ -22,5 +22,5 @@ index 7399681c3e..9d5b73eae2 100644
    rm -rf /data/media/0/Android/obb/test_probe
    exit 0
 -- 
-2.25.1
+2.34.1
 

patches_treble_td/platform_frameworks_native/0004-Remove-Samsung-system-permission-on-sensors.patch

@@ -1,7 +1,7 @@
-From 28938c96830fccd9859008daccffaa055e5ad6c9 Mon Sep 17 00:00:00 2001
+From c99eb09fe299a4efc5d548997dcc49ba95af3a9c Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 31 Mar 2021 23:36:03 +0200
-Subject: [PATCH 4/9] Remove Samsung system permission on sensors
+Subject: [PATCH 04/10] Remove Samsung system permission on sensors
 
 ---
  libs/sensor/Sensor.cpp              | 1 +
@@ -33,5 +33,5 @@ index bae8a1380b..afaafb321e 100644
      int32_t mRequiredAppOp;
      int32_t mMaxDelay;
 -- 
-2.25.1
+2.34.1
 

patches_treble_td/platform_frameworks_native/0005-Mark-accelerometer-input-as-sensor-exclusively-if-th.patch

@@ -1,7 +1,7 @@
-From 6f13ea29cd87ce969c407210699b4f5840589d4c Mon Sep 17 00:00:00 2001
+From ca3f41f26fdf3c5584b15514de9ddd0ed22676b8 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 12 Dec 2021 08:45:36 -0500
-Subject: [PATCH 5/9] Mark accelerometer input as sensor exclusively if there
+Subject: [PATCH 05/10] Mark accelerometer input as sensor exclusively if there
  are ABS axis
 
 The reason this is needed is that on -fucked up- Xiami Mi A2 Lite and
@@ -15,10 +15,10 @@ Change-Id: I491ab89724c908ef09a23a6427d24a8889bf806a
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/services/inputflinger/reader/EventHub.cpp b/services/inputflinger/reader/EventHub.cpp
-index d6a6bd214e..febce0ae6b 100644
+index 1b58284831..0082ef506b 100644
 --- a/services/inputflinger/reader/EventHub.cpp
 +++ b/services/inputflinger/reader/EventHub.cpp
-@@ -2124,7 +2124,13 @@ void EventHub::openDeviceLocked(const std::string& devicePath) {
+@@ -2134,7 +2134,13 @@ void EventHub::openDeviceLocked(const std::string& devicePath) {
  
      // Check whether this device is an accelerometer.
      if (device->propBitmask.test(INPUT_PROP_ACCELEROMETER)) {
@@ -34,5 +34,5 @@ index d6a6bd214e..febce0ae6b 100644
  
      // Check whether this device has switches.
 -- 
-2.25.1
+2.34.1
 

patches_treble_td/platform_frameworks_native/0006-powermanager-Add-support-Samsung-miscpower-HAL.patch

@@ -1,7 +1,7 @@
-From 6162837f8581d23e42b19d974e0be1191b419b99 Mon Sep 17 00:00:00 2001
+From 6ecf751917dccb4a2fca63cca9b18d478c0c85d0 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 27 Dec 2021 18:00:43 -0500
-Subject: [PATCH 6/9] powermanager: Add support Samsung miscpower HAL
+Subject: [PATCH 06/10] powermanager: Add support Samsung miscpower HAL
 
 Several various configurations need to be supported:
 - Android Pie vendors have a android.hardware.power HIDL default + "miscpower"
@@ -297,5 +297,5 @@ index d74bd23a8d..a83990f2a4 100644
  
  } // namespace power
 -- 
-2.25.1
+2.34.1
 

patches_treble_td/platform_frameworks_native/0007-Fix-loading-power-hidl-v1.0.patch

@@ -1,7 +1,7 @@
-From d6e24531f939d76dc41dd96d52e7182f6e10ddc0 Mon Sep 17 00:00:00 2001
+From 9afa49a7f8ea8fb5a7af10089a8276b35ecf194e Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 12 Jan 2022 04:07:34 -0500
-Subject: [PATCH 7/9] Fix loading power hidl v1.0
+Subject: [PATCH 07/10] Fix loading power hidl v1.0
 
 Change-Id: Ife20a98d2a11c79c7b42f359f30c28e2dede1f25
 ---
@@ -27,5 +27,5 @@ index 9b20e67f7a..cd7f2312e2 100644
      if(hal == nullptr)
          hal = loadHal<V1_0::IPower>(gHalExists, gHalHidlV1_0, loadFn, "HIDL v1.0");
 -- 
-2.25.1
+2.34.1
 

patches_treble_td/platform_frameworks_native/0008-MIUI13-devices-hide-their-vibrator-HAL-behind-non-de.patch

@@ -1,8 +1,8 @@
-From da180a5351c4c1ebed64cab4ed570b45003d91ad Mon Sep 17 00:00:00 2001
+From 7ddec0245af245006aecf1de2686ae03c4058b86 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 25 Mar 2022 05:37:56 -0400
-Subject: [PATCH 8/9] MIUI13 devices hide their vibrator HAL behind non-default
+Subject: [PATCH 08/10] MIUI13 devices hide their vibrator HAL behind
- name: "vibratorfeature"
+ non-default name: "vibratorfeature"
 
 ---
  services/vibratorservice/VibratorHalController.cpp | 6 ++++++
@@ -26,5 +26,5 @@ index c1795f5c32..345016efd6 100644
      if (halV1_0 == nullptr) {
          ALOGV("Vibrator HAL service not available.");
 -- 
-2.25.1
+2.34.1
 

patches_treble_td/platform_frameworks_native/0009-FOD-support-for-Samsung-and-Asus.patch

@@ -1,7 +1,7 @@
-From ea9c3fdda6210368cd74646ab341902c743840de Mon Sep 17 00:00:00 2001
+From 4333b98463bc73ca513e4916c025fa56c97a964a Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 18 Dec 2022 18:17:30 -0500
-Subject: [PATCH 9/9] FOD support for Samsung and Asus
+Subject: [PATCH 09/10] FOD support for Samsung and Asus
 
 ---
  libs/gui/BLASTBufferQueue.cpp                 | 20 ++++++++++++++--
@@ -20,7 +20,7 @@ Subject: [PATCH 9/9] FOD support for Samsung and Asus
  13 files changed, 77 insertions(+), 5 deletions(-)
 
 diff --git a/libs/gui/BLASTBufferQueue.cpp b/libs/gui/BLASTBufferQueue.cpp
-index a51bbb1553..81f2de0025 100644
+index 24a5295112..de01525001 100644
 --- a/libs/gui/BLASTBufferQueue.cpp
 +++ b/libs/gui/BLASTBufferQueue.cpp
 @@ -33,11 +33,20 @@
@@ -278,5 +278,5 @@ index d0d3c2e6d7..c40986fae9 100644
      class CommandWriter : public CommandWriterBase {
      public:
 -- 
-2.25.1
+2.34.1
 

patches_treble_td/platform_frameworks_native/0010-Try-to-fallback-mCallingSid-to-getpidcon.patch

@@ -0,0 +1,106 @@
+From 461cc58b47900e2e3241dd8eb83d5eb15ddb1120 Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Wed, 20 Oct 2021 09:39:47 -0400
+Subject: [PATCH 10/10] Try to fallback mCallingSid to getpidcon
+
+This is needed because old vendors (before April 2019 ~) don't support
+reporting SELinux context of the caller.
+This doesn't work for all processes, because it requires some additional
+SELinux permissions. At the moment, only keystore2 requires this
+
+As a rule of thumb, assume only 3.18 kernel are old enough to have that
+issue.
+That's not strictly accurate, there have also been 4.4 kernels with that
+issue (maybe even 4.9?). But let's assume that devices with >=4.4
+kernels have got an upgrade after April 2019
+
+Change-Id: I3b6c4dac9d0e20a3d66f931b283e3a535ab499cd
+---
+ libs/binder/IPCThreadState.cpp | 48 ++++++++++++++++++++++++++++++++++
+ 1 file changed, 48 insertions(+)
+
+diff --git a/libs/binder/IPCThreadState.cpp b/libs/binder/IPCThreadState.cpp
+index 3c97dcab93..b15ac9bcd9 100644
+--- a/libs/binder/IPCThreadState.cpp
++++ b/libs/binder/IPCThreadState.cpp
+@@ -35,8 +35,10 @@
+ #include <sched.h>
+ #include <signal.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <sys/ioctl.h>
+ #include <sys/resource.h>
++#include <sys/utsname.h>
+ #include <unistd.h>
+ 
+ #include "Static.h"
+@@ -1144,6 +1146,25 @@ void IPCThreadState::setTheContextObject(const sp<BBinder>& obj)
+     the_context_object = obj;
+ }
+ 
++static bool _supportsSid;
++static bool _supportsSid_done;
++static void supportsSid() {
++    if (_supportsSid_done) return;
++    //Put a threshold at >= 4.0
++    struct utsname buf;
++    uname(&buf);
++    const char *where = buf.release;
++    int a = strtol(where, NULL, 10);
++    ALOGE("Got kernel major version %d", a);
++    if(a <= 3) {
++        _supportsSid = false;
++    } else {
++        _supportsSid = true;
++    }
++    _supportsSid_done = true;
++
++}
++
+ status_t IPCThreadState::executeCommand(int32_t cmd)
+ {
+     BBinder* obj;
+@@ -1269,6 +1290,32 @@ status_t IPCThreadState::executeCommand(int32_t cmd)
+             mCallingUid = tr.sender_euid;
+             mLastTransactionBinderFlags = tr.flags;
+ 
++            if (mCallingSid != nullptr) {
++                _supportsSid = true;
++                _supportsSid_done = true;
++            }
++            supportsSid();
++
++            // This is recoding libselinux's getpidcon()
++            // We are in a NDK lib, so we need to keep changes to a minimum
++            bool allocatedSid = false;
++            if (!_supportsSid && mCallingSid == nullptr && mCallingPid != 0) {
++                char buf[4096];
++                char *path = NULL;
++                (void)asprintf(&path, "/proc/%d/attr/current", mCallingPid);
++                int fd = open(path, O_RDONLY | O_CLOEXEC);
++                if (fd != -1) {
++                    int readRet = read(fd, buf, sizeof(buf)-1);
++                    if(readRet != -1) {
++                        buf[readRet] = 0;
++                        mCallingSid = strdup(buf);
++                        allocatedSid = true;
++                    }
++                    close(fd);
++                }
++                free(path);
++            }
++
+             // ALOGI(">>>> TRANSACT from pid %d sid %s uid %d\n", mCallingPid,
+             //    (mCallingSid ? mCallingSid : "<N/A>"), mCallingUid);
+ 
+@@ -1333,6 +1380,7 @@ status_t IPCThreadState::executeCommand(int32_t cmd)
+ 
+             mServingStackPointer = origServingStackPointer;
+             mCallingPid = origPid;
++            if (allocatedSid) free((void*)mCallingSid);
+             mCallingSid = origSid;
+             mCallingUid = origUid;
+             mStrictModePolicy = origStrictModePolicy;
+-- 
+2.34.1
+