Changes for November 2022

patches_treble/device_phh_treble/0001-treble-Lineage-ify.patch

@@ -1,7 +1,7 @@
-From e9e544ab62732999ad6ef19df72310b80957f796 Mon Sep 17 00:00:00 2001
+From cf205c8dc59895cef8b511fd521807c458b572d9 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 8 Aug 2021 01:43:40 +0000
-Subject: [PATCH 1/6] treble: Lineage-ify
+Subject: [PATCH 1/8] treble: Lineage-ify
 
 Squash of:
 - Proper target names
@@ -14,11 +14,11 @@ Change-Id: I25eee7a3804f335430a447ae1424402d7e37851b
 ---
  base-pre.mk                                   |  3 -
  base.mk                                       | 16 ++--
- generate.sh                                   |  2 +-
+ generate.sh                                   |  4 +-
  .../lineage/res/res/values/config.xml         | 81 +++++++++++++++++++
  .../base/core/res/res/values/config.xml       |  1 -
  sepolicy/file_contexts                        |  3 -
- 6 files changed, 91 insertions(+), 15 deletions(-)
+ 6 files changed, 92 insertions(+), 16 deletions(-)
  create mode 100644 overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
 
 diff --git a/base-pre.mk b/base-pre.mk
@@ -68,9 +68,18 @@ index d3a0a20..b6c1d25 100644
  #VNDK config files
  PRODUCT_COPY_FILES += \
 diff --git a/generate.sh b/generate.sh
-index fac8208..84d1e3d 100644
+index fac8208..2160786 100644
 --- a/generate.sh
 +++ b/generate.sh
+@@ -54,7 +54,7 @@ for part in a ab;do
+ 				su_suffix='N'
+ 				if [ "$su" == "yes" ];then
+ 					su_suffix='S'
+-					extra_packages+=' phh-su me.phh.superuser'
++					extra_packages+=' phh-su me.phh.superuser su'
+ 				fi
+ 
+ 				part_suffix='a'
 @@ -64,7 +64,7 @@ for part in a ab;do
  					optional_base='$(call inherit-product, device/phh/treble/base-sas.mk)'
  				fi

patches_treble/device_phh_treble/0002-treble-Set-BOARD_EXT4_SHARE_DUP_BLOCKS-explicitly.patch

@@ -1,7 +1,7 @@
-From 1c84a4ccc2b1f07c7512cf69a049d2d93e11c25a Mon Sep 17 00:00:00 2001
+From a5a079d6bbd31b7097919022aed36266d72087a6 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 8 Aug 2021 09:29:32 +0000
-Subject: [PATCH 2/6] treble: Set BOARD_EXT4_SHARE_DUP_BLOCKS explicitly
+Subject: [PATCH 2/8] treble: Set BOARD_EXT4_SHARE_DUP_BLOCKS explicitly
 
 Change-Id: I725443154fabde548d2e6c1b072d34c27596c421
 ---

patches_treble/device_phh_treble/0003-treble-Set-TARGET_NO_KERNEL_OVERRIDE.patch

@@ -1,7 +1,7 @@
-From c7cd350bd822cc161ee7da4d5f10239d6f267f44 Mon Sep 17 00:00:00 2001
+From d7754c89b3ce468e52b3f08d1fa1d84fcfab0256 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Wed, 20 Oct 2021 11:30:25 +0000
-Subject: [PATCH 3/6] treble: Set TARGET_NO_KERNEL_OVERRIDE
+Subject: [PATCH 3/8] treble: Set TARGET_NO_KERNEL_OVERRIDE
 
 Taken from Lineage generic targets - skips building kernel cleanly
 

patches_treble/device_phh_treble/0004-treble-Set-OTA-JSON-URL.patch

@@ -1,7 +1,7 @@
-From 8140556b5d24e3b07785299c710b94d6451f2dda Mon Sep 17 00:00:00 2001
+From 60aff0ef335bb79dda6d36b6e00a3c1673563f0e Mon Sep 17 00:00:00 2001
 From: Alberto Ponces <ponces26@gmail.com>
 Date: Wed, 9 Feb 2022 12:34:47 +0000
-Subject: [PATCH 4/6] treble: Set OTA JSON URL
+Subject: [PATCH 4/8] treble: Set OTA JSON URL
 
 Change-Id: I8f817b90d42629c208ceb45598daf5293850b953
 ---

patches_treble/device_phh_treble/0005-treble-Enable-call-recording.patch

@@ -1,7 +1,7 @@
-From 8c9a935e9f06bd41bc21ca42126422840e5f6075 Mon Sep 17 00:00:00 2001
+From e938558882351e2bcbf2e7781efe377a912ce9fe Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Tue, 11 Oct 2022 11:29:02 +0000
-Subject: [PATCH 5/6] treble: Enable call recording
+Subject: [PATCH 5/8] treble: Enable call recording
 
 Change-Id: I57ca3604363547419a566b37b5151b6b30c46d28
 ---

patches_treble/device_phh_treble/0006-treble-Integrally-secure-N-builds.patch

@@ -0,0 +1,43 @@
+From 346861bfaaf8f050c1e009767b8b36b38966d405 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sat, 5 Nov 2022 23:44:33 +0000
+Subject: [PATCH 6/8] treble: Integrally secure *N builds
+
+Change-Id: I22b5f746cb88a5fa4059595a8daa693d9adca979
+---
+ generate.sh | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/generate.sh b/generate.sh
+index 2160786..f64ea84 100644
+--- a/generate.sh
++++ b/generate.sh
+@@ -23,6 +23,7 @@ for part in a ab;do
+ 				apps_name=""
+ 				extra_packages=""
+                 vndk="vndk.mk"
++                secure=""
+ 		optional_base=""
+ 				if [ "$apps" == "gapps" ];then
+ 					apps_suffix="g"
+@@ -55,6 +56,8 @@ for part in a ab;do
+ 				if [ "$su" == "yes" ];then
+ 					su_suffix='S'
+ 					extra_packages+=' phh-su me.phh.superuser su'
++				else
++					secure='PRODUCT_COPY_FILES += device/phh/treble/empty:system/phh/secure'
+ 				fi
+ 
+ 				part_suffix='a'
+@@ -96,6 +99,8 @@ PRODUCT_CHARACTERISTICS := device
+ 
+ PRODUCT_PACKAGES += $extra_packages
+ 
++$secure
++
+ EOF
+ echo -e '\t$(LOCAL_DIR)/'$target.mk '\' >> AndroidProducts.mk
+ 			done
+-- 
+2.25.1
+

patches_treble/device_phh_treble/0007-treble-Stop-securing-ADB.patch

@@ -0,0 +1,36 @@
+From 89c2303f3043e93fb6c1aaee0e346cef6e65b404 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Tue, 22 Nov 2022 00:36:15 +0000
+Subject: [PATCH 7/8] treble: Stop securing ADB
+
+Seems to kill USB Debugging altogether on certain devices,
+and unrelated to SN anyway
+Build-time macro coupled with vendor/lineage might do better...
+
+Change-Id: I0215b3ed970dd53a124f48e30ca2cf4b0c6d2899
+---
+ rw-system.sh | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/rw-system.sh b/rw-system.sh
+index 607c4e6..6da3e80 100644
+--- a/rw-system.sh
++++ b/rw-system.sh
+@@ -764,14 +764,10 @@ if [ -f /system/phh/secure ] || [ -f /metadata/phh/secure ];then
+     resetprop_phh ro.boot.veritymode enforcing
+     resetprop_phh ro.boot.warranty_bit 0
+     resetprop_phh ro.warranty_bit 0
+-    resetprop_phh ro.debuggable 0
+     resetprop_phh ro.secure 1
+     resetprop_phh ro.build.type user
+     resetprop_phh ro.build.selinux 0
+ 
+-    resetprop_phh ro.adb.secure 1
+-    setprop ctl.restart adbd
+-
+     # Hide system/xbin/su
+     mount /mnt/phh/empty_dir /system/xbin
+     mount /mnt/phh/empty_dir /system/app/me.phh.superuser
+-- 
+2.25.1
+

patches_treble/device_phh_treble/0008-add-offline-charger-sepolicy.patch

@@ -1,7 +1,7 @@
-From bc4df70c212cf14b52f0fb9a928524a4adbaf8e3 Mon Sep 17 00:00:00 2001
+From 9f4474a181e897cafbd785e870cb3f104c94aeb5 Mon Sep 17 00:00:00 2001
 From: Victor Bo <bvoid@yandex.ru>
 Date: Tue, 15 Sep 2020 21:26:45 -0400
-Subject: [PATCH 6/6] add offline charger sepolicy
+Subject: [PATCH 8/8] add offline charger sepolicy
 
 ---
  sepolicy/gsicharger.te | 1 +

patches_treble_phh/platform_frameworks_av/0001-Fix-BT-in-call-on-CAF-devices.patch

@@ -1,7 +1,7 @@
-From 6e3563653fb94e815a76e98ab2db682b1120734b Mon Sep 17 00:00:00 2001
+From de2f00281f2cd8030ae7f0fdf49ecaf488ec321a 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 01/23] Fix BT in-call on CAF devices
+Subject: [PATCH 01/24] Fix BT in-call on CAF devices
 
 See https://github.com/phhusson/treble_experimentations/issues/374
 

patches_treble_phh/platform_frameworks_av/0002-Add-partial-cam-id-is-hardcoded-support-for-Asus-ZF6.patch

@@ -1,7 +1,7 @@
-From 439f07ebcd8f22ae8a7ec5c59386967d8cb953f5 Mon Sep 17 00:00:00 2001
+From 345ff1e615bc8c23376df155980bd18778601b89 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 02/23] Add (partial, cam id is hardcoded) support for Asus ZF6
+Subject: [PATCH 02/24] Add (partial, cam id is hardcoded) support for Asus ZF6
  motor camera
 
 Change-Id: Iea6e1370780a1d16f728748d1d948d092532d8fe

patches_treble_phh/platform_frameworks_av/0003-audiopolicy-try-again-with-trimmed-audio-port-name-i.patch

@@ -1,7 +1,7 @@
-From 2ea65f01d378f37df840acc601a938c131fbce0b Mon Sep 17 00:00:00 2001
+From 1e48cf484b9ececa76323bcd13a9f0f986027372 Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Thu, 23 Jan 2020 11:13:43 +0800
-Subject: [PATCH 03/23] audiopolicy: try again with trimmed audio port name if
+Subject: [PATCH 03/24] audiopolicy: try again with trimmed audio port name if
  not found
 
 * In Spreadtrum BSP, some audio routes may contain ports with extra

patches_treble_phh/platform_frameworks_av/0004-There-are-three-SCO-devices.-Fallback-from-one-to-th.patch

@@ -1,7 +1,7 @@
-From 7e1a90bc11800f0267f3a610db2f8a0b5f6cee0a Mon Sep 17 00:00:00 2001
+From af22350663170928ac20fe94768259a53c2c5fcb 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 04/23] There are three SCO devices. Fallback from one to the
+Subject: [PATCH 04/24] There are three SCO devices. Fallback from one to the
  others if needed
 
 Change-Id: I414dcb6b154855c00cb8520b23dc1069827864b2

patches_treble_phh/platform_frameworks_av/0005-Add-persist.sys.phh.samsung.camera_ids-property-to-a.patch

@@ -1,7 +1,7 @@
-From c8a3d642465a97ca862de7840ddc7522ed13037d Mon Sep 17 00:00:00 2001
+From 6ab932708ab326229ddc6062b1f9023144566638 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 05/23] Add persist.sys.phh.samsung.camera_ids property to
+Subject: [PATCH 05/24] Add persist.sys.phh.samsung.camera_ids property to
  access hidden Samsung cameras
 
 Change-Id: I2c7bf535272acc28ed2277e96c78ddd28a0b4593
@@ -11,10 +11,10 @@ Change-Id: I2c7bf535272acc28ed2277e96c78ddd28a0b4593
  2 files changed, 13 insertions(+), 2 deletions(-)
 
 diff --git a/services/camera/libcameraservice/Android.bp b/services/camera/libcameraservice/Android.bp
-index 26562e0426..e940c33845 100644
+index 6e83132874..2a0007964b 100644
 --- a/services/camera/libcameraservice/Android.bp
 +++ b/services/camera/libcameraservice/Android.bp
-@@ -154,6 +154,7 @@ cc_library_shared {
+@@ -157,6 +157,7 @@ cc_library_shared {
          "android.hardware.camera.device@3.5",
          "android.hardware.camera.device@3.6",
          "android.hardware.camera.device@3.7",

patches_treble_phh/platform_frameworks_av/0006-Add-a-property-to-force-camera-timestamp-source.patch

@@ -1,7 +1,7 @@
-From ba8531becc9b9cb3acafd25ef99c30228120a932 Mon Sep 17 00:00:00 2001
+From 14d8348ba2c0fd64cbe82de034bd7d0e370f36f3 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 06/23] Add a property to force camera timestamp source
+Subject: [PATCH 06/24] 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,7 +18,7 @@ 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 de418da6cc..6c2de0f088 100644
+index 8f080bec87..4b972a48a2 100644
 --- a/services/camera/libcameraservice/device3/Camera3Device.cpp
 +++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
 @@ -347,8 +347,16 @@ status_t Camera3Device::initializeCommonLocked() {

patches_treble_phh/platform_frameworks_av/0007-FIH-devices-Fix-Earpiece-audio-output.patch

@@ -1,7 +1,7 @@
-From 08e26789bcc3c2ce86c2f2158a384404dd718165 Mon Sep 17 00:00:00 2001
+From aeb9e61dadaa2067c98713586bff282df6298686 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 07/23] FIH devices: Fix "Earpiece" audio output
+Subject: [PATCH 07/24] FIH devices: Fix "Earpiece" audio output
 
 On some FIH devices (confirmed on Razer, and probably on Aquos SS2),
 Earpiece is not listed in attachedDevices, and devicePort's profile

patches_treble_phh/platform_frameworks_av/0008-No-longer-make-re-assigning-legacy-audio-groups-fata.patch

@@ -1,7 +1,7 @@
-From 692a52722f8d42cf9050debaba290cd26c628a04 Mon Sep 17 00:00:00 2001
+From b263e2acb5d03232ebf7c673774b15652a35b3a0 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 08/23] No longer make re-assigning legacy audio groups fatal.
+Subject: [PATCH 08/24] No longer make re-assigning legacy audio groups fatal.
  Mi9 declares AUDIO_STREAM_PATCH and AUDIO_STREAM_REROUTING which is defined
  by framework too
 

patches_treble_phh/platform_frameworks_av/0009-Add-persist.sys.phh.disable_a2dp_offload-property-to.patch

@@ -1,7 +1,7 @@
-From 294fd56f000ff05d3982c6a0342f85ab07f85a51 Mon Sep 17 00:00:00 2001
+From f8d302e38f77e02b443eab76c1a0a58141877217 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 25 May 2020 21:26:54 +0200
-Subject: [PATCH 09/23] Add persist.sys.phh.disable_a2dp_offload property to
+Subject: [PATCH 09/24] Add persist.sys.phh.disable_a2dp_offload property to
  force a2dp offload
 
 Change-Id: Id474540c33c594cc4010a1a398d82bff8aadaeea
@@ -12,7 +12,7 @@ Change-Id: Id474540c33c594cc4010a1a398d82bff8aadaeea
  3 files changed, 197 insertions(+), 7 deletions(-)
 
 diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
-index 1e64538d89..2923575327 100644
+index 2c8d8de226..46cd6e47a0 100644
 --- a/media/libstagefright/ACodec.cpp
 +++ b/media/libstagefright/ACodec.cpp
 @@ -1183,6 +1183,9 @@ status_t ACodec::configureOutputBuffersFromNativeWindow(
@@ -309,7 +309,7 @@ index abc54ccc24..c6db471c8c 100644
      if (status != OK) config->clear();
      return status;
 diff --git a/services/audiopolicy/enginedefault/src/Engine.cpp b/services/audiopolicy/enginedefault/src/Engine.cpp
-index c73c17d1e4..314de7889b 100644
+index 8305c9ecd0..489e924b07 100644
 --- a/services/audiopolicy/enginedefault/src/Engine.cpp
 +++ b/services/audiopolicy/enginedefault/src/Engine.cpp
 @@ -52,7 +52,7 @@ static const std::vector<legacy_strategy_map>& getLegacyStrategy() {

patches_treble_phh/platform_frameworks_av/0010-Make-camera-IDs-filter-out-optional.patch

@@ -1,7 +1,7 @@
-From 5bd6c2771efe985f945be22f8855042ec8d36615 Mon Sep 17 00:00:00 2001
+From 95da18470679086b435f5d48961e7e6e96d19808 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 10/23] Make camera IDs filter-out optional
+Subject: [PATCH 10/24] Make camera IDs filter-out optional
 
 Nowadays most people have Camera 2 apps, and would like to have all
 cameras, rather than limit which cameras are available.

patches_treble_phh/platform_frameworks_av/0011-Support-Samsung-R-multi-cams.patch

@@ -1,7 +1,7 @@
-From abab867d1e0f291606e107bc951d89087524dad9 Mon Sep 17 00:00:00 2001
+From 9ea531a9e8cb96ecc4967ebc93225300bb5ea272 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 13 Mar 2021 14:20:03 -0500
-Subject: [PATCH 11/23] Support Samsung R multi-cams
+Subject: [PATCH 11/24] Support Samsung R multi-cams
 
 Change-Id: If46f385e8dd16185cbf37ab083e6a1242e1d1555
 ---
@@ -10,10 +10,10 @@ Change-Id: If46f385e8dd16185cbf37ab083e6a1242e1d1555
  2 files changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/services/camera/libcameraservice/Android.bp b/services/camera/libcameraservice/Android.bp
-index e940c33845..a2a2ad623e 100644
+index 2a0007964b..2044a7291f 100644
 --- a/services/camera/libcameraservice/Android.bp
 +++ b/services/camera/libcameraservice/Android.bp
-@@ -155,6 +155,7 @@ cc_library_shared {
+@@ -158,6 +158,7 @@ cc_library_shared {
          "android.hardware.camera.device@3.6",
          "android.hardware.camera.device@3.7",
          "vendor.samsung.hardware.camera.provider@3.0",

patches_treble_phh/platform_frameworks_av/0012-Don-t-crash-on-unknown-audio-devices.patch

@@ -1,7 +1,7 @@
-From 7331481390a299313bf5bd94a419efc652b04e5e Mon Sep 17 00:00:00 2001
+From 646986de5e0b72ae6d492f3e23ba2c770d4b3f66 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 23 Mar 2021 00:16:42 +0100
-Subject: [PATCH 12/23] Don't crash on unknown audio devices
+Subject: [PATCH 12/24] Don't crash on unknown audio devices
 
 Change-Id: I2df8d88f742da6a84aa8888cdf19de25444de919
 ---

patches_treble_phh/platform_frameworks_av/0013-Reenable-STRATEGY_ROUTING.-This-is-a-leftover-of-tri.patch

@@ -1,7 +1,7 @@
-From 5ce3705dec69f9b26d5e6b9d97c5acef6937c1f3 Mon Sep 17 00:00:00 2001
+From 5544fb918666cfe0d2a8e9bd8afaa72cd77777a2 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 28 Mar 2021 14:47:52 +0200
-Subject: [PATCH 13/23] Reenable STRATEGY_ROUTING. This is a leftover of tries
+Subject: [PATCH 13/24] Reenable STRATEGY_ROUTING. This is a leftover of tries
  of 587b198, wrongly commited in 20f869
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH 13/23] Reenable STRATEGY_ROUTING. This is a leftover of tries
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/services/audiopolicy/enginedefault/src/Engine.cpp b/services/audiopolicy/enginedefault/src/Engine.cpp
-index 314de7889b..c73c17d1e4 100644
+index 489e924b07..8305c9ecd0 100644
 --- a/services/audiopolicy/enginedefault/src/Engine.cpp
 +++ b/services/audiopolicy/enginedefault/src/Engine.cpp
 @@ -52,7 +52,7 @@ static const std::vector<legacy_strategy_map>& getLegacyStrategy() {

patches_treble_phh/platform_frameworks_av/0014-Use-a-fake-volume-policy-when-none-has-been-found.patch

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

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

@@ -1,7 +1,7 @@
-From c8f0ce02deeeb8d126b832f929e1ead7f1f567bf Mon Sep 17 00:00:00 2001
+From 098247e5dc689acc8f3dc1aa54846c6db388a723 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 28 Mar 2021 18:54:47 +0200
-Subject: [PATCH 15/23] Not all sources in a route are valid. Dont ignore the
+Subject: [PATCH 15/24] Not all sources in a route are valid. Dont ignore the
  whole route because of one broken source
 
 Change-Id: If8a51740e71bef3a4738262ad7b43a337b0ec36d

patches_treble_phh/platform_frameworks_av/0016-When-aux-cameras-are-enabled-ignore-system-only-came.patch

@@ -1,7 +1,7 @@
-From a04258dd8d53e6788f00ec2af118edef4e5bffae Mon Sep 17 00:00:00 2001
+From c9277eaf543b3d002172d5128b4a0f967c86df0a Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 7 Aug 2021 11:11:39 +0200
-Subject: [PATCH 16/23] When aux cameras are enabled, ignore "system only"
+Subject: [PATCH 16/24] When aux cameras are enabled, ignore "system only"
  camera flag (it shouldnt be q security issue since secure cameras are listed
  otherwise)
 

patches_treble_phh/platform_frameworks_av/0017-APM-Restore-R-and-Q-behavior-respectively-for-teleph.patch

@@ -1,7 +1,7 @@
-From cfc70e827ca50d56fbac1b4a334fad77acdf82a4 Mon Sep 17 00:00:00 2001
+From 611e41d3ac58d83762a4cb2a2e6e14eac920d28b Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Tue, 19 Oct 2021 21:16:55 -0400
-Subject: [PATCH 17/23] APM: Restore R and Q behavior respectively for
+Subject: [PATCH 17/24] APM: Restore R and Q behavior respectively for
  telephony audio
 
 This conditionally reverts part of 51c9cc (S) and afd4ce (R) when the
@@ -34,7 +34,7 @@ Change-Id: I56d36d2aef4319935cb88a3e4771b23c6d5b2145
  2 files changed, 28 insertions(+), 4 deletions(-)
 
 diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
-index e334532ebc..5a15e235e0 100644
+index 5a18762967..588cc33fd8 100644
 --- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
 +++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
 @@ -601,6 +601,11 @@ status_t AudioPolicyManager::updateCallRoutingInternal(
@@ -90,10 +90,10 @@ index e334532ebc..5a15e235e0 100644
          // on other HW module, SinkMetaData of telephony input should handle it
          // assuming the device uses audio HAL V5.0 and above
 diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.h b/services/audiopolicy/managerdefault/AudioPolicyManager.h
-index 967aa10441..a1e875f559 100644
+index b1454fde47..8c802f6df9 100644
 --- a/services/audiopolicy/managerdefault/AudioPolicyManager.h
 +++ b/services/audiopolicy/managerdefault/AudioPolicyManager.h
-@@ -839,6 +839,7 @@ protected:
+@@ -841,6 +841,7 @@ protected:
          SoundTriggerSessionCollection mSoundTriggerSessions;
  
          sp<AudioPatch> mCallTxPatch;

patches_treble_phh/platform_frameworks_av/0018-Revert-Remove-support-for-audio-HAL-V2-from-the-fram.patch

@@ -1,7 +1,7 @@
-From ddf03b6aeaa7d11294c4ab404d5cd50ba74cd966 Mon Sep 17 00:00:00 2001
+From d6568bc14db80dbebfdc5c6953ac4e8c9d7e7722 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 11 Oct 2021 16:10:42 -0400
-Subject: [PATCH 18/23] Revert "Remove support for audio HAL V2 from the
+Subject: [PATCH 18/24] Revert "Remove support for audio HAL V2 from the
  framework"
 
 This reverts commit cbf517f837f7bf8a59f3ff8aa1e0e3e19612e251.

patches_treble_phh/platform_frameworks_av/0019-Fix-parsing-audio-hal-7.0-audio-policies.patch

@@ -1,7 +1,7 @@
-From 5dbb242d7d2435fab6346515b723fd197331e16a Mon Sep 17 00:00:00 2001
+From 288728abc539bd192e96739a0087f36716512ae4 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 30 Jan 2022 07:40:19 -0500
-Subject: [PATCH 19/23] Fix parsing audio hal 7.0 audio policies
+Subject: [PATCH 19/24] Fix parsing audio hal 7.0 audio policies
 
 Google changed separator from natural "," to weird " "
 We broke its support in "FIH devices: Fix "Earpiece" audio output"

patches_treble_phh/platform_frameworks_av/0020-fixup-Not-all-sources-in-a-route-are-valid.-Dont-ign.patch

@@ -1,7 +1,7 @@
-From 84a17a2c0cd0ff029e62b8c8b0d66cbabcc20878 Mon Sep 17 00:00:00 2001
+From c1cd0404c8eab0025bb111b6af36d8d519582b9c Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 12 Mar 2022 18:07:43 -0500
-Subject: [PATCH 20/23] fixup! Not all sources in a route are valid. Dont
+Subject: [PATCH 20/24] fixup! Not all sources in a route are valid. Dont
  ignore the whole route because of one broken source
 
 ---

patches_treble_phh/platform_frameworks_av/0021-Next-level-of-force-disable-a2dp-offload-erase-all-m.patch

@@ -1,7 +1,7 @@
-From a4877baf04cab3ea39e6cfb07dca5f192c00b4c6 Mon Sep 17 00:00:00 2001
+From ed70d165cbe7ac2991741e07d16c6a333f7616e2 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 5 Apr 2022 15:07:37 -0400
-Subject: [PATCH 21/23] Next level of force disable a2dp offload: erase all
+Subject: [PATCH 21/24] Next level of force disable a2dp offload: erase all
  modules related to a2dp, and include our own
 
 ---

patches_treble_phh/platform_frameworks_av/0022-Add-a-prop-to-change-Samsung-flash-strength.patch

@@ -1,7 +1,7 @@
-From d51bb9caf00ae2736c1d2376688cbb5d273acc34 Mon Sep 17 00:00:00 2001
+From 7b4ba1a3a59398941137930e5c20ede5841354ae Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 16 Apr 2022 14:30:14 -0400
-Subject: [PATCH 22/23] Add a prop to change Samsung flash strength
+Subject: [PATCH 22/24] Add a prop to change Samsung flash strength
 
 ---
  services/camera/libcameraservice/Android.bp        |  1 +
@@ -9,10 +9,10 @@ Subject: [PATCH 22/23] Add a prop to change Samsung flash strength
  2 files changed, 14 insertions(+), 1 deletion(-)
 
 diff --git a/services/camera/libcameraservice/Android.bp b/services/camera/libcameraservice/Android.bp
-index a2a2ad623e..b616f8207f 100644
+index 2044a7291f..316747a8da 100644
 --- a/services/camera/libcameraservice/Android.bp
 +++ b/services/camera/libcameraservice/Android.bp
-@@ -156,6 +156,7 @@ cc_library_shared {
+@@ -159,6 +159,7 @@ cc_library_shared {
          "android.hardware.camera.device@3.7",
          "vendor.samsung.hardware.camera.provider@3.0",
          "vendor.samsung.hardware.camera.provider@4.0",

patches_treble_phh/platform_frameworks_av/0023-Support-variable-flash-strength-on-samsung-hal-4.0.patch

@@ -1,7 +1,7 @@
-From 4e0112f9890f03418d16d999a01298728f3445d9 Mon Sep 17 00:00:00 2001
+From 1c32a655ebd9de71c2ec757f9ec928af8efa367a Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 2 May 2022 17:37:09 -0400
-Subject: [PATCH 23/23] Support variable flash strength on samsung hal 4.0
+Subject: [PATCH 23/24] Support variable flash strength on samsung hal 4.0
 
 ---
  services/camera/libcameraservice/Android.bp                 | 1 +
@@ -9,10 +9,10 @@ Subject: [PATCH 23/23] Support variable flash strength on samsung hal 4.0
  2 files changed, 7 insertions(+)
 
 diff --git a/services/camera/libcameraservice/Android.bp b/services/camera/libcameraservice/Android.bp
-index b616f8207f..3b99e643e5 100644
+index 316747a8da..a9ef730993 100644
 --- a/services/camera/libcameraservice/Android.bp
 +++ b/services/camera/libcameraservice/Android.bp
-@@ -157,6 +157,7 @@ cc_library_shared {
+@@ -160,6 +160,7 @@ cc_library_shared {
          "vendor.samsung.hardware.camera.provider@3.0",
          "vendor.samsung.hardware.camera.provider@4.0",
          "vendor.samsung.hardware.camera.device@5.0",

patches_treble_phh/platform_frameworks_av/0024-voip-Fix-high-pitched-voice-on-Qualcomm-devices.patch

@@ -0,0 +1,46 @@
+From 8cac27d9eb43fdefcc3ec9e2d709235dfc95834e Mon Sep 17 00:00:00 2001
+From: ponces <ponces26@gmail.com>
+Date: Mon, 24 Oct 2022 09:38:34 +0100
+Subject: [PATCH 24/24] voip: Fix high pitched voice on Qualcomm devices
+
+---
+ .../common/managerdefinitions/src/Serializer.cpp         | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
+index 06c65f1d85..2847fe278c 100644
+--- a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
++++ b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
+@@ -252,6 +252,7 @@ private:
+     std::string mChannelMasksSeparator = ",";
+     std::string mSamplingRatesSeparator = ",";
+     std::string mFlagsSeparator = "|";
++    std::string mMixPortName = "";
+ 
+     // Children: ModulesTraits, VolumeTraits, SurroundSoundTraits (optional)
+ };
+@@ -439,6 +440,13 @@ PolicySerializer::deserialize<AudioProfileTraits>(
+         channelsMask = channelMasksFromString("AUDIO_CHANNEL_OUT_MONO", ",");
+     }
+ 
++    // This breaks in-game voice chat and audio in some messaging apps causing it to play with a higher pitch and speed
++    bool disableStereoVoip = property_get_bool("persist.sys.phh.disable_stereo_voip", false);
++    if (disableStereoVoip && mMixPortName == "voip_rx") {
++        ALOGI("%s: disabling stereo support on voip_rx", __func__);
++        channelsMask = channelMasksFromString("AUDIO_CHANNEL_OUT_MONO", ",");
++    }
++
+     if (mIgnoreVendorExtensions && maybeVendorExtension(format)) {
+         ALOGI("%s: vendor extension format \"%s\" skipped", __func__, format.c_str());
+         return NO_INIT;
+@@ -461,6 +469,7 @@ std::variant<status_t, MixPortTraits::Element> PolicySerializer::deserialize<Mix
+     using Attributes = MixPortTraits::Attributes;
+ 
+     std::string name = getXmlAttribute(child, Attributes::name);
++    mMixPortName = name;
+     if (name.empty()) {
+         ALOGE("%s: No %s found", __func__, Attributes::name);
+         return BAD_VALUE;
+-- 
+2.25.1
+

patches_treble_phh/platform_frameworks_native/0001-On-Samsung-we-need-to-send-a-hack-message-to-HAL-to-.patch

@@ -1,7 +1,7 @@
-From 7ae79ee4272bf8e53e7ac3ebf7feeaa5eaa7e9fd Mon Sep 17 00:00:00 2001
+From b37b8cc75b77e9cdd35ca0ae682e9bc59e99bd83 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 14 Aug 2019 23:37:10 +0200
-Subject: [PATCH 01/16] On Samsung, we need to send a hack-message to HAL to
+Subject: [PATCH 01/17] On Samsung, we need to send a hack-message to HAL to
  get all Sensors
 
 Change-Id: Id6a1fa48340de61c418493668e9abd22c2599376

patches_treble_phh/platform_frameworks_native/0002-Use-BKK-s-hwcomposer-hacks-to-properly-display-FOD-l.patch

@@ -1,7 +1,7 @@
-From 85cf7e3aa2da8ba9693d77ccb08c7f400bd0185f Mon Sep 17 00:00:00 2001
+From 966cdf7775cb93103251192c1d962bc2b29193c8 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 10 Mar 2020 23:26:55 +0100
-Subject: [PATCH 02/16] Use BKK's hwcomposer hacks to properly display FOD
+Subject: [PATCH 02/17] Use BKK's hwcomposer hacks to properly display FOD
  layers
 
 Insecure hack: Set FOD layers to magical Z values to trigger

patches_treble_phh/platform_frameworks_native/0003-Samsung-Xiaomi-new-FOD-HBM-controls.patch

@@ -1,7 +1,7 @@
-From e3513a8697bdd009565068be26c73516dbc64feb Mon Sep 17 00:00:00 2001
+From e0ff6820fa58f996f382645e34248f51cc92513a Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 20 May 2020 21:16:56 +0200
-Subject: [PATCH 03/16] Samsung + Xiaomi new FOD HBM controls
+Subject: [PATCH 03/17] Samsung + Xiaomi new FOD HBM controls
 
 Change-Id: I5ab27fa70882efa85f0c917bf31bb32adaa09bb1
 ---

patches_treble_phh/platform_frameworks_native/0004-Matching-an-input-with-a-display-uses-uniqueId.patch

@@ -1,7 +1,7 @@
-From 7d3664e1bab9fb1808a37f4a7be1ca950b206c99 Mon Sep 17 00:00:00 2001
+From 2bc5bd6eb666a6cfc49702698cc8ee159e381b4d Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 22 Oct 2020 23:22:46 +0200
-Subject: [PATCH 04/16] Matching an input with a display uses uniqueId
+Subject: [PATCH 04/17] Matching an input with a display uses uniqueId
 
 Not all devices have a `location`, notably bluetooth devices.
 However, we might still want to associate them with a screen,

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

@@ -1,7 +1,7 @@
-From 1e9df004df4f4e56d2d29a3d252ef16e2b8c95a4 Mon Sep 17 00:00:00 2001
+From 3ab0c2483ede023369199b0842d892e3bef74c06 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 5 Jan 2021 23:44:00 +0100
-Subject: [PATCH 05/16] unshared_oob didn't exist in O/P, so detect its
+Subject: [PATCH 05/17] unshared_oob didn't exist in O/P, so detect its
  supported based on vndk version
 
 ---

patches_treble_phh/platform_frameworks_native/0006-Remove-Samsung-system-permission-on-sensors.patch

@@ -1,7 +1,7 @@
-From 0fa6fa2a6b2111e4aecd2dce49ae7f6c3499334c Mon Sep 17 00:00:00 2001
+From deb6d73627aa6e8ec6a0b471271747f59b496dce Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 31 Mar 2021 23:36:03 +0200
-Subject: [PATCH 06/16] Remove Samsung system permission on sensors
+Subject: [PATCH 06/17] Remove Samsung system permission on sensors
 
 ---
  libs/sensor/Sensor.cpp              | 1 +

patches_treble_phh/platform_frameworks_native/0007-Try-to-fallback-mCallingSid-to-getpidcon.patch

@@ -1,7 +1,7 @@
-From 1955781a0d3a49e4ca0121154a2d900bc809e466 Mon Sep 17 00:00:00 2001
+From 5a1d57a4dc8112334f408ae9ae39c88719e340c7 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 20 Oct 2021 09:39:47 -0400
-Subject: [PATCH 07/16] Try to fallback mCallingSid to getpidcon
+Subject: [PATCH 07/17] Try to fallback mCallingSid to getpidcon
 
 This is needed because old vendors (before April 2019 ~) don't support
 reporting SELinux context of the caller.

patches_treble_phh/platform_frameworks_native/0008-Mark-accelerometer-input-as-sensor-exclusively-if-th.patch

@@ -1,7 +1,7 @@
-From 4e9a863e2dff701c666a8320dbc1ed1669c3f816 Mon Sep 17 00:00:00 2001
+From 05db4122d817f1ade5520099cad00bcea62e9737 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 12 Dec 2021 08:45:36 -0500
-Subject: [PATCH 08/16] Mark accelerometer input as sensor exclusively if there
+Subject: [PATCH 08/17] Mark accelerometer input as sensor exclusively if there
  are ABS axis
 
 The reason this is needed is that on -fucked up- Xiami Mi A2 Lite and

patches_treble_phh/platform_frameworks_native/0009-On-Samsung-devices-for-FOD-HBM-set-specific-usage-bi.patch

@@ -1,7 +1,7 @@
-From 9c4d22dda7532f5eab4672c689e697e661ed7516 Mon Sep 17 00:00:00 2001
+From 3fe7f85070afe320b45dee0093a8d25df16543f6 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 17 Dec 2021 17:18:20 -0500
-Subject: [PATCH 09/16] On Samsung devices for FOD HBM, set specific usage bits
+Subject: [PATCH 09/17] On Samsung devices for FOD HBM, set specific usage bits
 
 Change-Id: Ibe71e291c6fba9ce48e83a5fd93f1beae3a63bc7
 ---

patches_treble_phh/platform_frameworks_native/0010-Update-FOD-HBM-method-Xiaomi-Oplus.patch

@@ -1,7 +1,7 @@
-From 007797328f85bd8282cac3bab594202d5f259723 Mon Sep 17 00:00:00 2001
+From 828d230095c458f8c0e597610de80a7aaa8c813a Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 19 Dec 2021 16:54:31 -0500
-Subject: [PATCH 10/16] Update FOD/HBM method Xiaomi/Oplus
+Subject: [PATCH 10/17] Update FOD/HBM method Xiaomi/Oplus
 
 Change-Id: If99362db18d8eace487e52716a138e15d1dcfab4
 ---

patches_treble_phh/platform_frameworks_native/0011-For-FOD-HBM-on-Asus-devices-call-the-HWC-extended-ca.patch

@@ -1,7 +1,7 @@
-From 991127276c25d37ec71204f34b42307255130f02 Mon Sep 17 00:00:00 2001
+From f5e5abdeb490981105b969400112f0daadf286d3 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 19 Dec 2021 17:04:51 -0500
-Subject: [PATCH 11/16] For FOD/HBM on Asus devices, call the HWC extended call
+Subject: [PATCH 11/17] For FOD/HBM on Asus devices, call the HWC extended call
  setLayerClass
 
 Change-Id: Id8773fc3d2fb6d2bd228503b1ee0d77864b2eb05

patches_treble_phh/platform_frameworks_native/0012-powermanager-Add-support-Samsung-miscpower-HAL.patch

@@ -1,7 +1,7 @@
-From 73231776adbe33636e7a2b9105f86ea9582a0455 Mon Sep 17 00:00:00 2001
+From b63d0d69e336bbe0665bf1eaf6b3c887d002cdac Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 27 Dec 2021 18:00:43 -0500
-Subject: [PATCH 12/16] powermanager: Add support Samsung miscpower HAL
+Subject: [PATCH 12/17] powermanager: Add support Samsung miscpower HAL
 
 Several various configurations need to be supported:
 - Android Pie vendors have a android.hardware.power HIDL default + "miscpower"

patches_treble_phh/platform_frameworks_native/0013-Fix-loading-power-hidl-v1.0.patch

@@ -1,7 +1,7 @@
-From 9e67cd2de2b1e91ad019a71d8ae5b0092b8ee25b Mon Sep 17 00:00:00 2001
+From 34e5f7d00cb20b743e174a8504176f83aaffd880 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 12 Jan 2022 04:07:34 -0500
-Subject: [PATCH 13/16] Fix loading power hidl v1.0
+Subject: [PATCH 13/17] Fix loading power hidl v1.0
 
 Change-Id: Ife20a98d2a11c79c7b42f359f30c28e2dede1f25
 ---

patches_treble_phh/platform_frameworks_native/0014-FOD-for-Asus-ZF8-had-layer-classes-inverted.patch

@@ -1,7 +1,7 @@
-From a37e367e149becaa633ced984e6fbf6465f1ff1a Mon Sep 17 00:00:00 2001
+From 4e9b455cdf4db548c27926845b1d093f33ffca23 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 4 Mar 2022 19:28:41 -0500
-Subject: [PATCH 14/16] FOD for Asus ZF8 had layer classes inverted
+Subject: [PATCH 14/17] FOD for Asus ZF8 had layer classes inverted
 
 ---
  services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp | 4 ++--

patches_treble_phh/platform_frameworks_native/0015-Don-t-crash-skiagl-backend.patch

@@ -1,7 +1,7 @@
-From 4d446805fba2b6696fa2524daee9585597b853cb Mon Sep 17 00:00:00 2001
+From 7336425ce5dd31fdc5e808162cca7e5419a5b5f3 Mon Sep 17 00:00:00 2001
 From: Alec Mouri <alecmouri@google.com>
 Date: Fri, 12 Nov 2021 12:13:20 -0800
-Subject: [PATCH 15/16] Don't crash skiagl backend.
+Subject: [PATCH 15/17] Don't crash skiagl backend.
 
 The skiagl backend was incorrectly being created as skiaglthreaded,
 which breaks mapping ExternalTextures off-thread. Specifically, there is

patches_treble_phh/platform_frameworks_native/0016-MIUI13-devices-hide-their-vibrator-HAL-behind-non-de.patch

@@ -1,7 +1,7 @@
-From 9d066525e16c7a4cdc80bf54f6e912f72f8baaa5 Mon Sep 17 00:00:00 2001
+From f0e836ccbe617db0670c68e1f4f5a9ec2ec0ab8f Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 25 Mar 2022 05:37:56 -0400
-Subject: [PATCH 16/16] MIUI13 devices hide their vibrator HAL behind
+Subject: [PATCH 16/17] MIUI13 devices hide their vibrator HAL behind
  non-default name: "vibratorfeature"
 
 ---

patches_treble_phh/platform_frameworks_native/0017-Fix-memory-leak-on-Try-to-fallback-mCallingSid-to-ge.patch

@@ -0,0 +1,53 @@
+From 678f9445ac4b2edc9f6128a6bd0eb42de7253d2e Mon Sep 17 00:00:00 2001
+From: Diogo Correia <me@diogotc.com>
+Date: Sat, 17 Sep 2022 12:24:52 +0100
+Subject: [PATCH 17/17] Fix memory leak on "Try to fallback mCallingSid to
+ getpidcon"
+
+Also fixes styling to stay consistent with the rest of the file.
+
+Fixes issue https://github.com/phhusson/treble_experimentations/issues/2410
+Commit 53b95fca57d2325fd517340dac2e924d420fa8a3 introduced this memory leak.
+---
+ libs/binder/IPCThreadState.cpp | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/libs/binder/IPCThreadState.cpp b/libs/binder/IPCThreadState.cpp
+index 66d790af4b..4af437e6d9 100644
+--- a/libs/binder/IPCThreadState.cpp
++++ b/libs/binder/IPCThreadState.cpp
+@@ -1250,12 +1250,12 @@ status_t IPCThreadState::executeCommand(int32_t cmd)
+             // This is recoding libselinux's getpidcon()
+             // We are in a NDK lib, so we need to keep changes to a minimum
+             bool allocatedSid = false;
+-            if(mCallingSid == nullptr && mCallingPid != 0) {
++            if (mCallingSid == nullptr && mCallingPid != 0) {
+                 char buf[4096];
+                 char *path = NULL;
+                 (void)asprintf(&path, "/proc/%d/attr/current", mCallingPid);
+                 int fd = open(path, O_RDONLY | O_CLOEXEC);
+-                if(fd != -1) {
++                if (fd != -1) {
+                     int readRet = read(fd, buf, sizeof(buf)-1);
+                     if(readRet != -1) {
+                         buf[readRet] = 0;
+@@ -1264,6 +1264,7 @@ status_t IPCThreadState::executeCommand(int32_t cmd)
+                     }
+                     close(fd);
+                 }
++                free(path);
+             }
+ 
+             // ALOGI(">>>> TRANSACT from pid %d sid %s uid %d\n", mCallingPid,
+@@ -1330,7 +1331,7 @@ status_t IPCThreadState::executeCommand(int32_t cmd)
+ 
+             mServingStackPointer = origServingStackPointer;
+             mCallingPid = origPid;
+-	    if(allocatedSid) free((void*)mCallingSid);
++            if (allocatedSid) free((void*)mCallingSid);
+             mCallingSid = origSid;
+             mCallingUid = origUid;
+             mStrictModePolicy = origStrictModePolicy;
+-- 
+2.25.1
+