Merge pull request #73 from Archfx/sync-bot

TrebleDroid patches

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

@@ -1,4 +1,4 @@
-From ba9fca67366545ccff5105d00d047be14c126558 Mon Sep 17 00:00:00 2001
+From 6e73c8e862320d12d3447380224e85d093c12ba8 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/24] Add (partial, cam id is hardcoded) support for Asus ZF6
@@ -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 acc3b32813..e2193c6c76 100644
+index acc3b32813..376e68f5e3 100644
 --- a/services/camera/libcameraservice/CameraService.cpp
 +++ b/services/camera/libcameraservice/CameraService.cpp
 @@ -28,6 +28,7 @@
@@ -22,14 +22,14 @@ index acc3b32813..e2193c6c76 100644
  #include <inttypes.h>
  #include <pthread.h>
  #include <poll.h>
-@@ -173,6 +174,7 @@ static std::set<std::string> sServiceErrorEventSet;
-
- CameraService::CameraService(
-         std::shared_ptr<CameraServiceProxyWrapper> cameraServiceProxyWrapper,
-+        mPhysicalFrontCamStatus(false),
-         std::shared_ptr<AttributionAndPermissionUtils> attributionAndPermissionUtils) :
+@@ -177,6 +178,7 @@ CameraService::CameraService(
          AttributionAndPermissionUtilsEncapsulator(attributionAndPermissionUtils == nullptr ?
                  std::make_shared<AttributionAndPermissionUtils>()\
+                 : attributionAndPermissionUtils),
++        mPhysicalFrontCamStatus(false),
+         mCameraServiceProxyWrapper(cameraServiceProxyWrapper == nullptr ?
+                 std::make_shared<CameraServiceProxyWrapper>() : cameraServiceProxyWrapper),
+         mEventLog(DEFAULT_EVENT_LOG_LENGTH),
 @@ -2698,6 +2700,7 @@ Status CameraService::connectHelper(const sp<CALLBACK>& cameraCb, const std::str
              mServiceLock.lock();
          } else {

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

@@ -1,4 +1,4 @@
-From 8649c479ac0e42ad838b6d696e9bef833561f748 Mon Sep 17 00:00:00 2001
+From c5e2f10f69386f1e07b1edc550df706fe30eb43f Mon Sep 17 00:00:00 2001
 From: Peter Cai <[email protected]>
 Date: Wed, 24 Aug 2022 15:42:39 -0400
 Subject: [PATCH 04/24] APM: Optionally force-load audio policy for system-side

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

@@ -1,4 +1,4 @@
-From 67331372ce164d4e0c15f1828325bea48a8ee2d8 Mon Sep 17 00:00:00 2001
+From 06d9e5e10b102fd81191cb0ca25dc3eb420ad9ff Mon Sep 17 00:00:00 2001
 From: Peter Cai <[email protected]>
 Date: Thu, 25 Aug 2022 13:30:29 -0400
 Subject: [PATCH 05/24] APM: Remove A2DP audio ports from the primary HAL

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

@@ -1,4 +1,4 @@
-From 495fe270e50efb9d3f4be327897791cfaa678b58 Mon Sep 17 00:00:00 2001
+From 32cbfd752da5f599fbf218cb49920014f1000707 Mon Sep 17 00:00:00 2001
 From: Peter Cai <[email protected]>
 Date: Thu, 23 Jan 2020 11:13:43 +0800
 Subject: [PATCH 06/24] audiopolicy: try again with trimmed audio port name if

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

@@ -1,4 +1,4 @@
-From d4be9155dc9faa9db4cc1a22b981677c10eb1317 Mon Sep 17 00:00:00 2001
+From 0fcfa4a989138700811ab8cda423400e22f7e4ab Mon Sep 17 00:00:00 2001
 From: Peter Cai <[email protected]>
 Date: Wed, 1 Jun 2022 16:56:46 -0400
 Subject: [PATCH 07/24] camera: Implement property to override default camera

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

@@ -1,4 +1,4 @@
-From f1783d86b0d3ed7e327456a74c879d86675b0d32 Mon Sep 17 00:00:00 2001
+From bbb1e07f2e20db9123d7ea83ae3ef61e4af77332 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/24] There are three SCO devices. Fallback from one to the

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

@@ -1,4 +1,4 @@
-From 04289fce64c88551f79c0b7a3ba67a1db45e4cc5 Mon Sep 17 00:00:00 2001
+From 610fb014471d431321324f7ecb2979f773ab6728 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/24] Add persist.sys.phh.samsung.camera_ids property to

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

@@ -1,4 +1,4 @@
-From 86662d835548333e015cf52f19b5cebee2055988 Mon Sep 17 00:00:00 2001
+From 73aa2e00551c1169b844e3357093190a4993604f Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Tue, 19 May 2020 14:01:14 +0200
 Subject: [PATCH 10/24] Add a property to force camera timestamp source

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

@@ -1,4 +1,4 @@
-From c1b1f609c9e0370810d0073188900d3d4cd51a40 Mon Sep 17 00:00:00 2001
+From 0b5e0ae2b2c410bdad09d46a15a8c7a218bafce5 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Tue, 24 Apr 2018 00:14:28 +0200
 Subject: [PATCH 11/24] FIH devices: Fix "Earpiece" audio output

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

@@ -1,4 +1,4 @@
-From cca08d69030e37686c6b636d1be826bdd4b67b2e Mon Sep 17 00:00:00 2001
+From 05461e8b5b059d4bc872868dc95a4eb754d91d83 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Sat, 12 Sep 2020 12:32:50 +0200
 Subject: [PATCH 12/24] No longer make re-assigning legacy audio groups fatal.

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

@@ -1,4 +1,4 @@
-From c9bda2dec24ea7590e57c1b2500c3237290fea7b Mon Sep 17 00:00:00 2001
+From 6ab752912ce43993c7530558cd2481fc62ad2afb Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Mon, 21 Dec 2020 20:19:11 +0100
 Subject: [PATCH 13/24] Make camera IDs filter-out optional

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

@@ -1,4 +1,4 @@
-From b99a8cd17707616f4b06c163c3d275bcfe695ec1 Mon Sep 17 00:00:00 2001
+From 0ec2683dc9c1dd10d1b33fa10a153aef51a335d3 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Sat, 13 Mar 2021 14:20:03 -0500
 Subject: [PATCH 14/24] Support Samsung R multi-cams

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

@@ -1,4 +1,4 @@
-From 905c1ed073319f9ccfe167fc32f83391a36eea8e Mon Sep 17 00:00:00 2001
+From 09ea9193bcaa66e9a1381bc883e5939149db9a28 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Sun, 28 Mar 2021 18:54:47 +0200
 Subject: [PATCH 15/24] Not all sources in a route are valid. Dont ignore the

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

@@ -1,4 +1,4 @@
-From 9b07c9a483ca19517574bd9e786bdd19cf9793e0 Mon Sep 17 00:00:00 2001
+From 446e9248207657d36bdcd180a9e73868df84cc0d Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Sun, 28 Mar 2021 14:48:49 +0200
 Subject: [PATCH 16/24] Use a fake volume policy when none has been found

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

@@ -1,4 +1,4 @@
-From 713a71a18d8f3ef2f03e83125d9d509e589b79ba Mon Sep 17 00:00:00 2001
+From 42d9378e101d1ad52d5bc04770dd5b734608a9f5 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <[email protected]>
 Date: Mon, 11 Oct 2021 16:10:42 -0400
 Subject: [PATCH 17/24] Revert "Remove support for audio HAL V2 from the

patches/trebledroid/platform_frameworks_av/0018-Add-a-prop-to-change-Samsung-flash-strength.patch

@@ -1,4 +1,4 @@
-From 4fba4c104a5bd0245c97d9100fa905681c234f3f Mon Sep 17 00:00:00 2001
+From e8c47e8ff1024bfd4e7133cdd2b448dfacee98d3 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Sat, 16 Apr 2022 14:30:14 -0400
 Subject: [PATCH 18/24] Add a prop to change Samsung flash strength

patches/trebledroid/platform_frameworks_av/0019-voip-Fix-high-pitched-voice-on-Qualcomm-devices.patch

@@ -1,4 +1,4 @@
-From 19e3a7b4ebe84d9085188a1dd59318c9d0df0de2 Mon Sep 17 00:00:00 2001
+From da6fd34468b5b239c30eb4e682f0134efc236571 Mon Sep 17 00:00:00 2001
 From: ponces <[email protected]>
 Date: Mon, 24 Oct 2022 09:38:34 +0100
 Subject: [PATCH 19/24] voip: Fix high pitched voice on Qualcomm devices

patches/trebledroid/platform_frameworks_av/0020-audiopolicy-Fix-broken-mic-while-video-recording-on-.patch

@@ -1,4 +1,4 @@
-From c3d6cda4bd69d80fda56271213725d4e24aa9ee8 Mon Sep 17 00:00:00 2001
+From 63a8d2b210af2951c44a756a753eece040d4b31a Mon Sep 17 00:00:00 2001
 From: Alberto Ponces <[email protected]>
 Date: Sun, 30 Apr 2023 23:29:04 +0100
 Subject: [PATCH 20/24] audiopolicy: Fix broken mic while video recording on

patches/trebledroid/platform_frameworks_av/0021-Add-a-prop-to-disable-AUDIO_OUTPUT_FLAG_FAST-from-au.patch

@@ -1,4 +1,4 @@
-From 955833e12f8ac128a4319da27f549ce573fe32e9 Mon Sep 17 00:00:00 2001
+From 292cea71fd8aa53740736d36617142280cafe39b Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Mon, 30 Oct 2023 10:30:58 -0400
 Subject: [PATCH 21/24] Add a prop to disable AUDIO_OUTPUT_FLAG_FAST from audio

patches/trebledroid/platform_frameworks_av/0022-Add-a-prop-to-fix-echo-on-incoming-or-outgoing-calls.patch

@@ -1,4 +1,4 @@
-From dd8d438335d619a9b1d7957c1efe5c34d2f82d84 Mon Sep 17 00:00:00 2001
+From 7664ffe55f7536061b298fe6957621eac4e03ed6 Mon Sep 17 00:00:00 2001
 From: Alberto Ponces <[email protected]>
 Date: Sun, 5 Nov 2023 15:18:03 +0000
 Subject: [PATCH 22/24] Add a prop to fix echo on incoming or outgoing calls

patches/trebledroid/platform_frameworks_av/0023-Include-Samsung-AIDL-camera-ids.patch

@@ -1,4 +1,4 @@
-From baace919ab6a80fbab0552ea68a9a00b9140ac7a Mon Sep 17 00:00:00 2001
+From cda1581fcec3bf92440d02e970830e3dfbf65ecc Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Wed, 7 Feb 2024 05:06:32 -0500
 Subject: [PATCH 23/24] Include Samsung AIDL camera ids

patches/trebledroid/platform_frameworks_av/0024-Allow-using-camera-modes-declared-in-Samsung-proprie.patch

@@ -1,4 +1,4 @@
-From 6b965ac2c262c319a63e53b579ad77507eb7d5c8 Mon Sep 17 00:00:00 2001
+From 5cd1a39645c1fac1e754e100ea9ff4bdc8f938fa Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Sat, 10 Feb 2024 09:30:19 -0500
 Subject: [PATCH 24/24] Allow using camera modes declared in Samsung