feat: Sync with latest sources of TrebleDroid

patches/trebledroid/platform_bionic/0001-Disable-vndklite-handling.patch

@@ -1,4 +1,4 @@
-From 9d5a7fac46a27db0efe27f902933ded495102458 Mon Sep 17 00:00:00 2001
+From af0cc2a5eebfc386024136900da9f17b6a16726a Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Wed, 27 Oct 2021 14:39:29 -0400
 Subject: [PATCH 1/2] Disable vndklite handling

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

@@ -1,4 +1,4 @@
-From fe04ccfd62f79856ffcfe3a10d905f12362c1094 Mon Sep 17 00:00:00 2001
+From a332edecfee150f0ffbd67282c72f68d1b682616 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Sat, 19 Feb 2022 08:20:25 -0500
 Subject: [PATCH 2/2] Add new mechanism to fake vendor props on a per-process

patches/trebledroid/platform_bootable_recovery/0001-Don-t-reboot-if-we-couldn-t-get-bootctrl.patch

@@ -1,4 +1,4 @@
-From edee230e9ff11d779322b76646aa5b7e48e10ab9 Mon Sep 17 00:00:00 2001
+From fbb82efdec1071381860cedb5124a85625e6e1de Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Thu, 12 Sep 2019 20:31:07 +0200
 Subject: [PATCH] Don't reboot if we couldn't get bootctrl

patches/trebledroid/platform_build/0001-build-remove-emulator-crap-from-GSI.patch

@@ -1,4 +1,4 @@
-From 3127d705a0024e37f94174b17b94cf2fb331e7e4 Mon Sep 17 00:00:00 2001
+From e84a0c181acc13458bffa0c5f360c75925322820 Mon Sep 17 00:00:00 2001
 From: sooti <[email protected]>
 Date: Tue, 12 Oct 2021 14:32:52 +0300
 Subject: [PATCH 1/4] build: remove emulator crap from GSI

patches/trebledroid/platform_build/0002-build-Bypass-vendor-calls.patch

@@ -1,4 +1,4 @@
-From 5f354b54b48358256e5f6251939edfaa1d4127ff Mon Sep 17 00:00:00 2001
+From e90c5514c393cb6b9751a0c1d8f82a74eea54910 Mon Sep 17 00:00:00 2001
 From: Alberto Ponces <[email protected]>
 Date: Mon, 18 Oct 2021 17:20:18 +0100
 Subject: [PATCH 2/4] build: Bypass vendor calls

patches/trebledroid/platform_build/0003-Remove-init.vndk-nodef.rc.patch

@@ -1,4 +1,4 @@
-From 57726d32bc8dc8d62d07e6069e0c274cc605714d Mon Sep 17 00:00:00 2001
+From 09850733318a3af134c9bcbdd716b4ba5b6fc4ce Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <[email protected]>
 Date: Wed, 8 Dec 2021 07:04:53 +0000
 Subject: [PATCH 3/4] Remove init.vndk-nodef.rc

patches/trebledroid/platform_build/0004-build-Remove-llkd.patch

@@ -1,4 +1,4 @@
-From df9771083d5123ddebf8fd485da2dc3549d87672 Mon Sep 17 00:00:00 2001
+From faf1721205ba659e78f9be63d60af42474a800c0 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <[email protected]>
 Date: Thu, 14 Oct 2021 12:20:52 +0000
 Subject: [PATCH 4/4] build: Remove llkd

patches/trebledroid/platform_external_selinux/0001-Increase-default-log_level-to-get-actual-selinux-err.patch

@@ -1,4 +1,4 @@
-From 43119ff620379b3710f1411b0e965ed0b10982fc Mon Sep 17 00:00:00 2001
+From fc8f28ccfc3e49298d4789260dda7d9bbe3c33ba Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Mon, 9 Apr 2018 00:19:49 +0200
 Subject: [PATCH 1/9] Increase default log_level to get actual selinux error in

patches/trebledroid/platform_external_selinux/0002-Revert-libsepol-Make-an-unknown-permission-an-error-.patch

@@ -1,4 +1,4 @@
-From 1e713fc5860318d2a99f31718fea884c8d461923 Mon Sep 17 00:00:00 2001
+From b63320f4022210ee9f8e67d2300f9727cc159d49 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Wed, 9 Sep 2020 22:36:42 +0200
 Subject: [PATCH 2/9] Revert "libsepol: Make an unknown permission an error in

patches/trebledroid/platform_external_selinux/0003-Workaround-device-phh-treble-conflict-with-SELinux-p.patch

@@ -1,4 +1,4 @@
-From 383c762e65ba755da5f424cea56f7249fb4aa852 Mon Sep 17 00:00:00 2001
+From 2c2c493e7e2b19b2ecb8d9384fca6a708dc3e32d Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Wed, 31 Mar 2021 23:32:37 +0200
 Subject: [PATCH 3/9] Workaround device/phh/treble conflict with SELinux policy

patches/trebledroid/platform_external_selinux/0004-Allow-devices-virtual-block-genfscon-conflict-seen-o.patch

@@ -1,4 +1,4 @@
-From f1ee5e7fb0ef1bbed930d955ce34601f91850762 Mon Sep 17 00:00:00 2001
+From 0ede022c6b36dbfeea037ebebd7421fbc5477a9f Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Fri, 6 Sep 2019 15:07:25 +0200
 Subject: [PATCH 4/9] Allow /devices/virtual/block/ genfscon conflict (seen on

patches/trebledroid/platform_external_selinux/0005-if-service-is-rcs-accept-conflict.-Seen-on-Moto-E5.patch

@@ -1,4 +1,4 @@
-From d023a3be8b43e5539ac5aab02f0fa96c03ed9901 Mon Sep 17 00:00:00 2001
+From 3e059c726dda9c48aad6ce7b65478da5db83f3a6 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Thu, 12 Sep 2019 20:37:04 +0200
 Subject: [PATCH 5/9] if service is "rcs", accept conflict. Seen on Moto E5

patches/trebledroid/platform_external_selinux/0006-Allow-mismatches-of-exfat-genfscon.patch

@@ -1,4 +1,4 @@
-From 9cd3d8a0becbd182f5fe77af64ca7611ceba6fd1 Mon Sep 17 00:00:00 2001
+From 53c46f607b4b16f2cf5f46ea4d8af155e2fba44e Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Sun, 24 May 2020 17:22:22 +0200
 Subject: [PATCH 6/9] Allow mismatches of exfat genfscon

patches/trebledroid/platform_external_selinux/0007-Enable-multipl_decls-by-default.-This-is-needed-beca.patch

@@ -1,4 +1,4 @@
-From 81a82adb74c53b1671f24cb69a140a7915707f0f Mon Sep 17 00:00:00 2001
+From 7dfebcb1fdcef5c74061036ce5041fe4d9a73cc4 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Fri, 2 Mar 2018 22:49:55 +0100
 Subject: [PATCH 7/9] Enable multipl_decls by default. This is needed because

patches/trebledroid/platform_external_selinux/0008-Fix-boot-on-Moto-devices-using-unknown-class.patch

@@ -1,4 +1,4 @@
-From 426de61556334b4b1024f615302dadb1ed6d6ac8 Mon Sep 17 00:00:00 2001
+From dcc131ee066a03ef1614da53ea3ddccf7cb7561b Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Fri, 25 Oct 2019 13:29:20 +0200
 Subject: [PATCH 8/9] Fix boot on Moto devices using unknown class

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

@@ -1,7 +1,7 @@
-From cb83b448445c8bbb402347810417ec7d0f5b16f1 Mon Sep 17 00:00:00 2001
+From 90b0138f1950f37e431f64c4191c72d4730fe0a2 Mon Sep 17 00:00:00 2001
 From: Peter Cai <[email protected]>
 Date: Thu, 18 Aug 2022 15:44:46 -0400
-Subject: [PATCH 01/25] APM: Restore S, R and Q behavior respectively for
+Subject: [PATCH 01/26] APM: Restore S, R and Q behavior respectively for
  telephony audio
 
 This conditionally reverts part of b2e5cb (T), 51c9cc (S) and afd4ce (R)

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

@@ -1,7 +1,7 @@
-From 4a40de30098a91a5925a70dd288f83340dfddacb Mon Sep 17 00:00:00 2001
+From 7972cc1fa49a7df6100664d5d1157e91f9b9454b Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Mon, 5 Aug 2019 18:09:50 +0200
-Subject: [PATCH 02/25] Fix BT in-call on CAF devices
+Subject: [PATCH 02/26] Fix BT in-call on CAF devices
 
 See https://github.com/phhusson/treble_experimentations/issues/374
 

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

@@ -1,7 +1,7 @@
-From b8e6008e51c98fb97488248a84e73581a3b6f4c4 Mon Sep 17 00:00:00 2001
+From 8727a0ed69f83951bfd09f87f30e77a1c7c275de Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Tue, 1 Oct 2019 13:35:49 +0200
-Subject: [PATCH 03/25] Add (partial, cam id is hardcoded) support for Asus ZF6
+Subject: [PATCH 03/26] Add (partial, cam id is hardcoded) support for Asus ZF6
  motor camera
 
 Change-Id: Iea6e1370780a1d16f728748d1d948d092532d8fe

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

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

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

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

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

@@ -1,7 +1,7 @@
-From 0c552790875f6adb65ff8ee0a9c24ade8f4f1f94 Mon Sep 17 00:00:00 2001
+From e589de7869edcdde8fe3404258590d07a123e5bd Mon Sep 17 00:00:00 2001
 From: Peter Cai <[email protected]>
 Date: Thu, 23 Jan 2020 11:13:43 +0800
-Subject: [PATCH 06/25] audiopolicy: try again with trimmed audio port name if
+Subject: [PATCH 06/26] audiopolicy: try again with trimmed audio port name if
  not found
 
 * In Spreadtrum BSP, some audio routes may contain ports with extra

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

@@ -1,7 +1,7 @@
-From 29fd5f4f06dcbf3b46098f03d6dad1c06ee4f9a9 Mon Sep 17 00:00:00 2001
+From 13670ac74fbf38dca95ed1639bb1baabba1f1700 Mon Sep 17 00:00:00 2001
 From: Peter Cai <[email protected]>
 Date: Wed, 1 Jun 2022 16:56:46 -0400
-Subject: [PATCH 07/25] camera: Implement property to override default camera
+Subject: [PATCH 07/26] camera: Implement property to override default camera
 
 Complement to the frameworks/base patch.
 
@@ -11,7 +11,7 @@ Change-Id: I002bfa974bafc2cc01365eeea31c7a5dcb5a2028
  1 file changed, 22 insertions(+)
 
 diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
-index abaea6639f..59b59f44fb 100644
+index 6ef16b3ca8..3dd15d9fe9 100644
 --- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
 +++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
 @@ -36,6 +36,7 @@

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

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

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

@@ -1,7 +1,7 @@
-From 625bf06d1ffb8e5e1dafa8db10950b5b17112e1c Mon Sep 17 00:00:00 2001
+From 6158ead8cb94ed94e13e7e0ffe856bedf614d33f Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Thu, 14 May 2020 19:54:55 +0200
-Subject: [PATCH 09/25] Add persist.sys.phh.samsung.camera_ids property to
+Subject: [PATCH 09/26] Add persist.sys.phh.samsung.camera_ids property to
  access hidden Samsung cameras
 
 Change-Id: I2c7bf535272acc28ed2277e96c78ddd28a0b4593
@@ -23,7 +23,7 @@ index 981c56942c..7c4e4d9bcd 100644
      ],
 
 diff --git a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
-index bded9aafec..cd16cce988 100644
+index d60565fb68..b02cf26445 100644
 --- a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
 +++ b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
 @@ -27,6 +27,7 @@

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

@@ -1,7 +1,7 @@
-From 8f7708dbb3efa8d2ab1042d3fa97676c209097c6 Mon Sep 17 00:00:00 2001
+From 2931cda41b6432e15a2fe8c8b60cddb2b56236a4 Mon Sep 17 00:00:00 2001
 From: Emilian Peev <[email protected]>
 Date: Fri, 5 Aug 2022 17:28:06 -0700
-Subject: [PATCH 10/25] Camera: Avoid unnecessary close of buffer acquire fence
+Subject: [PATCH 10/26] Camera: Avoid unnecessary close of buffer acquire fence
  fds
 
 According to the gralloc lock documentation:
@@ -17,10 +17,10 @@ Merged-In: Ieec34b54aaa7f0d773eccb593c3daaa3e41bae0b
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/services/camera/libcameraservice/device3/Camera3OutputStream.cpp b/services/camera/libcameraservice/device3/Camera3OutputStream.cpp
-index 1e20ee0eb8..f23a2de340 100644
+index 69163a5620..e66624dc6e 100644
 --- a/services/camera/libcameraservice/device3/Camera3OutputStream.cpp
 +++ b/services/camera/libcameraservice/device3/Camera3OutputStream.cpp
-@@ -327,7 +327,7 @@ status_t Camera3OutputStream::fixUpHidlJpegBlobHeader(ANativeWindowBuffer* anwBu
+@@ -331,7 +331,7 @@ status_t Camera3OutputStream::fixUpHidlJpegBlobHeader(ANativeWindowBuffer* anwBu
      status_t res =
              gbLocker.lockAsync(
                      GraphicBuffer::USAGE_SW_READ_OFTEN | GraphicBuffer::USAGE_SW_WRITE_RARELY,
@@ -29,7 +29,7 @@ index 1e20ee0eb8..f23a2de340 100644
      if (res != OK) {
          ALOGE("%s: Failed to lock the buffer: %s (%d)", __FUNCTION__, strerror(-res), res);
          return res;
-@@ -1298,7 +1298,7 @@ void Camera3OutputStream::dumpImageToDisk(nsecs_t timestamp,
+@@ -1308,7 +1308,7 @@ void Camera3OutputStream::dumpImageToDisk(nsecs_t timestamp,
      void* mapped = nullptr;
      base::unique_fd fenceFd(dup(fence));
      status_t res = graphicBuffer->lockAsync(GraphicBuffer::USAGE_SW_READ_OFTEN, &mapped,

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

@@ -1,7 +1,7 @@
-From ed45e44d8e956aefb500fca074122a0880b6940c Mon Sep 17 00:00:00 2001
+From 3df7debb696f4778693d88e99ed1e9f38e3aa80d Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Tue, 19 May 2020 14:01:14 +0200
-Subject: [PATCH 11/25] Add a property to force camera timestamp source
+Subject: [PATCH 11/26] Add a property to force camera timestamp source
 
 Some devices wrongly report their timesource
 Camera's timesource can either be CLOCK_MONOTONIC, or CLOCK_BOOTTIME

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

@@ -1,7 +1,7 @@
-From 3a53658bd25e4949af71171299b49554ef7f156f Mon Sep 17 00:00:00 2001
+From 4868a98e69aa24109e3b120a62f7baea3653688b Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Tue, 24 Apr 2018 00:14:28 +0200
-Subject: [PATCH 12/25] FIH devices: Fix "Earpiece" audio output
+Subject: [PATCH 12/26] FIH devices: Fix "Earpiece" audio output
 
 On some FIH devices (confirmed on Razer, and probably on Aquos SS2),
 Earpiece is not listed in attachedDevices, and devicePort's profile

patches/trebledroid/platform_frameworks_av/0013-No-longer-make-re-assigning-legacy-audio-groups-fata.patch

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

patches/trebledroid/platform_frameworks_av/0014-Make-camera-IDs-filter-out-optional.patch

@@ -1,7 +1,7 @@
-From 2e39fbf5921a7588cb87be68ed7ee33334b315f1 Mon Sep 17 00:00:00 2001
+From 7b5e9196ea18c623e0856ee032b9a61ccdca5ff8 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Mon, 21 Dec 2020 20:19:11 +0100
-Subject: [PATCH 14/25] Make camera IDs filter-out optional
+Subject: [PATCH 14/26] Make camera IDs filter-out optional
 
 Nowadays most people have Camera 2 apps, and would like to have all
 cameras, rather than limit which cameras are available.
@@ -11,7 +11,7 @@ Add a property for that.
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
-index 59b59f44fb..4156e75310 100644
+index 3dd15d9fe9..93af10a0e7 100644
 --- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
 +++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
 @@ -255,7 +255,9 @@ std::vector<std::string> CameraProviderManager::getAPI1CompatibleCameraDeviceIds

patches/trebledroid/platform_frameworks_av/0015-Support-Samsung-R-multi-cams.patch

@@ -1,7 +1,7 @@
-From a6f41919e020d17f7d88550c219029f1bcf64676 Mon Sep 17 00:00:00 2001
+From 561342e812bed52e7b42e833f8a130964692de3a Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Sat, 13 Mar 2021 14:20:03 -0500
-Subject: [PATCH 15/25] Support Samsung R multi-cams
+Subject: [PATCH 15/26] Support Samsung R multi-cams
 
 Change-Id: If46f385e8dd16185cbf37ab083e6a1242e1d1555
 ---
@@ -22,7 +22,7 @@ index 7c4e4d9bcd..1faeb60ba7 100644
      ],
 
 diff --git a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
-index cd16cce988..4e6bac24db 100644
+index b02cf26445..947ddba0ee 100644
 --- a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
 +++ b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
 @@ -28,6 +28,7 @@

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

@@ -1,7 +1,7 @@
-From 96aec62f8475acd6c2d90334dffbfae6b9e4035b Mon Sep 17 00:00:00 2001
+From 54812319e23174f258ad72c26067e9ba31c52ddf Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Tue, 23 Mar 2021 00:16:42 +0100
-Subject: [PATCH 16/25] Don't crash on unknown audio devices
+Subject: [PATCH 16/26] Don't crash on unknown audio devices
 
 Change-Id: I2df8d88f742da6a84aa8888cdf19de25444de919
 ---

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

@@ -1,7 +1,7 @@
-From 13d0197b065cea07cf9f678f3b8646b85cb8983f Mon Sep 17 00:00:00 2001
+From 6c97056ab7843579b2c90cd59d3a78e6d964bae4 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Sun, 28 Mar 2021 18:54:47 +0200
-Subject: [PATCH 17/25] Not all sources in a route are valid. Dont ignore the
+Subject: [PATCH 17/26] Not all sources in a route are valid. Dont ignore the
  whole route because of one broken source
 
 Change-Id: If8a51740e71bef3a4738262ad7b43a337b0ec36d

patches/trebledroid/platform_frameworks_av/0018-Use-a-fake-volume-policy-when-none-has-been-found.patch

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

patches/trebledroid/platform_frameworks_av/0019-When-aux-cameras-are-enabled-ignore-system-only-came.patch

@@ -1,7 +1,7 @@
-From 15488803f82d040589a32414317e791176d8fee1 Mon Sep 17 00:00:00 2001
+From eb6df6e7a298378dea3867273917ec62d51f8dda Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Sat, 7 Aug 2021 11:11:39 +0200
-Subject: [PATCH 19/25] When aux cameras are enabled, ignore "system only"
+Subject: [PATCH 19/26] When aux cameras are enabled, ignore "system only"
  camera flag (it shouldnt be q security issue since secure cameras are listed
  otherwise)
 
@@ -10,7 +10,7 @@ Subject: [PATCH 19/25] When aux cameras are enabled, ignore "system only"
  1 file changed, 6 insertions(+), 4 deletions(-)
 
 diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
-index 4156e75310..1326396e5b 100644
+index 93af10a0e7..aa353f465f 100644
 --- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
 +++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
 @@ -990,10 +990,12 @@ SystemCameraKind CameraProviderManager::ProviderInfo::DeviceInfo3::getSystemCame

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

@@ -1,7 +1,7 @@
-From 09cd403bb4bd426f5c90a0152e4d710b9bc9193d Mon Sep 17 00:00:00 2001
+From d21d5b409e3a04b5317b747b59f5225bbbf4fcdb Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Mon, 11 Oct 2021 16:10:42 -0400
-Subject: [PATCH 20/25] Revert "Remove support for audio HAL V2 from the
+Subject: [PATCH 20/26] Revert "Remove support for audio HAL V2 from the
  framework"
 
 This reverts commit cbf517f837f7bf8a59f3ff8aa1e0e3e19612e251.

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

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

patches/trebledroid/platform_frameworks_av/0022-fixup-Not-all-sources-in-a-route-are-valid.-Dont-ign.patch

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