Adapt and sync patches for YAAP june (QPR3) sources.

patches/personal/platform_frameworks_base/0002-Reimport-things-removed-by-FOD-patch-causing-build-e.patch

@@ -0,0 +1,26 @@
+From be8cdb938d8daa47c4d19758ea6217cc2de35d11 Mon Sep 17 00:00:00 2001
+From: ahnet-69 <syedmusicrealise@gmail.com>
+Date: Wed, 14 Jun 2023 23:52:02 +0500
+Subject: [PATCH] Reimport things removed by FOD patch causing build errors.
+ Will properly readapt FOD with fix later
+
+---
+ .../core/java/com/android/server/biometrics/AuthService.java    | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/services/core/java/com/android/server/biometrics/AuthService.java b/services/core/java/com/android/server/biometrics/AuthService.java
+index d39a3930..024d2581 100644
+--- a/services/core/java/com/android/server/biometrics/AuthService.java
++++ b/services/core/java/com/android/server/biometrics/AuthService.java
+@@ -31,6 +31,8 @@ import static android.hardware.biometrics.BiometricAuthenticator.TYPE_NONE;
+ import static android.hardware.biometrics.BiometricConstants.BIOMETRIC_ERROR_CANCELED;
+ import static android.hardware.biometrics.BiometricManager.Authenticators;
+
++import static com.android.server.biometrics.sensors.fingerprint.aidl.FingerprintProvider.getWorkaroundSensorProps;
++
+ import android.annotation.NonNull;
+ import android.annotation.Nullable;
+ import android.app.AppOpsManager;
+-- 
+2.39.2
+

patches/personal/platform_vendor_yaap/0003-Implement-minimal-gapps-build-flag.patch

@@ -1,4 +1,4 @@
-From def62f96b6d53a930ed4cbcb02ad7d6cf9993cbc Mon Sep 17 00:00:00 2001
+From 96c1bf47b92e6c3495c887ac508a49308baf9387 Mon Sep 17 00:00:00 2001
 From: ahnet-69 <syedmusicrealise@gmail.com>
 Date: Mon, 5 Jun 2023 16:19:57 +0500
 Subject: [PATCH] Implement minimal gapps build flag
@@ -9,7 +9,7 @@ Subject: [PATCH] Implement minimal gapps build flag
  2 files changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/config/common.mk b/config/common.mk
-index 24a517a..4447598 100644
+index 2783ff7..d35e6fc 100644
 --- a/config/common.mk
 +++ b/config/common.mk
 @@ -71,7 +71,7 @@ SYSTEMUI_OPTIMIZE_JAVA ?= true
@@ -31,7 +31,7 @@ index 24a517a..4447598 100644
      $(call inherit-product-if-exists, vendor/google/pixel/config.mk)
      $(call inherit-product, external/svox/svox_tts.mk)
 diff --git a/config/packages.mk b/config/packages.mk
-index f19dd30..b3de74a 100644
+index c04cfc8..781185d 100644
 --- a/config/packages.mk
 +++ b/config/packages.mk
 @@ -49,7 +49,7 @@ PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
@@ -41,8 +41,8 @@ index f19dd30..b3de74a 100644
 -ifneq ($(TARGET_BUILD_GAPPS),true)
 +ifneq (,$(filter true,$(TARGET_BUILD_GAPPS) $(TARGET_BUILD_GAPPS_MINIMAL)))
  PRODUCT_PACKAGES += \
-     Apps \
      Etar \
+     ExactCalculator \
 -- 
 2.39.2
 

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

@@ -1,7 +1,7 @@
-From e7a5fac4dacf10698fb9101f0575af656e4a2408 Mon Sep 17 00:00:00 2001
+From c6bbf8deb37ca681e86692efa872d5d75dfefc94 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 27 Oct 2021 14:39:29 -0400
-Subject: [PATCH 1/3] Disable vndklite handling
+Subject: [PATCH 1/4] Disable vndklite handling
 
 Change-Id: Ic4474cf80fc4b45a9a2760dd51e2ca29c4d961e2
 ---

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

@@ -1,7 +1,7 @@
-From 66d0c2154ea360382738da27a721ff577e4fe0c2 Mon Sep 17 00:00:00 2001
+From 80500a4e7d350a44f281174c4e02aa3eda80cfe3 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 19 Feb 2022 08:20:25 -0500
-Subject: [PATCH 2/3] Add new mechanism to fake vendor props on a per-process
+Subject: [PATCH 2/4] Add new mechanism to fake vendor props on a per-process
  basis
 
 This reads debug.phh.props.<process name>. If its value is "vendor",

patches/trebledroid/platform_bionic/0003-Rework-property-overriding.patch

@@ -1,7 +1,7 @@
-From 530cd7391634cd547681c99d970c3ad37f0c779f Mon Sep 17 00:00:00 2001
+From a46e75e4e82ab5de2bc4dd2b83a6f9bf8140f17b Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 19 Jan 2023 16:44:01 -0500
-Subject: [PATCH 3/3] Rework property overriding
+Subject: [PATCH 3/4] Rework property overriding
 
 - Support property read with callback in addition to previous
   constant-size property_get

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

@@ -1,4 +1,4 @@
-From c946249973b8b95f8f027e895325a89957c5c537 Mon Sep 17 00:00:00 2001
+From 73fa657ca056ef1ab283e081baf2cc06240d3054 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 28 May 2023 16:46:46 -0400
 Subject: [PATCH 4/4] Add some properties to fake in "keymaster" prop

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

@@ -1,4 +1,4 @@
-From bd057612eb5e26103dc3d748e871c6eaa0875edc Mon Sep 17 00:00:00 2001
+From 674432d3c5e1a30eb77a0db24672fca9615f4edf Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 12 Sep 2019 20:31:07 +0200
 Subject: [PATCH] Don't reboot if we couldn't get bootctrl
@@ -9,10 +9,10 @@ Change-Id: Id1793660bd1c97ab369607f58a772ca3512ec1af
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/update_verifier/update_verifier.cpp b/update_verifier/update_verifier.cpp
-index a042f900..ea3645af 100644
+index 88fcfa50..097a2c4e 100644
 --- a/update_verifier/update_verifier.cpp
 +++ b/update_verifier/update_verifier.cpp
-@@ -310,7 +310,7 @@ int update_verifier(int argc, char** argv) {
+@@ -332,7 +332,7 @@ int update_verifier(int argc, char** argv) {
    sp<IBootControl> module = IBootControl::getService();
    if (module == nullptr) {
      LOG(ERROR) << "Error getting bootctrl module.";

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

@@ -1,4 +1,4 @@
-From db9c9acb8801564a97cbc09ee9213d73f8d592bd Mon Sep 17 00:00:00 2001
+From 40668b603d2f394513a10c00f53c85e621d694cd Mon Sep 17 00:00:00 2001
 From: sooti <sooti85@gmail.com>
 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 6d1a48d4a33eaac20151f0d2da8f76706907660c Mon Sep 17 00:00:00 2001
+From beff0283a25940c42371e2a924a807eb5fc5cd1d Mon Sep 17 00:00:00 2001
 From: Alberto Ponces <ponces26@gmail.com>
 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 86e7ce1cfde59d2f4f361bc7bbac7bd66fb2b538 Mon Sep 17 00:00:00 2001
+From 0ad00349f345145c55f69705dafebffc9bb1ed11 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 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 5b253ced353c81dfac5ce77e62932b84e108d23e Mon Sep 17 00:00:00 2001
+From 006f822de62342a161eb86ef6a13f9a8fdaa474d Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Thu, 14 Oct 2021 12:20:52 +0000
 Subject: [PATCH 4/4] build: Remove llkd

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

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

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

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

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

@@ -1,7 +1,7 @@
-From a537413f12293ead60b64c9e242ef12726cfd503 Mon Sep 17 00:00:00 2001
+From b59164dd30f1f9a923d0e94ca068f2e398d6f898 Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Wed, 24 Aug 2022 15:42:39 -0400
-Subject: [PATCH 04/27] APM: Optionally force-load audio policy for system-side
+Subject: [PATCH 04/28] 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 a0294d7c50f02cb42494ff38dd8d877fc7b6a1f4 Mon Sep 17 00:00:00 2001
+From d7ec7c2855c9baa5b3da20e17ebbb7518c30af8c Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Thu, 25 Aug 2022 13:30:29 -0400
-Subject: [PATCH 05/27] APM: Remove A2DP audio ports from the primary HAL
+Subject: [PATCH 05/28] 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 33c7d79d5782f81b898ad5ef5cc7ec3800124b87 Mon Sep 17 00:00:00 2001
+From ff7375bc0c9ec95f528e8c2e6d729a2a4448ccc4 Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Thu, 23 Jan 2020 11:13:43 +0800
-Subject: [PATCH 06/27] audiopolicy: try again with trimmed audio port name if
+Subject: [PATCH 06/28] 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 e9e429ddd875bc1281186f734a6c12b3e4eb78f2 Mon Sep 17 00:00:00 2001
+From 8d0d9e9f3ae63e46d15114380d748a8ba3be31fb Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Wed, 1 Jun 2022 16:56:46 -0400
-Subject: [PATCH 07/27] camera: Implement property to override default camera
+Subject: [PATCH 07/28] camera: Implement property to override default camera
 
 Complement to the frameworks/base patch.
 
@@ -11,7 +11,7 @@ Change-Id: I002bfa974bafc2cc01365eeea31c7a5dcb5a2028
  1 file changed, 22 insertions(+)
 
 diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
-index 3132787608..5e1ba965b7 100644
+index 43f92a9927..d9fc2ef135 100644
 --- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
 +++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
 @@ -36,6 +36,7 @@

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

@@ -1,7 +1,7 @@
-From 0d5208ef62383ee415e6eaafe32c14ed5b77a6ac Mon Sep 17 00:00:00 2001
+From 0cd34e357950af3141b09e5e566f7092edc88116 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 13 Apr 2020 21:01:16 +0200
-Subject: [PATCH 08/27] There are three SCO devices. Fallback from one to the
+Subject: [PATCH 08/28] 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 d8193ddff1fe9cbfc851e6518021d0177442393d Mon Sep 17 00:00:00 2001
+From 396931b496aa7da5ccafb0c35d949aaf2901fcc5 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 14 May 2020 19:54:55 +0200
-Subject: [PATCH 09/27] Add persist.sys.phh.samsung.camera_ids property to
+Subject: [PATCH 09/28] Add persist.sys.phh.samsung.camera_ids property to
  access hidden Samsung cameras
 
 Change-Id: I2c7bf535272acc28ed2277e96c78ddd28a0b4593
@@ -23,7 +23,7 @@ index 981c56942c..7c4e4d9bcd 100644
      ],
 
 diff --git a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
-index 1df6ec4449..ac579b4f7d 100644
+index 630090b4ac..1acf9c2990 100644
 --- a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
 +++ b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
 @@ -27,6 +27,7 @@

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

@@ -1,7 +1,7 @@
-From 753df0e9ae9afcb6d393611048636b8ac35ab7a5 Mon Sep 17 00:00:00 2001
+From 7295b4967facc2fc0e95d767b27487540688b8a8 Mon Sep 17 00:00:00 2001
 From: Emilian Peev <epeev@google.com>
 Date: Fri, 5 Aug 2022 17:28:06 -0700
-Subject: [PATCH 10/27] Camera: Avoid unnecessary close of buffer acquire fence
+Subject: [PATCH 10/28] Camera: Avoid unnecessary close of buffer acquire fence
  fds
 
 According to the gralloc lock documentation:
@@ -17,7 +17,7 @@ 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 396104c4fd..c725aadb79 100644
+index ef12b64972..26fab414c6 100644
 --- a/services/camera/libcameraservice/device3/Camera3OutputStream.cpp
 +++ b/services/camera/libcameraservice/device3/Camera3OutputStream.cpp
 @@ -331,7 +331,7 @@ status_t Camera3OutputStream::fixUpHidlJpegBlobHeader(ANativeWindowBuffer* anwBu

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

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

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

@@ -1,7 +1,7 @@
-From 7f1d06c0d08809a7ca529da7b50f4d2e78604eaf Mon Sep 17 00:00:00 2001
+From 453904a4b27be85ef1a53a410973d5a85468e931 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 24 Apr 2018 00:14:28 +0200
-Subject: [PATCH 12/27] FIH devices: Fix "Earpiece" audio output
+Subject: [PATCH 12/28] 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 176f0f43c83ae9c0d13a70b7bf420ea8d9477c8b Mon Sep 17 00:00:00 2001
+From 4a59d89a1dae32e570183fcb41798c4ce6c92068 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 12 Sep 2020 12:32:50 +0200
-Subject: [PATCH 13/27] No longer make re-assigning legacy audio groups fatal.
+Subject: [PATCH 13/28] 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 7a676f9a1d7cae43e41482dfc3f327dd792323cc Mon Sep 17 00:00:00 2001
+From 4f59be8d357091eac6942240b2ad3110552bb63a Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 21 Dec 2020 20:19:11 +0100
-Subject: [PATCH 14/27] Make camera IDs filter-out optional
+Subject: [PATCH 14/28] Make camera IDs filter-out optional
 
 Nowadays most people have Camera 2 apps, and would like to have all
 cameras, rather than limit which cameras are available.
@@ -11,7 +11,7 @@ Add a property for that.
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
-index 5e1ba965b7..2cb27f4ee5 100644
+index d9fc2ef135..292342238d 100644
 --- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
 +++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
 @@ -260,7 +260,9 @@ std::vector<std::string> CameraProviderManager::getAPI1CompatibleCameraDeviceIds