Changes for January 2024

patches_treble_phh/platform_frameworks_base/0001-Relax-requirement-for-visible-flag-to-sdcards.patch

@@ -1,7 +1,7 @@
-From ba3e4a959adb7b59885d83736d86b0e531a81da6 Mon Sep 17 00:00:00 2001
+From 6421b05dc0f283624817f4b973f4ce22e7bcd4f3 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 01/41] Relax requirement for visible flag to sdcards
+Subject: [PATCH 01/42] Relax requirement for visible flag to sdcards
 
 The vast majority of sdcard readers are stable enough to be declared by
 the API. (I see no counter-example)
@@ -13,10 +13,10 @@ Change-Id: Ia616671c03562d1eadaff5531a5c708a62d7ad3a
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
-index db8656ea3d5..b0ceaee8977 100644
+index 60d2feaba50..a2891430069 100644
 --- a/services/core/java/com/android/server/StorageManagerService.java
 +++ b/services/core/java/com/android/server/StorageManagerService.java
-@@ -1534,7 +1534,8 @@ class StorageManagerService extends IStorageManager.Stub
+@@ -1535,7 +1535,8 @@ class StorageManagerService extends IStorageManager.Stub
  
              // Adoptable public disks are visible to apps, since they meet
              // public API requirement of being in a stable location.
@@ -27,5 +27,5 @@ index db8656ea3d5..b0ceaee8977 100644
              } else if (vol.disk.isSd()) {
                  vol.mountFlags |= VolumeInfo.MOUNT_FLAG_VISIBLE;
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0002-backlight-Fix-backlight-control-on-Galaxy-S9.patch

@@ -1,7 +1,7 @@
-From 13a6922acefdbff1b631be22811cb21900a60bb5 Mon Sep 17 00:00:00 2001
+From b2460278994462cdbd023f86b15df56c036d8d0c Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 24 Mar 2018 08:01:48 +0100
-Subject: [PATCH 02/41] backlight: Fix backlight control on Galaxy S9(+)
+Subject: [PATCH 02/42] backlight: Fix backlight control on Galaxy S9(+)
 
 Change-Id: I1fbbb47939c377597ef8ad6b88b2acea5f4acaa6
 
@@ -132,5 +132,5 @@ index f712e8de353..43264cb32d2 100644
                      color = 0xff000000 | (color << 16) | (color << 8) | color;
                      setLightLocked(color, LIGHT_FLASH_NONE, 0, 0, brightnessMode);
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0003-Also-scan-system-overlay.patch

@@ -1,7 +1,7 @@
-From b5dcca82cf5b77f83635afd1561f922f4126d006 Mon Sep 17 00:00:00 2001
+From a05d6bb90e90ad00d32ade8e8b64646c30aee97a Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 1 May 2018 17:47:36 +0200
-Subject: [PATCH 03/41] Also scan /system/overlay
+Subject: [PATCH 03/42] Also scan /system/overlay
 
 Change-Id: Ib0223560606b80cdaaa986b159b34b4db0154589
 ---
@@ -39,5 +39,5 @@ index 49d75dc35e6..d5f2317d7c0 100644
        && path.find("/../") == std::string::npos) {
      return true;
 -- 
-2.25.1
+2.34.1
 

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

@@ -1,7 +1,7 @@
-From 5a860b80300eaf21d4bc370350f751ea318cb816 Mon Sep 17 00:00:00 2001
+From 061554c98e52e804ecaee17e0d55045c118efe9c 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/41] Don't crash if there is IR HAL is not declared
+Subject: [PATCH 04/42] Don't crash if there is IR HAL is not declared
 
 ---
  services/core/java/com/android/server/ConsumerIrService.java | 2 --
@@ -21,5 +21,5 @@ index 2ed6c77baa0..c574a03c9a3 100644
      }
  
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0005-Fix-62.patch

@@ -1,7 +1,7 @@
-From 92b7d4527507f738f5baa3406d6cc20efe585907 Mon Sep 17 00:00:00 2001
+From c113dc1a60b8c5b708f31284fea591333e0dfbb9 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 30 May 2018 14:05:30 +0200
-Subject: [PATCH 05/41] Fix(?) #62
+Subject: [PATCH 05/42] Fix(?) #62
 
 ---
  .../src/com/android/keyguard/KeyguardUpdateMonitor.java      | 5 ++++-
@@ -24,5 +24,5 @@ index 8e5f128143d..c0c5c1c0c6d 100644
  
          @Override
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0006-property-matching-RROs-allow-to-prefix-the-value-wit.patch

@@ -1,7 +1,7 @@
-From 59cf97b58783f0fe6b2180d69a7ee955519f4fb4 Mon Sep 17 00:00:00 2001
+From 3361a5969fcbe9e4d83bca09f05741b1f93b95da Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 11 Sep 2020 23:42:37 +0200
-Subject: [PATCH 06/41] property-matching RROs: allow to prefix the value with
+Subject: [PATCH 06/42] property-matching RROs: allow to prefix the value with
  + to do glob match instead of exact match
 
 Change-Id: I1f5b7c907523eb6e48d41f5163984564d3db9506
@@ -34,5 +34,5 @@ index 36250450cc7..6a5162dd0d9 100644
      }
  
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0007-remaining-of-HAL-onEnroll-is-actually-a-percent-of-p.patch

@@ -1,7 +1,7 @@
-From 1d4e89caf6261b0f85ebc033112f232c3593b470 Mon Sep 17 00:00:00 2001
+From 19bfa9a0f7ae9e9bdf5ece453424eb5dbce4b482 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 2 Jul 2018 23:36:39 +0200
-Subject: [PATCH 07/41] "remaining" of HAL onEnroll is actually a percent of
+Subject: [PATCH 07/42] "remaining" of HAL onEnroll is actually a percent of
  progress
 
 Change-Id: I8a586163eca93ae3c5bd968d1e7ddbf994ddcc91
@@ -29,5 +29,5 @@ index a90fee6788a..7ab2a44bcc0 100644
          }
  
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0008-Show-APN-Settings-for-CDMA-carriers.patch

@@ -1,7 +1,7 @@
-From 92a1a350b06a4f847e318076ea013cde579a6ce5 Mon Sep 17 00:00:00 2001
+From 82fa61558eb2f58ff83dd3643ca5290c832f90df Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 6 Aug 2018 12:49:00 +0200
-Subject: [PATCH 08/41] Show APN Settings for CDMA carriers
+Subject: [PATCH 08/42] Show APN Settings for CDMA carriers
 
 ---
  telephony/java/android/telephony/CarrierConfigManager.java | 2 +-
@@ -21,5 +21,5 @@ index 3eedce65231..14658b1169f 100644
          sDefaults.putBoolean(KEY_SMS_REQUIRES_DESTINATION_NUMBER_CONVERSION_BOOL, false);
          sDefaults.putBoolean(KEY_SUPPORT_EMERGENCY_SMS_OVER_IMS_BOOL, false);
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0009-Don-t-wait-IR-HAL-to-the-infinity-and-beyond.patch

@@ -1,7 +1,7 @@
-From 8d86373cd08189aa68f9a40ce0d7bed34b666c5a Mon Sep 17 00:00:00 2001
+From a29ec5d6381c53a363a54a81340716236794c724 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 21 Aug 2018 22:24:02 +0200
-Subject: [PATCH 09/41] Don't wait IR HAL to the infinity and beyond
+Subject: [PATCH 09/42] Don't wait IR HAL to the infinity and beyond
 
 Change-Id: I3afded27441bbee8244d5fda544b3e6d1238dc1b
 ---
@@ -39,5 +39,5 @@ index 2ca348b3ae4..148fba9a688 100644
  }
  
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0010-Re-order-services-so-that-it-works-even-without-qtag.patch

@@ -1,7 +1,7 @@
-From b05a49890f39eb9749cbde9ba7624ca8076dc339 Mon Sep 17 00:00:00 2001
+From 48a4369683a03ec1d950a733d3d0930fdbd9373a Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 8 Nov 2018 23:04:03 +0100
-Subject: [PATCH 10/41] Re-order services so that it works even without qtaguid
+Subject: [PATCH 10/42] Re-order services so that it works even without qtaguid
 
 Change-Id: I0c0f527b3ae151d45c68f7ac6c205da3f34e74df
 ---
@@ -9,10 +9,10 @@ Change-Id: I0c0f527b3ae151d45c68f7ac6c205da3f34e74df
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
-index eeccb73da3a..2b603feb1e0 100644
+index 2e9e99a1d8c..56a6206976d 100644
 --- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
 +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
-@@ -748,6 +748,10 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
+@@ -753,6 +753,10 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
          Trace.traceBegin(Trace.TRACE_TAG_NETWORK, "systemReady");
          final int oldPriority = Process.getThreadPriority(Process.myTid());
          try {
@@ -23,7 +23,7 @@ index eeccb73da3a..2b603feb1e0 100644
              // Boost thread's priority during system server init
              Process.setThreadPriority(Process.THREAD_PRIORITY_FOREGROUND);
              if (!isBandwidthControlEnabled()) {
-@@ -755,10 +759,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
+@@ -760,10 +764,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
                  return;
              }
  
@@ -35,5 +35,5 @@ index eeccb73da3a..2b603feb1e0 100644
                  synchronized (mNetworkPoliciesSecondLock) {
                      updatePowerSaveWhitelistUL();
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0011-Support-new-samsung-Pie-and-Q-light-hal-and-Samsung-.patch

@@ -1,7 +1,7 @@
-From 3a6869d07b2d6d273f1f22e1e3744cfc28dccd77 Mon Sep 17 00:00:00 2001
+From 55ad9c352d1b66ff771ba3eab6cd1fc1b01bcc68 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 24 Mar 2019 23:05:14 +0100
-Subject: [PATCH 11/41] Support new samsung Pie and Q light hal and Samsung
+Subject: [PATCH 11/42] Support new samsung Pie and Q light hal and Samsung
  Power HALs
 
 Change-Id: I37dc7af3fbc6f9bfa2a4822d4dfba817e803945e
@@ -172,5 +172,5 @@ index 61d53351af5..dcd33366a35 100644
  
  static void nativeSetAutoSuspend(JNIEnv* /* env */, jclass /* clazz */, jboolean enable) {
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0012-Make-Samsung-fingerprint-broken-HAL-overridable.patch

@@ -1,7 +1,7 @@
-From 94adb798b2f9c994b24e09ad0e07f8d090441590 Mon Sep 17 00:00:00 2001
+From 3538553da13d697c8865912f0fb316614b97e188 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 2 Jul 2019 21:19:29 +0200
-Subject: [PATCH 12/41] Make Samsung fingerprint broken HAL overridable
+Subject: [PATCH 12/42] Make Samsung fingerprint broken HAL overridable
 
 Change-Id: I8be38daa7c80fdb61e9209f12215e6daea171d03
 ---
@@ -25,5 +25,5 @@ index 7ab2a44bcc0..def1a873590 100644
  
                  FingerprintService.super.handleEnrollResult(fingerprint, remaining2);
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0013-Add-property-to-use-linear-brightness-slider.patch

@@ -1,7 +1,7 @@
-From 1e0500b2933a1323216139a606aa53469f663bc6 Mon Sep 17 00:00:00 2001
+From a03d0e78ec947630b554742128f6b677d4d7864f Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 11 Aug 2019 10:30:37 +0200
-Subject: [PATCH 13/41] Add property to use linear brightness slider
+Subject: [PATCH 13/42] Add property to use linear brightness slider
 
 Change-Id: I1af7eb923779fa60c7a735904ba8fc82d0622c1d
 ---
@@ -34,5 +34,5 @@ index 4f86afaa995..f1fe73a6a1d 100644
          final float normalizedVal = MathUtils.norm(min, max, val) * 12;
          final float ret;
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0014-Add-support-for-samsung-touch-proximity-sensor-as-fa.patch

@@ -1,7 +1,7 @@
-From 1034f1287025b834b7fb264ff720cfc06926efcc Mon Sep 17 00:00:00 2001
+From 0e91f331403f91280f6f9d0f06e43c9bbfa4a9e7 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 12 Aug 2019 23:08:26 +0200
-Subject: [PATCH 14/41] Add support for samsung touch proximity sensor as
+Subject: [PATCH 14/42] Add support for samsung touch proximity sensor as
  fallback to real proximity sensor
 
 ---
@@ -41,5 +41,5 @@ index f77f0e302aa..4b8d65d00c3 100644
                  boolean positive = distance >= 0.0f && distance < mProximityThreshold;
                  handleProximitySensorEvent(time, positive);
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0015-Also-add-com.samsung.sensor.physical_proximity-if-av.patch

@@ -1,7 +1,7 @@
-From c3f762b056afb9a12898b28c717e89bd126ac4fe Mon Sep 17 00:00:00 2001
+From 093c03e007a79daf63dafbe4c10c5d478eb33df5 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 14 Aug 2019 23:36:45 +0200
-Subject: [PATCH 15/41] Also add com.samsung.sensor.physical_proximity (if
+Subject: [PATCH 15/42] Also add com.samsung.sensor.physical_proximity (if
  available, it is more a true proximity sensor than touch proximity sensor)
 
 ---
@@ -27,5 +27,5 @@ index 4b8d65d00c3..7a50ef4346c 100644
                  List<Sensor> sensors = mSensorManager.getSensorList(Sensor.TYPE_ALL);
                  for(Sensor sensor: sensors) {
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0016-fix-crashing-on-devices-with-higher-aspect-ratio-dow.patch

@@ -1,7 +1,7 @@
-From acd804ea45ec0a9b40870e8238543836a4a7e813 Mon Sep 17 00:00:00 2001
+From 395a58fa5986aa6992578fcf9401466556f40746 Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Thu, 2 Jan 2020 10:16:49 +0800
-Subject: [PATCH 16/41] fix crashing on devices with higher aspect ratio down
+Subject: [PATCH 16/42] fix crashing on devices with higher aspect ratio down
  to sw288dp
 
 * This is what the Qin 2 (Pro) is.
@@ -52,5 +52,5 @@ index 00000000000..40adc2e6879
 +
 +</resources>
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0017-Remove-orientation-4-from-sensor-earlier-in-the-proc.patch

@@ -1,7 +1,7 @@
-From 0e2924e35111803bfd95d2825cd9d09adb564ef6 Mon Sep 17 00:00:00 2001
+From 17be1f29cfb398cf1be9039558472b1259aaaae1 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 1 Mar 2020 18:14:40 +0100
-Subject: [PATCH 17/41] Remove orientation 4 from sensor earlier in the process
+Subject: [PATCH 17/42] Remove orientation 4 from sensor earlier in the process
  chain
 
 Change-Id: Id8e2e860a73d417fc70db6cf5fc5fa5ef187aa50
@@ -24,5 +24,5 @@ index 34867adec91..f3899dc9654 100644
              }
              if (newRotation >=0) {
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0018-Allow-disabling-of-fingerprint-cleanups-needed-on-so.patch

@@ -1,7 +1,7 @@
-From f6f9505fb1462e8095dee8c74418593f0215fbe4 Mon Sep 17 00:00:00 2001
+From 8eacc4c14183a3abe3e234403492addbe6576fb7 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 10 Mar 2020 23:30:17 +0100
-Subject: [PATCH 18/41] Allow disabling of fingerprint cleanups, needed on some
+Subject: [PATCH 18/42] Allow disabling of fingerprint cleanups, needed on some
  Realme devices that cant enumerate
 
 Change-Id: I8a486e707712b81711fb1a691faec029499fa897
@@ -35,5 +35,5 @@ index 70369732fea..aa50e18071b 100644
                          statsModality(),
                          BiometricsProtoEnums.ISSUE_UNKNOWN_TEMPLATE_ENROLLED_FRAMEWORK);
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0019-Always-allow-overriding-the-number-of-work-profiles.patch

@@ -1,7 +1,7 @@
-From cb7cc744be862936a84c2c0d51294896abc8c518 Mon Sep 17 00:00:00 2001
+From 245a112565c94c90623bebab5e51e6d66b6d89ae Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 5 Apr 2020 16:32:46 +0200
-Subject: [PATCH 19/41] Always allow overriding the number of work profiles
+Subject: [PATCH 19/42] Always allow overriding the number of work profiles
 
 Change-Id: I6eb09aa71663c6fbe7563e3038bffcabdba0ff6a
 ---
@@ -9,10 +9,10 @@ Change-Id: I6eb09aa71663c6fbe7563e3038bffcabdba0ff6a
  1 file changed, 2 insertions(+), 6 deletions(-)
 
 diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
-index a768e8e0291..6b8eaf1657d 100644
+index 4a9d6f6ef5f..de63a644f50 100644
 --- a/services/core/java/com/android/server/pm/UserManagerService.java
 +++ b/services/core/java/com/android/server/pm/UserManagerService.java
-@@ -5353,12 +5353,8 @@ public class UserManagerService extends IUserManager.Stub {
+@@ -5449,12 +5449,8 @@ public class UserManagerService extends IUserManager.Stub {
       */
      private static int getMaxUsersOfTypePerParent(UserTypeDetails userTypeDetails) {
          final int defaultMax = userTypeDetails.getMaxAllowedPerParent();
@@ -28,5 +28,5 @@ index a768e8e0291..6b8eaf1657d 100644
          return defaultMax;
      }
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0020-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch

@@ -1,7 +1,7 @@
-From 97fb86a12ed60322e5a06829649416d17008ce53 Mon Sep 17 00:00:00 2001
+From ede37e65fe5496ebfe0471c143e107231381ee44 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 6 Jun 2020 18:21:56 +0200
-Subject: [PATCH 20/41] HOME deserves to wake-up devices just as well as back
+Subject: [PATCH 20/42] HOME deserves to wake-up devices just as well as back
  and menu
 
 Change-Id: Ia562bafd8c620d00c17e8eb338e4701c6c4a3c3a
@@ -10,10 +10,10 @@ Change-Id: Ia562bafd8c620d00c17e8eb338e4701c6c4a3c3a
  1 file changed, 1 insertion(+)
 
 diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java
-index 144dd8b3c36..9a704296bbf 100644
+index 81e962cd435..9cb24c8f19b 100644
 --- a/core/java/android/view/KeyEvent.java
 +++ b/core/java/android/view/KeyEvent.java
-@@ -1977,6 +1977,7 @@ public class KeyEvent extends InputEvent implements Parcelable {
+@@ -1983,6 +1983,7 @@ public class KeyEvent extends InputEvent implements Parcelable {
              case KeyEvent.KEYCODE_CAMERA:
              case KeyEvent.KEYCODE_FOCUS:
              case KeyEvent.KEYCODE_MENU:
@@ -22,5 +22,5 @@ index 144dd8b3c36..9a704296bbf 100644
              case KeyEvent.KEYCODE_STEM_1:
              case KeyEvent.KEYCODE_STEM_2:
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0021-On-old-inits-A-only-devices-multi-sim-basedband-prop.patch

@@ -1,7 +1,7 @@
-From 778b360f0b111463f648aeaf50be8b134c05e307 Mon Sep 17 00:00:00 2001
+From ecc0efa92eddf14cf3e7e3bf405a828583855a25 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 21 Sep 2020 10:30:18 +0200
-Subject: [PATCH 21/41] On old inits (A-only devices), multi-sim basedband
+Subject: [PATCH 21/42] On old inits (A-only devices), multi-sim basedband
  property too long, catch that and make it shorter
 
 Change-Id: I2f52595409f0d43b148063d5fd90c80d1182ff8c
@@ -29,5 +29,5 @@ index 10c3e6db520..09acdea73c1 100644
      }
  
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0022-Some-devices-have-proximity-sensor-reporting-NaN-as-.patch

@@ -1,7 +1,7 @@
-From ddd256856f8fd33fced66ef4c33a101ff45047be Mon Sep 17 00:00:00 2001
+From ec0b63b99ab9c1877ec121435a91ee75677aaf7d Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 29 Sep 2020 22:39:47 +0200
-Subject: [PATCH 22/41] Some devices have proximity sensor reporting NaN as max
+Subject: [PATCH 22/42] Some devices have proximity sensor reporting NaN as max
  range for some reason. Make them behave standard way by setting 5 cm
 
 Change-Id: I3c39e3e914a05903c140235702e0480d2d58a612
@@ -24,5 +24,5 @@ index 7a50ef4346c..f9f9e581ecc 100644
          }
          mCurrentScreenBrightnessSetting = getScreenBrightnessSetting();
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0023-Fix-brightness-range-not-being-complete-on-Samsung-d.patch

@@ -1,7 +1,7 @@
-From 768c5822cdf1376018df4599ce71f4774a7e1ddc Mon Sep 17 00:00:00 2001
+From 3e5a9229a0a2386e49a0fe9ad7270f9603667e9a Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 29 Sep 2020 22:40:10 +0200
-Subject: [PATCH 23/41] Fix brightness range not being complete on Samsung
+Subject: [PATCH 23/42] Fix brightness range not being complete on Samsung
  devices
 
 On some devices, minimum brightness is 0, which totally messes with
@@ -15,7 +15,7 @@ Change-Id: I4d97cbc32490949e83272b81ec6320a5483310b1
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java
-index 3a2f3a211c8..d28078050b1 100644
+index 0b3b91b4af5..e9d07e5c8f0 100644
 --- a/services/core/java/com/android/server/power/PowerManagerService.java
 +++ b/services/core/java/com/android/server/power/PowerManagerService.java
 @@ -964,9 +964,11 @@ public final class PowerManagerService extends SystemService
@@ -33,5 +33,5 @@ index 3a2f3a211c8..d28078050b1 100644
                      PowerManager.BRIGHTNESS_MIN, PowerManager.BRIGHTNESS_MAX);
              mScreenBrightnessMaximum = BrightnessSynchronizer.brightnessIntToFloat(
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0024-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch

@@ -1,7 +1,7 @@
-From c7dc08773098e4b27b5ef0666e4e897d91ac643c Mon Sep 17 00:00:00 2001
+From 0f5a21544a63cd0317adc75fc1483ec5d4f7f63a Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 25 Oct 2020 23:57:26 +0100
-Subject: [PATCH 24/41] Re-implement fnmatch-like behaviour for RRO java-side
+Subject: [PATCH 24/42] Re-implement fnmatch-like behaviour for RRO java-side
 
 Change-Id: Id38292a9a1453aa87b8401c1fdb390fa4e63c7d1
 ---
@@ -9,10 +9,10 @@ Change-Id: Id38292a9a1453aa87b8401c1fdb390fa4e63c7d1
  1 file changed, 11 insertions(+), 2 deletions(-)
 
 diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
-index 70e4e6cbf62..a4d8941d1e5 100644
+index 57f8a713ec1..d7a90c89c95 100644
 --- a/core/java/android/content/pm/PackageParser.java
 +++ b/core/java/android/content/pm/PackageParser.java
-@@ -2476,8 +2476,17 @@ public class PackageParser {
+@@ -2483,8 +2483,17 @@ public class PackageParser {
          for (int i = 0; i < propNames.length; i++) {
              // Check property value: make sure it is both set and equal to expected value
              final String currValue = SystemProperties.get(propNames[i]);
@@ -33,5 +33,5 @@ index 70e4e6cbf62..a4d8941d1e5 100644
          }
          return true;
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0025-Add-support-for-app-signature-spoofing.patch

@@ -1,7 +1,7 @@
-From e580b18a7166a3d9fe2753816a9efee9c8a006e0 Mon Sep 17 00:00:00 2001
+From 3363f301ba2793ec04f28dba8a10a3d880e96ca4 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Mon, 5 Oct 2020 12:36:35 -0700
-Subject: [PATCH 25/41] Add support for app signature spoofing
+Subject: [PATCH 25/42] 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
@@ -46,10 +46,10 @@ index 952ccdad992..73fb59fedab 100644
      field public static final String GET_ACCOUNTS = "android.permission.GET_ACCOUNTS";
      field public static final String GET_ACCOUNTS_PRIVILEGED = "android.permission.GET_ACCOUNTS_PRIVILEGED";
 diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
-index ee428371a01..542b11a65ed 100644
+index eb64db7493c..74176d8be84 100644
 --- a/core/res/AndroidManifest.xml
 +++ b/core/res/AndroidManifest.xml
-@@ -2852,6 +2852,13 @@
+@@ -2857,6 +2857,13 @@
          android:description="@string/permdesc_getPackageSize"
          android:protectionLevel="normal" />
  
@@ -77,7 +77,7 @@ index f4efcc7e4ee..51b461e7949 100644
  
      <!-- This string array can be overriden to enable test location providers initially. -->
 diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
-index d6ee28b93f9..d5b3f54afc5 100644
+index 5c659123b02..4ea996c492c 100644
 --- a/core/res/res/values/strings.xml
 +++ b/core/res/res/values/strings.xml
 @@ -847,6 +847,18 @@
@@ -112,10 +112,10 @@ index 5f15216e840..c29feb9cd7b 100644
      field public static final String GET_ACCOUNTS = "android.permission.GET_ACCOUNTS";
      field public static final String GET_ACCOUNTS_PRIVILEGED = "android.permission.GET_ACCOUNTS_PRIVILEGED";
 diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
-index 70b869e594d..af619aa6bd2 100644
+index 9611b381942..1a8a23856d8 100644
 --- a/services/core/java/com/android/server/pm/PackageManagerService.java
 +++ b/services/core/java/com/android/server/pm/PackageManagerService.java
-@@ -4454,8 +4454,9 @@ public class PackageManagerService extends IPackageManager.Stub
+@@ -4465,8 +4465,9 @@ public class PackageManagerService extends IPackageManager.Stub
                  });
              }
  
@@ -127,7 +127,7 @@ index 70b869e594d..af619aa6bd2 100644
  
              if (packageInfo == null) {
                  return null;
-@@ -4491,6 +4492,24 @@ public class PackageManagerService extends IPackageManager.Stub
+@@ -4502,6 +4503,24 @@ public class PackageManagerService extends IPackageManager.Stub
          }
      }
  
@@ -153,5 +153,5 @@ index 70b869e594d..af619aa6bd2 100644
      public void checkPackageStartable(String packageName, int userId) {
          final int callingUid = Binder.getCallingUid();
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0026-Make-rounded-corners-padding-overridable-with-persis.patch

@@ -1,7 +1,7 @@
-From 10e7e4c086909f0ff7c1c0fac457d5592cfb4740 Mon Sep 17 00:00:00 2001
+From b0b8691f1c9813c199058f78dc0784c6a2505717 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 6 Dec 2020 12:20:08 +0100
-Subject: [PATCH 26/41] Make rounded corners padding overridable with
+Subject: [PATCH 26/42] Make rounded corners padding overridable with
  persist.sys.phh.rounded_corners_padding
 
 Change-Id: Id5d73b06b9a2cb2da95ff31f204c1984555872ff
@@ -87,5 +87,5 @@ index 8856d892fcf..3debe9263eb 100644
          updateStatusBarHeight();
      }
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0027-Remove-useless-notification-about-console-service-be.patch

@@ -1,7 +1,7 @@
-From 78dcffe53a015cae6eedf2a26b82c3f6f568781a Mon Sep 17 00:00:00 2001
+From 7f24256ad286f0146972ab1e6142656fab0ffa6b Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 11 Dec 2020 14:41:09 +0100
-Subject: [PATCH 27/41] Remove useless notification about "console" service
+Subject: [PATCH 27/42] Remove useless notification about "console" service
  being running
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 27/41] Remove useless notification about "console" service
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
-index 0ae9cc279e6..07fd9ba7984 100644
+index 234b23a9962..5c4610ec3a9 100644
 --- a/services/core/java/com/android/server/am/ActivityManagerService.java
 +++ b/services/core/java/com/android/server/am/ActivityManagerService.java
-@@ -5574,7 +5574,7 @@ public class ActivityManagerService extends IActivityManager.Stub
+@@ -5623,7 +5623,7 @@ public class ActivityManagerService extends IActivityManager.Stub
      }
  
      private void showConsoleNotificationIfActive() {
@@ -22,5 +22,5 @@ index 0ae9cc279e6..07fd9ba7984 100644
          }
          String title = mContext
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0028-Ignore-DUN-required-and-always-use-main-APN.patch

@@ -1,7 +1,7 @@
-From 0115026473a0efdf8c92be97fa64cdbe8c371271 Mon Sep 17 00:00:00 2001
+From ffc6df91c8e1d4d510ac738058f7c52ea9c2c965 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 13 Dec 2020 01:38:50 +0100
-Subject: [PATCH 28/41] Ignore DUN required and always use main APN
+Subject: [PATCH 28/42] Ignore DUN required and always use main APN
 
 ---
  .../android/networkstack/tethering/TetheringConfiguration.java  | 2 +-
@@ -21,5 +21,5 @@ index ef2ea3ad6d0..90eb638ec31 100644
          chooseUpstreamAutomatically = getResourceBoolean(
                  res, R.bool.config_tether_upstream_automatic, false /** defaultValue */);
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0029-Revert-Remove-unused-SystemProperties.set.patch

@@ -1,7 +1,7 @@
-From b794722f0917a6548dda6ce031ab7b130929bcee Mon Sep 17 00:00:00 2001
+From 9d2ce41f372bd6c094b12bb24517870456060586 Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Wed, 16 Dec 2020 21:24:12 +0800
-Subject: [PATCH 29/41] Revert "Remove unused SystemProperties.set"
+Subject: [PATCH 29/42] Revert "Remove unused SystemProperties.set"
 
 This reverts commit debb4616ef67f9ed5054eca51ec58592358ff55f.
 
@@ -91,5 +91,5 @@ index 09acdea73c1..79c11feb7f4 100644
       * Inserts or updates a list property. Expands the list if its length is not enough.
       */
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0030-TelephonyManager-bring-back-getNetworkClass.patch

@@ -1,7 +1,7 @@
-From 2f71f5fb95dcaf1933e66e17c3c257c0d9e90efb Mon Sep 17 00:00:00 2001
+From 2f1fdbf2c7bcc6c6e5c6680d604f561919e25080 Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Wed, 16 Dec 2020 13:46:15 +0800
-Subject: [PATCH 30/41] TelephonyManager: bring back getNetworkClass()
+Subject: [PATCH 30/42] TelephonyManager: bring back getNetworkClass()
 
 This partially reverts commit c058cac051ab083dc7fb7ea6aa85699110b2e9bf.
 
@@ -80,5 +80,5 @@ index 79c11feb7f4..130d872b985 100644
       * Returns a string representation of the radio technology (network type)
       * currently in use on the device.
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0031-TelephonyManager-add-API-annotations-for-setTelephon.patch

@@ -1,7 +1,7 @@
-From c015a844f9180ed590127edaeb3493bb54101bbd Mon Sep 17 00:00:00 2001
+From 43375f1f065681b6aaee57b524b2a7511da1562e Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Wed, 16 Dec 2020 21:26:45 +0800
-Subject: [PATCH 31/41] TelephonyManager: add API annotations for
+Subject: [PATCH 31/42] TelephonyManager: add API annotations for
  setTelephonyProperty
 
 * This method was added back by reverting commit
@@ -37,5 +37,5 @@ index 130d872b985..8e16e783523 100644
              value = "";
          }
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0032-Fix-Samsung-Power-HAL-switch-case-was-filled-with-mi.patch

@@ -1,7 +1,7 @@
-From c80e63a38195f4a3f45c76f4b583b68e09f8b2ac Mon Sep 17 00:00:00 2001
+From 09954283a10a0184588e5acc463a97fe1f5fe50b Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 18 Dec 2020 16:38:58 -0500
-Subject: [PATCH 32/41] Fix Samsung Power HAL (switch/case was filled with
+Subject: [PATCH 32/42] Fix Samsung Power HAL (switch/case was filled with
  mines/returns), and cleanup code and add logs
 
 ---
@@ -68,5 +68,5 @@ index dcd33366a35..298cd8c7171 100644
  
  static void nativeSetAutoSuspend(JNIEnv* /* env */, jclass /* clazz */, jboolean enable) {
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0033-KeyStore-Block-key-attestation-for-Google-Play-Servi.patch

@@ -1,7 +1,7 @@
-From c965a22bfdf6b0c9b7c39d006d25422ff2058fb1 Mon Sep 17 00:00:00 2001
+From 6803d618b0042687c23aac36a0ce50a214d43063 Mon Sep 17 00:00:00 2001
 From: Alberto Ponces <ponces26@gmail.com>
 Date: Mon, 18 Jan 2021 09:23:57 +0000
-Subject: [PATCH 33/41] KeyStore: Block key attestation for Google Play
+Subject: [PATCH 33/42] KeyStore: Block key attestation for Google Play
  Services
 
 Change-Id: Ia2cd58ea1abfdb1a2c0eb358442c36b5c6809c6b
@@ -24,5 +24,5 @@ index 88b614dc7ee..de4e9ade191 100644
          try {
              mBinder.asBinder().linkToDeath(promise, 0);
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0034-Fix-Wakelock-issue.patch

@@ -1,7 +1,7 @@
-From b30f8b1b3f5d3376733bc059cabde9cc5815b9ac Mon Sep 17 00:00:00 2001
+From ebea5a27533279ec396b882bd20536b2d37229d0 Mon Sep 17 00:00:00 2001
 From: Alberto Ponces <ponces26@gmail.com>
 Date: Tue, 2 Feb 2021 10:20:51 +0000
-Subject: [PATCH 34/41] Fix Wakelock issue
+Subject: [PATCH 34/42] Fix Wakelock issue
 
 Prevent SystemUI crash due to "WakeLock under-locked Doze" (issue #12) by only releasing a wakelock that was not already released
 ---
@@ -24,5 +24,5 @@ index 8d77c4a194a..e9f25343374 100644
  
              /** @see PowerManager.WakeLock#wrap(Runnable) */
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0035-Fix-for-TestDirectBootEmulated-testcase.patch

@@ -1,7 +1,7 @@
-From f298ce644fa19ee8b43b776a24119bcc006aa7ac Mon Sep 17 00:00:00 2001
+From 5b7dbb4dc20d6026a45b725cc011ec085ec81d60 Mon Sep 17 00:00:00 2001
 From: N Harish <kqn736@zebra.com>
 Date: Mon, 25 Jan 2021 17:22:33 +0530
-Subject: [PATCH 35/41] Fix for TestDirectBootEmulated testcase
+Subject: [PATCH 35/42] Fix for TestDirectBootEmulated testcase
 
 In case of emulated FBE the secrets are empty hence add this
 exception to prevent from unlocking userkey.
@@ -16,10 +16,10 @@ Change-Id: I5be2ceb61d9ef47219862e75cc8ec03ab5513426
  1 file changed, 6 insertions(+)
 
 diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
-index b0ceaee8977..676dab2fa4c 100644
+index a2891430069..a70ea724765 100644
 --- a/services/core/java/com/android/server/StorageManagerService.java
 +++ b/services/core/java/com/android/server/StorageManagerService.java
-@@ -3321,6 +3321,12 @@ class StorageManagerService extends IStorageManager.Stub
+@@ -3322,6 +3322,12 @@ class StorageManagerService extends IStorageManager.Stub
          enforcePermission(android.Manifest.permission.STORAGE_INTERNAL);
  
          if (isFsEncrypted) {
@@ -33,5 +33,5 @@ index b0ceaee8977..676dab2fa4c 100644
                  mVold.unlockUserKey(userId, serialNumber, encodeBytes(token),
                          encodeBytes(secret));
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0036-Make-secondary-displays-lock-screen-black.-Useful-fo.patch

@@ -1,7 +1,7 @@
-From 5296cec29b201ca7c4ededf348d16a57a18220f4 Mon Sep 17 00:00:00 2001
+From ed3f66b30f26a4988f107d263da3a50bbcd4be8b Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 6 Mar 2021 18:39:15 -0500
-Subject: [PATCH 36/41] Make secondary displays' lock screen black. Useful for
+Subject: [PATCH 36/42] Make secondary displays' lock screen black. Useful for
  Moto Razr AOD
 
 ---
@@ -23,5 +23,5 @@ index f4d34f4ca14..58650b26cea 100644
      <com.android.keyguard.KeyguardStatusView
          android:id="@+id/clock"
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0037-On-Samsung-R-vendor-there-is-still-the-ISehMiscPower.patch

@@ -1,7 +1,7 @@
-From 7cb9e3ee13d036156ac48d84c9220d2b2270d044 Mon Sep 17 00:00:00 2001
+From ca6e0d82211a9ce13aeb7efdcbd8b5d7a6646d46 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 13 Mar 2021 13:21:46 -0500
-Subject: [PATCH 37/41] On Samsung R vendor, there is still the ISehMiscPower
+Subject: [PATCH 37/42] On Samsung R vendor, there is still the ISehMiscPower
  HIDL HAL, but there is also the AOSP's AIDL HAL. It was previously assumed
  this wouldn't happen, fix this assumption.
 
@@ -42,5 +42,5 @@ index 298cd8c7171..a5812379f86 100644
          gPowerHalHidlV1_0_ = IPowerV1_0::getService();
          if (gPowerHalHidlV1_0_) {
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0038-Handle-another-type-of-Samsung-proximity-sensor-Hove.patch

@@ -1,7 +1,7 @@
-From 7d5c3b0bc59848c5bac63d8410431c2d70862ca4 Mon Sep 17 00:00:00 2001
+From 141a3a62fec398d1eca1ef25a520754adfc1fd97 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 20 Mar 2021 14:30:17 +0100
-Subject: [PATCH 38/41] Handle another type of Samsung proximity sensor: Hover
+Subject: [PATCH 38/42] Handle another type of Samsung proximity sensor: Hover
  Proximity Sensor, with yet another behavior (seen on S20 FE)
 
 ---
@@ -41,5 +41,5 @@ index f9f9e581ecc..733d245e1a9 100644
                  boolean positive = distance >= 0.0f && distance < mProximityThreshold;
                  handleProximitySensorEvent(time, positive);
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0039-Automatically-detect-pick-up-sensor-so-that-an-overl.patch

@@ -1,7 +1,7 @@
-From 83131b917d381afd9866645aa9cfa69bf447b755 Mon Sep 17 00:00:00 2001
+From dbd2b4a4026987ce4bedba285b134411c4d697ee Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 20 Mar 2021 14:31:01 +0100
-Subject: [PATCH 39/41] Automatically detect pick up sensor, so that an overlay
+Subject: [PATCH 39/42] Automatically detect pick up sensor, so that an overlay
  is required for the sole purpose of enabling pulse doze on pick up sensor
 
 ---
@@ -45,5 +45,5 @@ index ece5c28884f..010fce24057 100644
  
      /** {@hide} */
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0040-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch

@@ -1,7 +1,7 @@
-From 21fbfa2f75c222e4c866d79ac02dcb258a5585fb Mon Sep 17 00:00:00 2001
+From 19c9e4aaccb50165930eea58d2d210a3c09c48c8 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 23 Mar 2021 19:43:26 +0100
-Subject: [PATCH 40/41] Catch broken mainBuiltInDisplayCutoutRectApproximation
+Subject: [PATCH 40/42] Catch broken mainBuiltInDisplayCutoutRectApproximation
 
 Some devices (Redmi Note 9T) have:
 mainBuiltInDisplayCutoutRectApproximation = @android:mainBuiltInDisplayCutout
@@ -39,5 +39,5 @@ index b4863f9c6dd..e1d57e6869a 100644
  
      /**
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0041-Import-back-FacolaView-for-under-display-fingerprint.patch

@@ -1,7 +1,7 @@
-From 6b85e4a7d4f31df6f3be30d3d10907fe6f2edccf Mon Sep 17 00:00:00 2001
+From fa950c454841873c9a4bb4ce56ad27af31178c09 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 10 Aug 2021 19:09:56 -0400
-Subject: [PATCH 41/41] Import back FacolaView for under-display fingerprint
+Subject: [PATCH 41/42] Import back FacolaView for under-display fingerprint
 
 Tested, working-ish on OnePlus Nord2
 ---
@@ -819,5 +819,5 @@ index def1a873590..7143655d5da 100644
  
      @Override
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_frameworks_base/0042-Call-Samsung-s-ISehSysInputDev-to-report-screen-stat.patch

@@ -0,0 +1,103 @@
+From f5bea1b5ec4721d35e785784eaedfda78c3407aa Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Wed, 14 Dec 2022 17:21:00 -0500
+Subject: [PATCH 42/42] Call Samsung's ISehSysInputDev to report screen state
+ to touchscreen driver
+
+This fixes touchscreen not waking up on Galaxy F23
+
+Change-Id: I7f865ad363ab6fe40b0f2a4f96c115eb30407603
+---
+ services/core/Android.bp                      |  1 +
+ .../server/display/LocalDisplayAdapter.java   | 32 +++++++++++++++++++
+ 2 files changed, 33 insertions(+)
+
+diff --git a/services/core/Android.bp b/services/core/Android.bp
+index 0e3707cf5bd..70c56372b1d 100644
+--- a/services/core/Android.bp
++++ b/services/core/Android.bp
+@@ -147,6 +147,7 @@ java_library_static {
+         "vendor.samsung.hardware.biometrics.fingerprint-V3.0-java",
+         "vendor.oppo.hardware.biometrics.fingerprint-V2.1-java",
+         "vendor.xiaomi.hardware.fingerprintextension-V1.0-java",
++        "vendor.samsung.hardware.sysinput-V1.2-java", // HIDL
+     ],
+ }
+ 
+diff --git a/services/core/java/com/android/server/display/LocalDisplayAdapter.java b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
+index 2c08420af42..b42944b9b4d 100644
+--- a/services/core/java/com/android/server/display/LocalDisplayAdapter.java
++++ b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
+@@ -29,6 +29,7 @@ import android.os.SystemProperties;
+ import android.os.Trace;
+ import android.util.LongSparseArray;
+ import android.util.Slog;
++import android.util.Log;
+ import android.util.SparseArray;
+ import android.util.Spline;
+ import android.view.Display;
+@@ -44,6 +45,8 @@ import com.android.server.LocalServices;
+ import com.android.server.lights.LightsManager;
+ import com.android.server.lights.LogicalLight;
+ 
++import vendor.samsung.hardware.sysinput.V1_1.ISehSysInputDev;
++
+ import java.io.PrintWriter;
+ import java.util.ArrayList;
+ import java.util.Arrays;
+@@ -204,6 +207,9 @@ final class LocalDisplayAdapter extends DisplayAdapter {
+ 
+         private DisplayDeviceConfig mDisplayDeviceConfig;
+ 
++        private boolean triedSamsungHal = false;
++        private ISehSysInputDev samsungSysinput = null;
++
+         LocalDisplayDevice(IBinder displayToken, long physicalDisplayId,
+                 SurfaceControl.DisplayInfo info, SurfaceControl.DisplayConfig[] configs,
+                 int activeConfigId, SurfaceControl.DesiredDisplayConfigSpecs configSpecs,
+@@ -683,16 +689,42 @@ final class LocalDisplayAdapter extends DisplayAdapter {
+                             }
+                             mSidekickActive = false;
+                         }
++                        if (!triedSamsungHal) {
++                            triedSamsungHal = true;
++                            try {
++                                samsungSysinput = ISehSysInputDev.getService();
++                            } catch(Throwable t) {}
++                        }
+                         final int mode = getPowerModeForState(state);
+                         Trace.traceBegin(Trace.TRACE_TAG_POWER, "setDisplayState("
+                                 + "id=" + physicalDisplayId
+                                 + ", state=" + Display.stateToString(state) + ")");
++
++                        if (samsungSysinput != null) {
++                            try {
++                                Log.d("PHH", "setTspEnable 1, " + state + ", true");
++                                samsungSysinput.setTspEnable(1, state, true);
++                            } catch(Throwable t) {
++                                Log.d("PHH", "Failed settings tsp enable", t);
++                            }
++                        }
++
+                         try {
+                             SurfaceControl.setDisplayPowerMode(token, mode);
+                             Trace.traceCounter(Trace.TRACE_TAG_POWER, "DisplayPowerMode", mode);
+                         } finally {
+                             Trace.traceEnd(Trace.TRACE_TAG_POWER);
+                         }
++
++                        if (samsungSysinput != null) {
++                            try {
++                                Log.d("PHH", "setTspEnable 1, " + state + ", false");
++                                samsungSysinput.setTspEnable(1, state, false);
++                            } catch(Throwable t) {
++                                Log.d("PHH", "Failed settings tsp enable", t);
++                            }
++                        }
++
+                         // If we're entering a suspended (but not OFF) power state and we
+                         // have a sidekick available, tell it now that it can take control.
+                         if (Display.isSuspendedState(state) && state != Display.STATE_OFF
+-- 
+2.34.1
+

patches_treble_phh/platform_system_vold/0001-Allow-deletion-of-symlink.patch

@@ -1,7 +1,7 @@
-From fdfa781b28c22610fc2cc26a2820da5d0fda4c32 Mon Sep 17 00:00:00 2001
+From 6c2471e81fd226bcb4e0314b996f13aeb51738f1 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 17 Feb 2018 19:39:38 +0100
-Subject: [PATCH 1/6] Allow deletion of symlink
+Subject: [PATCH 1/5] Allow deletion of symlink
 
 Change-Id: I9731895f88729072297f753088583aabbe6990f4
 ---
@@ -21,5 +21,5 @@ index fd42cbe..230fdf6 100644
          return false;
      }
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_system_vold/0002-Check-needsCheckpoint-only-if-checkpoint-is-supporte.patch

@@ -1,7 +1,7 @@
-From e46c9b776cef6a26dceb5e447a7efbe14608df93 Mon Sep 17 00:00:00 2001
+From 3d68d6ddc26b0b60b36f1697dd162967fb99af19 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 16 Sep 2019 13:49:05 +0200
-Subject: [PATCH 3/6] Check needsCheckpoint only if checkpoint is supported
+Subject: [PATCH 2/5] Check needsCheckpoint only if checkpoint is supported
 
 This is needed because some devices (Xiaomi MiPad 4, uncertified)
 declares a bootctrl HAL in manifest, but doesn't have it.
@@ -28,5 +28,5 @@ index 3c6ed15..4188797 100644
          while ((mount_rc = fs_mgr_do_mount(&fstab_default, DATA_MNT_POINT, blkdev.data(), 0,
                                             needs_cp, false)) != 0) {
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_system_vold/0002-Support-Samsung-s-implementation-of-exfat-called-sdf.patch

@@ -1,44 +0,0 @@
-From 42c27d00edd1a7cf52b7fa33cc16395e05e37d3c Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Mon, 20 Aug 2018 22:37:54 +0200
-Subject: [PATCH 2/6] Support Samsung's implementation of exfat, called sdfat
-
----
- fs/Exfat.cpp | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/fs/Exfat.cpp b/fs/Exfat.cpp
-index 34f1024..3aa9494 100644
---- a/fs/Exfat.cpp
-+++ b/fs/Exfat.cpp
-@@ -35,7 +35,7 @@ static const char* kFsckPath = "/system/bin/fsck.exfat";
- 
- bool IsSupported() {
-     return access(kMkfsPath, X_OK) == 0 && access(kFsckPath, X_OK) == 0 &&
--           IsFilesystemSupported("exfat");
-+           (IsFilesystemSupported("exfat") || IsFilesystemSupported("sdfat"));
- }
- 
- status_t Check(const std::string& source) {
-@@ -61,13 +61,16 @@ status_t Mount(const std::string& source, const std::string& target, int ownerUi
-     auto mountData = android::base::StringPrintf("uid=%d,gid=%d,fmask=%o,dmask=%o", ownerUid,
-                                                  ownerGid, permMask, permMask);
- 
--    if (mount(source.c_str(), target.c_str(), "exfat", mountFlags, mountData.c_str()) == 0) {
-+    const char *fs = "exfat";
-+    if(IsFilesystemSupported("sdfat"))
-+        fs = "sdfat";
-+    if (mount(source.c_str(), target.c_str(), fs, mountFlags, mountData.c_str()) == 0) {
-         return 0;
-     }
- 
-     PLOG(ERROR) << "Mount failed; attempting read-only";
-     mountFlags |= MS_RDONLY;
--    if (mount(source.c_str(), target.c_str(), "exfat", mountFlags, mountData.c_str()) == 0) {
-+    if (mount(source.c_str(), target.c_str(), fs, mountFlags, mountData.c_str()) == 0) {
-         return 0;
-     }
- 
--- 
-2.25.1
-

patches_treble_phh/platform_system_vold/0003-Failing-to-create-facedata-shouldn-t-be-fatal.patch

@@ -1,7 +1,7 @@
-From 4d463aa11eeaddc24542fe35da764b0194cf2701 Mon Sep 17 00:00:00 2001
+From 32a61bdac378c17fa0b0e21b9e543eac58b26039 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 7 Mar 2020 14:49:09 +0100
-Subject: [PATCH 5/6] Failing to create facedata shouldn't be fatal
+Subject: [PATCH 3/5] Failing to create facedata shouldn't be fatal
 
 Some Pie vendors create it on their own, so SELinux would deny that
 Also not all devices have face unlock anyway
@@ -34,5 +34,5 @@ index d624d73..60056f3 100644
          }
      }
 -- 
-2.25.1
+2.34.1
 

patches_treble_phh/platform_system_vold/0004-Exfat-can-be-mounted-with-exfat-kernel-fs-driver-or-.patch

@@ -0,0 +1,60 @@
+From 8ca8ebf6f8b5842abfa6943a1773a529e1def310 Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Tue, 18 Oct 2022 16:08:09 -0400
+Subject: [PATCH 4/5] Exfat can be mounted with "exfat" kernel fs driver, or
+ "sdfat" or "texfat" (Samsung and Sony variants)
+
+@AndyCGYan: Adapt to LineageOS vold
+
+Change-Id: I331e66d8cb37664adbd493b9190123e29f01fd9d
+---
+ Utils.cpp    |  5 +++++
+ fs/Exfat.cpp | 11 +++++++++--
+ 2 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/Utils.cpp b/Utils.cpp
+index 8ce1370..d6c10a5 100644
+--- a/Utils.cpp
++++ b/Utils.cpp
+@@ -1004,6 +1004,11 @@ bool IsFilesystemSupported(const std::string& fsType) {
+     /* fuse filesystems */
+     supported.append("fuse\tntfs\n");
+ 
++    /* treat sdfat/texfat as exfat */
++    if (supported.find("sdfat\n") != std::string::npos || supported.find("texfat\n") != std::string::npos) {
++        supported.append("\texfat\n");
++    }
++
+     return supported.find(fsType + "\n") != std::string::npos;
+ }
+ 
+diff --git a/fs/Exfat.cpp b/fs/Exfat.cpp
+index 34f1024..2f13e69 100644
+--- a/fs/Exfat.cpp
++++ b/fs/Exfat.cpp
+@@ -61,13 +61,20 @@ status_t Mount(const std::string& source, const std::string& target, int ownerUi
+     auto mountData = android::base::StringPrintf("uid=%d,gid=%d,fmask=%o,dmask=%o", ownerUid,
+                                                  ownerGid, permMask, permMask);
+ 
+-    if (mount(source.c_str(), target.c_str(), "exfat", mountFlags, mountData.c_str()) == 0) {
++    const char *fs = "exfat";
++    if (IsFilesystemSupported("sdfat")) {
++        fs = "sdfat";
++    } else if (IsFilesystemSupported("texfat")) {
++        fs = "texfat";
++    }
++
++    if (mount(source.c_str(), target.c_str(), fs, mountFlags, mountData.c_str()) == 0) {
+         return 0;
+     }
+ 
+     PLOG(ERROR) << "Mount failed; attempting read-only";
+     mountFlags |= MS_RDONLY;
+-    if (mount(source.c_str(), target.c_str(), "exfat", mountFlags, mountData.c_str()) == 0) {
++    if (mount(source.c_str(), target.c_str(), fs, mountFlags, mountData.c_str()) == 0) {
+         return 0;
+     }
+ 
+-- 
+2.34.1
+

patches_treble_phh/platform_system_vold/0004-Sony-has-texfat-exfat-fs.patch

@@ -1,38 +0,0 @@
-From 719cfde8ee01af3d1d9304bad2337466876a5af4 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Tue, 28 Jan 2020 00:27:17 +0100
-Subject: [PATCH 4/6] Sony has `texfat` exfat fs
-
----
- fs/Exfat.cpp | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/fs/Exfat.cpp b/fs/Exfat.cpp
-index 3aa9494..03ad649 100644
---- a/fs/Exfat.cpp
-+++ b/fs/Exfat.cpp
-@@ -35,7 +35,11 @@ static const char* kFsckPath = "/system/bin/fsck.exfat";
- 
- bool IsSupported() {
-     return access(kMkfsPath, X_OK) == 0 && access(kFsckPath, X_OK) == 0 &&
--           (IsFilesystemSupported("exfat") || IsFilesystemSupported("sdfat"));
-+           (
-+            IsFilesystemSupported("exfat") ||
-+            IsFilesystemSupported("sdfat") ||
-+            IsFilesystemSupported("texfat")
-+            );
- }
- 
- status_t Check(const std::string& source) {
-@@ -64,6 +68,8 @@ status_t Mount(const std::string& source, const std::string& target, int ownerUi
-     const char *fs = "exfat";
-     if(IsFilesystemSupported("sdfat"))
-         fs = "sdfat";
-+    if(IsFilesystemSupported("texfat"))
-+        fs = "texfat";
-     if (mount(source.c_str(), target.c_str(), fs, mountFlags, mountData.c_str()) == 0) {
-         return 0;
-     }
--- 
-2.25.1
-

patches_treble_phh/platform_system_vold/0005-Every-voldmanaged-storage-is-adoptable.patch

@@ -1,7 +1,7 @@
-From 1cbbd5e59bad038231806c4ae9b04cbb2f0208da Mon Sep 17 00:00:00 2001
+From 09b7b2dba0978730e7dd25da499b9ff9cb497933 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 11 Mar 2020 14:02:35 +0100
-Subject: [PATCH 6/6] Every voldmanaged storage is adoptable
+Subject: [PATCH 5/5] Every voldmanaged storage is adoptable
 
 ---
  main.cpp | 2 +-
@@ -21,5 +21,5 @@ index 2ddb958..77c8ab5 100644
                  *has_adoptable = true;
              }
 -- 
-2.25.1
+2.34.1
 

patches_treble_prerequisite/frameworks_base/0001-Squashed-revert-of-LOS-FOD-implementation.patch

@@ -1,4 +1,4 @@
-From cfc6cf10b64ef3ecba6586ed87dcf90d32918b4e Mon Sep 17 00:00:00 2001
+From 0a4b57f5217bdc225fbeda515ebeb0296f5ea501 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Tue, 13 Jul 2021 16:01:31 +0000
 Subject: [PATCH] Squashed revert of LOS FOD implementation
@@ -175,10 +175,10 @@ index c78630c05f0..84870f83ad2 100644
      ],
      libs: [
 diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
-index 6bee19745c8..541a9cf7722 100644
+index c536b6cb94d..9999bbe2d5b 100644
 --- a/packages/SystemUI/AndroidManifest.xml
 +++ b/packages/SystemUI/AndroidManifest.xml
-@@ -137,7 +137,6 @@
+@@ -138,7 +138,6 @@
      <uses-permission android:name="android.permission.USE_FINGERPRINT" />
      <uses-permission android:name="android.permission.RESET_FINGERPRINT_LOCKOUT" />
      <uses-permission android:name="android.permission.MANAGE_BIOMETRIC" />
@@ -283,7 +283,7 @@ index b17044b1bcc..6554fd54f11 100644
      <integer name="config_maxVisibleNotificationIcons">4</integer>
      <integer name="config_maxVisibleNotificationIconsOnLock">5</integer>
 diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
-index bace9324ac9..1db2e32b8cd 100644
+index 27aef8089a8..52cc4bd481a 100644
 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
 +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
 @@ -33,7 +33,6 @@ import android.app.AlertDialog;
@@ -294,7 +294,7 @@ index bace9324ac9..1db2e32b8cd 100644
  import android.content.res.ColorStateList;
  import android.graphics.Insets;
  import android.graphics.Rect;
-@@ -80,8 +79,6 @@ import com.android.systemui.shared.system.SysUiStatsLog;
+@@ -81,8 +80,6 @@ import com.android.systemui.statusbar.policy.DeviceProvisionedController;
  import com.android.systemui.statusbar.policy.KeyguardStateController;
  import com.android.systemui.util.InjectionInflationController;
  
@@ -303,7 +303,7 @@ index bace9324ac9..1db2e32b8cd 100644
  import java.util.List;
  
  public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSecurityView {
-@@ -127,7 +124,6 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
+@@ -128,7 +125,6 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
      private InjectionInflationController mInjectionInflationController;
      private boolean mSwipeUpToRetry;
      private AdminSecondaryLockScreenController mSecondaryLockScreenController;
@@ -311,10 +311,10 @@ index bace9324ac9..1db2e32b8cd 100644
  
      private final ViewConfiguration mViewConfiguration;
      private final SpringAnimation mSpringAnimation;
-@@ -265,10 +261,6 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
+@@ -268,10 +264,6 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
-         mKeyguardStateController = Dependency.get(KeyguardStateController.class);
          mSecondaryLockScreenController = new AdminSecondaryLockScreenController(context, this,
                  mUpdateMonitor, mCallback, new Handler(Looper.myLooper()));
+         mDeviceProvisionedController = Dependency.get(DeviceProvisionedController.class);
 -
 -        PackageManager packageManager = mContext.getPackageManager();
 -        mHasFod = packageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT) &&
@@ -322,7 +322,7 @@ index bace9324ac9..1db2e32b8cd 100644
      }
  
      public void setSecurityCallback(SecurityCallback callback) {
-@@ -525,10 +517,6 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
+@@ -528,10 +520,6 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
  
          // Consume bottom insets because we're setting the padding locally (for IME and navbar.)
          int inset;
@@ -333,7 +333,7 @@ index bace9324ac9..1db2e32b8cd 100644
          if (sNewInsetsMode == NEW_INSETS_MODE_FULL) {
              int bottomInset = insets.getInsetsIgnoringVisibility(systemBars()).bottom;
              int imeInset = insets.getInsets(ime()).bottom;
-@@ -536,8 +524,7 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
+@@ -539,8 +527,7 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
          } else {
              inset = insets.getSystemWindowInsetBottom();
          }
@@ -1242,7 +1242,7 @@ index a0a2e6f0dd6..413a522bccd 100644
      @Binds
      @IntoMap
 diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
-index 3eb5de9289e..0c939020780 100644
+index d60721bfdf8..8e97804934c 100644
 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
 +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
 @@ -38,7 +38,6 @@ import android.content.ContentResolver;
@@ -1270,7 +1270,7 @@ index 3eb5de9289e..0c939020780 100644
      private final DeviceConfig.OnPropertiesChangedListener mOnPropertiesChangedListener =
              new DeviceConfig.OnPropertiesChangedListener() {
              @Override
-@@ -757,8 +753,6 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
+@@ -764,8 +760,6 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
                  QuickStepContract.isGesturalMode(navigationModeController.addListener(mode -> {
                      mInGestureNavigationMode = QuickStepContract.isGesturalMode(mode);
                  }));
@@ -1279,7 +1279,7 @@ index 3eb5de9289e..0c939020780 100644
      }
  
      public void userActivity() {
-@@ -891,9 +885,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
+@@ -898,9 +892,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
              // explicitly DO NOT want to call
              // mKeyguardViewControllerLazy.get().setKeyguardGoingAwayState(false)
              // here, since that will mess with the device lock state.
@@ -1421,7 +1421,7 @@ index 1e1655256b1..382715a3fb7 100644
                  mCallback.onExpandAnimationFinished(mIsFullScreenLaunch);
                  applyParamsToNotification(null);
 diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
-index 8aca0846a67..b55d6a55bca 100644
+index ebbefbe4524..fbe75f13e50 100644
 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
 +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
 @@ -76,7 +76,6 @@ import android.content.res.Configuration;
@@ -1571,7 +1571,7 @@ index 8aca0846a67..b55d6a55bca 100644
      }
  
      protected BarTransitions getStatusBarTransitions() {
-@@ -4680,22 +4628,4 @@ public class StatusBar extends SystemUI implements DemoMode,
+@@ -4685,22 +4633,4 @@ public class StatusBar extends SystemUI implements DemoMode,
      public void suppressAmbientDisplay(boolean suppressed) {
          mDozeServiceHost.setDozeSuppressed(suppressed);
      }
@@ -1707,7 +1707,7 @@ index 3e5454d84d0..2fa6cf02d8b 100644
  
      @Test
 diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java
-index c6dba6b8b80..474e9d7446f 100644
+index 2cc4ceea3f9..a2a2d77177d 100644
 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java
 +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java
 @@ -79,7 +79,6 @@ import com.android.systemui.InitController;
@@ -2007,5 +2007,5 @@ index 2412209452b..13b9508a9c8 100644
      public void setBlockedGesturalNavigation(boolean blocked) {
          if (mBar != null) {
 -- 
-2.25.1
+2.34.1