nehemiah-zb/lineage_patches_unified
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes for February 2022, syncing up to v402

Browse Source
This commit is contained in:
Andy CrossGate Yan
2022-02-12 13:14:08 +00:00
parent d4c58201c8
commit f16874a663
124 changed files with 1330 additions and 964 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
From 4c452bb5ff1f23279efa5200c1c9b04d563bed8f Mon Sep 17 00:00:00 2001
From 2109e8f28ad6b0dd9ed1e6aea80d8f96bcfc6856 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/18] Fix BT in-call on CAF devices
Subject: [PATCH 01/19] Fix BT in-call on CAF devices
See https://github.com/phhusson/treble_experimentations/issues/374

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

@@ -1,7 +1,7 @@
From 8ee7ce7f56c8f45288e9a0135a8ee20f18d79b57 Mon Sep 17 00:00:00 2001
From efb1576f000a7bf89e53381c5863dbe5e407f77e 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/18] Add (partial, cam id is hardcoded) support for Asus ZF6
Subject: [PATCH 02/19] 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 d0d3a9d81b..6705186fdd 100644
index 04b56048e0..24b022226f 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -26,6 +26,7 @@
@@ -66,7 +66,7 @@ index d0d3a9d81b..6705186fdd 100644
Status CameraService::setTorchMode(const String16& cameraId, bool enabled,
const sp<IBinder>& clientBinder) {
Mutex::Autolock lock(mServiceLock);
@@ -3049,6 +3073,8 @@ binder::Status CameraService::BasicClient::disconnect() {
@@ -3054,6 +3078,8 @@ binder::Status CameraService::BasicClient::disconnect() {
}
mDisconnected = true;

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

@@ -1,7 +1,7 @@
From 307bf28e8863d55291bb52cf5724fa0f541adfcd Mon Sep 17 00:00:00 2001
From 9f19a75cd2c476e071f61bea35d8f082943c3522 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/18] audiopolicy: try again with trimmed audio port name if
Subject: [PATCH 03/19] audiopolicy: try again with trimmed audio port name if
not found
* In Spreadtrum BSP, some audio routes may contain ports with extra

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

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

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

@@ -1,7 +1,7 @@
From 9e9c10692262d752934e2343dfe76b0582c23601 Mon Sep 17 00:00:00 2001
From d729bbcff505ed46d6e8251475d5662a4207d935 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/18] Add persist.sys.phh.samsung.camera_ids property to
Subject: [PATCH 05/19] Add persist.sys.phh.samsung.camera_ids property to
access hidden Samsung cameras
Change-Id: I2c7bf535272acc28ed2277e96c78ddd28a0b4593

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

@@ -1,7 +1,7 @@
From 13f93488d8f5f2ebf9e350cd9f0f0cc0f7e8313d Mon Sep 17 00:00:00 2001
From 7ff037ed35bbb81e8834b762248fea580e1f7dea 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/18] Add a property to force camera timestamp source
Subject: [PATCH 06/19] 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 fd645c7a72..4a6a922c43 100644
index 87c1c750ed..b4a58ec749 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -346,8 +346,16 @@ status_t Camera3Device::initializeCommonLocked() {

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

@@ -1,7 +1,7 @@
From ccc5945c9b22dd3e96cf8ed602d8fc1697dedb87 Mon Sep 17 00:00:00 2001
From 39f279a2575ea4bf23672224c9b7b37dbe199007 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/18] FIH devices: Fix "Earpiece" audio output
Subject: [PATCH 07/19] 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

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

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

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

@@ -1,7 +1,7 @@
From cfc4fa6db350285e5a6ab87735e9252a1c070509 Mon Sep 17 00:00:00 2001
From 1bb61eb2a2777c127b191599d796b5476a26c807 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/18] Add persist.sys.phh.disable_a2dp_offload property to
Subject: [PATCH 09/19] Add persist.sys.phh.disable_a2dp_offload property to
force a2dp offload
Change-Id: Id474540c33c594cc4010a1a398d82bff8aadaeea

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

@@ -1,7 +1,7 @@
From 5f2eb5d0a7224f6f466de35c9eeed3ae5a4dbf5e Mon Sep 17 00:00:00 2001
From bba858703aee4bcfaaa38ad9f2da7be018fffc17 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/18] Make camera IDs filter-out optional
Subject: [PATCH 10/19] 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.

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

@@ -1,7 +1,7 @@
From 2f93928141323d08cba2f10517c4338d3af0ef59 Mon Sep 17 00:00:00 2001
From ed5f24d5cf810c146b60b90a01a85a37ab6c4a28 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/18] Support Samsung R multi-cams
Subject: [PATCH 11/19] Support Samsung R multi-cams
Change-Id: If46f385e8dd16185cbf37ab083e6a1242e1d1555
---

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

@@ -1,7 +1,7 @@
From fe8421d437012b5909d3dae6dec2969e67260826 Mon Sep 17 00:00:00 2001
From 088360f986f6c7c009019eacf10dfc4f1cf5d6a0 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/18] Don't crash on unknown audio devices
Subject: [PATCH 12/19] Don't crash on unknown audio devices
Change-Id: I2df8d88f742da6a84aa8888cdf19de25444de919
---

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

@@ -1,7 +1,7 @@
From d3d598ad4f8d22fefd4248e9fc04fb77c2800ace Mon Sep 17 00:00:00 2001
From 3e64779329fa068fed4fa0f66e2cf498611dc901 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/18] Reenable STRATEGY_ROUTING. This is a leftover of tries
Subject: [PATCH 13/19] Reenable STRATEGY_ROUTING. This is a leftover of tries
of 587b198, wrongly commited in 20f869
---

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

@@ -1,7 +1,7 @@
From f150ef9a8d0776fbd2123662aac7315ba7bd48de Mon Sep 17 00:00:00 2001
From 2b230756e1dc4c184557c577da7aa65f1a890be3 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/18] Use a fake volume policy when none has been found
Subject: [PATCH 14/19] 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.

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

@@ -1,7 +1,7 @@
From 244b0d93a9a1c3d2425b50c11f5c1abf310d21f9 Mon Sep 17 00:00:00 2001
From 504363194ce939aaacf76d0e3f09106d8d68b139 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/18] Not all sources in a route are valid. Dont ignore the
Subject: [PATCH 15/19] Not all sources in a route are valid. Dont ignore the
whole route because of one broken source
Change-Id: If8a51740e71bef3a4738262ad7b43a337b0ec36d

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

@@ -1,7 +1,7 @@
From f69403f665a91492fcfd5d2afe52b8e88c903b85 Mon Sep 17 00:00:00 2001
From 42780cbfbbb8ad0f5eef80541cb251c54c41129a 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/18] When aux cameras are enabled, ignore "system only"
Subject: [PATCH 16/19] When aux cameras are enabled, ignore "system only"
camera flag (it shouldnt be q security issue since secure cameras are listed
otherwise)

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

@@ -1,7 +1,7 @@
From 2140c752c78511852fef8fe2320d62ff88fb4a6c Mon Sep 17 00:00:00 2001
From 7dd1be6f9d683cdb8a204e3ffde84f08a638d93d 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/18] APM: Restore R and Q behavior respectively for
Subject: [PATCH 17/19] 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 cc2d8e8cf4..8defaad32c 100644
index cb9d70055e..dad066ec7f 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -601,6 +601,11 @@ status_t AudioPolicyManager::updateCallRoutingInternal(

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

@@ -1,7 +1,7 @@
From e7f31e63f87dd23e421645783a672ce00e9f1122 Mon Sep 17 00:00:00 2001
From 40839d6f809c90177f3b5160954d2e8abc6cb8f6 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/18] Revert "Remove support for audio HAL V2 from the
Subject: [PATCH 18/19] Revert "Remove support for audio HAL V2 from the
framework"
This reverts commit cbf517f837f7bf8a59f3ff8aa1e0e3e19612e251.

29
patches_treble_phh/platform_frameworks_av/0019-Fix-parsing-audio-hal-7.0-audio-policies.patch Normal file
View File

@@ -0,0 +1,29 @@
From 0ab558df019b2841415ac58d8cf9acc17c217b8a 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/19] 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"
Change-Id: I458b8b6a6498dd9cf748e00843ff65c561579902
---
.../audiopolicy/common/managerdefinitions/src/Serializer.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
index 2ff11ddbab..df4f2dff63 100644
--- a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
+++ b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
@@ -431,7 +431,7 @@ PolicySerializer::deserialize<AudioProfileTraits>(
std::string samplingRates = getXmlAttribute(cur, Attributes::samplingRates);
std::string format = getXmlAttribute(cur, Attributes::format);
std::string channels = getXmlAttribute(cur, Attributes::channelMasks);
- ChannelTraits::Collection channelsMask = channelMasksFromString(channels, ",");
+ ChannelTraits::Collection channelsMask = channelMasksFromString(channels, mChannelMasksSeparator.c_str());
//Some Foxconn devices have wrong earpiece channel mask, leading to no channel mask
if(channelsMask.size() == 1 && *channelsMask.begin() == AUDIO_CHANNEL_IN_MONO && isOutput) {
--
2.25.1

2
patches_treble_phh/platform_frameworks_base/0001-Fallback-to-stupid-autobrightness-if-brightness-valu.patch
View File

@@ -1,4 +1,4 @@
From 6a586c8d51eddc005f1215e73327321296c047fd Mon Sep 17 00:00:00 2001
From e42a02d1448c13fde0e1d7a326572d04f27fef14 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 5 Oct 2021 17:59:16 -0400
Subject: [PATCH 01/28] Fallback to stupid autobrightness if brightness values

8
patches_treble_phh/platform_frameworks_base/0002-Relax-requirement-for-visible-flag-to-sdcards.patch
View File

@@ -1,4 +1,4 @@
From 19e1c2ec405a3a378fd80b86716d65692da7a1cd Mon Sep 17 00:00:00 2001
From 950264e8b5aa352a8d5663878a7ad6e5ac7d7865 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 28 Nov 2017 18:28:04 +0100
Subject: [PATCH 02/28] Relax requirement for visible flag to sdcards
@@ -13,7 +13,7 @@ Change-Id: Ia616671c03562d1eadaff5531a5c708a62d7ad3a
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
index 8727932a87f7..f58f952d19e2 100644
index 2f29c3cb4e7c..de92ad4d47ca 100644
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -1582,7 +1582,8 @@ class StorageManagerService extends IStorageManager.Stub
@@ -24,8 +24,8 @@ index 8727932a87f7..f58f952d19e2 100644
+ // Assume all SDs match this as well
+ if (vol.disk.isAdoptable() || vol.disk.isSd()) {
vol.mountFlags |= VolumeInfo.MOUNT_FLAG_VISIBLE;
}
} else if (vol.disk.isSd()) {
vol.mountFlags |= VolumeInfo.MOUNT_FLAG_VISIBLE;
--
2.25.1

2
patches_treble_phh/platform_frameworks_base/0003-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch
View File

@@ -1,4 +1,4 @@
From 52c14e64a80eede9b3e82afd54fd4e6cf5862cf1 Mon Sep 17 00:00:00 2001
From 439dea5fc58d5d67545f882c885586d6aa04e2dc Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Thu, 17 May 2018 20:28:35 +0200
Subject: [PATCH 03/28] Don't crash if there is IR HAL is not declared

2
patches_treble_phh/platform_frameworks_base/0004-Show-APN-Settings-for-CDMA-carriers.patch
View File

@@ -1,4 +1,4 @@
From 33fb74d694502c95ee26f331ea308114f8506b90 Mon Sep 17 00:00:00 2001
From 3d3ef7ef4a0406ed5b3761ee934d172bfdbe02e7 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 6 Aug 2018 12:49:00 +0200
Subject: [PATCH 04/28] Show APN Settings for CDMA carriers

4
patches_treble_phh/platform_frameworks_base/0005-Re-order-services-so-that-it-works-even-without-qtag.patch
View File

@@ -1,4 +1,4 @@
From b9d12e89208f1b10efbf6d64b9c1b8613b6b336c Mon Sep 17 00:00:00 2001
From 114aa0bef17c9a6814d4424e8ed3b25512102c3d Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Thu, 8 Nov 2018 23:04:03 +0100
Subject: [PATCH 05/28] Re-order services so that it works even without qtaguid
@@ -9,7 +9,7 @@ Change-Id: I0c0f527b3ae151d45c68f7ac6c205da3f34e74df
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
index 9c664b6da4f2..8ebcfb667161 100644
index 0a85854b2af8..2b3b9b1572d7 100644
--- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
+++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -878,6 +878,10 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {

8
patches_treble_phh/platform_frameworks_base/0006-Support-samsung-Pie-and-Q-light-hal.patch
View File

@@ -1,4 +1,4 @@
From 073b07985a88b4ab54a9451503d58070de0f0721 Mon Sep 17 00:00:00 2001
From fec18df4c1900f54a9581569a27f44d4aa6689ce Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 24 Mar 2019 23:05:14 +0100
Subject: [PATCH 06/28] Support samsung Pie and Q light hal
@@ -10,13 +10,13 @@ Change-Id: I01f94acd7d0672733e48854d80368f9ac6f861c6
2 files changed, 53 insertions(+)
diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp
index 81532bcba0ae..8ddc16aae3d7 100644
index 53401fd47178..59256cc73df1 100644
--- a/services/core/jni/Android.bp
+++ b/services/core/jni/Android.bp
@@ -184,6 +184,8 @@ cc_defaults {
@@ -183,6 +183,8 @@ cc_defaults {
"android.system.suspend.control.internal-cpp",
"android.system.suspend@1.0",
"service.incremental",
"vendor.lineage.power-V1-cpp",
+ "vendor.samsung.hardware.light@2.0",
+ "vendor.samsung.hardware.light@3.0",
],

2
patches_treble_phh/platform_frameworks_base/0007-Add-support-for-samsung-touch-physical-and-hover-pro.patch
View File

@@ -1,4 +1,4 @@
From 489e8a00a23c0dd6fbef5f1e69b2f7ed3fbc04d7 Mon Sep 17 00:00:00 2001
From 4d0b2ab189abeadc3802878d679ef1e6800c76da Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 12 Aug 2019 23:08:26 +0200
Subject: [PATCH 07/28] Add support for samsung touch, physical and hover

2
patches_treble_phh/platform_frameworks_base/0008-Always-allow-overriding-the-number-of-work-profiles.patch
View File

@@ -1,4 +1,4 @@
From e69df4088c108effd45e8741047ee1afd8ca2ce5 Mon Sep 17 00:00:00 2001
From bb2490310ccca71a4a0b69858d0a274eefebd3d7 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 5 Apr 2020 16:32:46 +0200
Subject: [PATCH 08/28] Always allow overriding the number of work profiles

2
patches_treble_phh/platform_frameworks_base/0009-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch
View File

@@ -1,4 +1,4 @@
From 901baaf78da74754054309406fb5211170a38552 Mon Sep 17 00:00:00 2001
From 86ba18dfced8787826c34bb28d7ed83b35b8d3f4 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sat, 6 Jun 2020 18:21:56 +0200
Subject: [PATCH 09/28] HOME deserves to wake-up devices just as well as back

2
patches_treble_phh/platform_frameworks_base/0010-Some-devices-have-proximity-sensor-reporting-NaN-as-.patch
View File

@@ -1,4 +1,4 @@
From 14e1ced9fe14016d081618bb41a451227cd538d8 Mon Sep 17 00:00:00 2001
From 1b7f27efb7af8a4c9f49a1e504f5b4d2530e1c85 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 29 Sep 2020 22:39:47 +0200
Subject: [PATCH 10/28] Some devices have proximity sensor reporting NaN as max

4
patches_treble_phh/platform_frameworks_base/0011-Fix-brightness-range-not-being-complete-on-Samsung-d.patch
View File

@@ -1,4 +1,4 @@
From f8fb9e614a976c475edc26770347f9eee623d85c Mon Sep 17 00:00:00 2001
From 5f849729380e68e0317c89da35c23b98df916748 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 29 Sep 2020 22:40:10 +0200
Subject: [PATCH 11/28] Fix brightness range not being complete on Samsung
@@ -15,7 +15,7 @@ Change-Id: I4d97cbc32490949e83272b81ec6320a5483310b1
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java
index 62d9991254bd..24932bd4d201 100644
index 5ac1f31bf817..06cd0ac979e9 100644
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
@@ -1040,9 +1040,11 @@ public final class PowerManagerService extends SystemService

2
patches_treble_phh/platform_frameworks_base/0012-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch
View File

@@ -1,4 +1,4 @@
From ccb4d4cf65dcb79d237caa9192bb863ef5809edd Mon Sep 17 00:00:00 2001
From af86daa9d8bd70690e9b50c2e1e23e5d52bc662d Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 25 Oct 2020 23:57:26 +0100
Subject: [PATCH 12/28] Re-implement fnmatch-like behaviour for RRO java-side

2
patches_treble_phh/platform_frameworks_base/0013-Make-rounded-corners-padding-overridable-with-persis.patch
View File

@@ -1,4 +1,4 @@
From 924e19514d9bc0c67c64560fba9d7fc3432e8981 Mon Sep 17 00:00:00 2001
From 8a1571889ec702ae794f006af91d6d662042cc0a Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 6 Dec 2020 12:20:08 +0100
Subject: [PATCH 13/28] Make rounded corners padding overridable with

2
patches_treble_phh/platform_frameworks_base/0014-Remove-useless-notification-about-console-service-be.patch
View File

@@ -1,4 +1,4 @@
From dd87ec1187b8be38995b734dbdfe3598dfd59cdb Mon Sep 17 00:00:00 2001
From 4a0779e7ee51291bc635cc2aa414ef6252503902 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Fri, 11 Dec 2020 14:41:09 +0100
Subject: [PATCH 14/28] Remove useless notification about "console" service

2
patches_treble_phh/platform_frameworks_base/0015-Revert-Remove-unused-SystemProperties.set.patch
View File

@@ -1,4 +1,4 @@
From bdffa8303310e05d4fba777d5f1e00b62d20db19 Mon Sep 17 00:00:00 2001
From f72b62ec62e70b907c02b7af6382e36f45777509 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Wed, 16 Dec 2020 21:24:12 +0800
Subject: [PATCH 15/28] Revert "Remove unused SystemProperties.set"

2
patches_treble_phh/platform_frameworks_base/0016-TelephonyManager-bring-back-getNetworkClass.patch
View File

@@ -1,4 +1,4 @@
From 6384008d3e04db21fe384cba9879b915cded98ab Mon Sep 17 00:00:00 2001
From 6a140ec75ff6b13b6ec397119ee46774e38f3333 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Wed, 16 Dec 2020 13:46:15 +0800
Subject: [PATCH 16/28] TelephonyManager: bring back getNetworkClass()

2
patches_treble_phh/platform_frameworks_base/0017-TelephonyManager-add-API-annotations-for-setTelephon.patch
View File

@@ -1,4 +1,4 @@
From 3026abf6ca577e885c2481c39826b16104a49ac2 Mon Sep 17 00:00:00 2001
From 8f25adf7351f187e5c1a6c0f3607f14b6e272bd7 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Wed, 16 Dec 2020 21:26:45 +0800
Subject: [PATCH 17/28] TelephonyManager: add API annotations for

2
patches_treble_phh/platform_frameworks_base/0018-Fix-Wakelock-issue.patch
View File

@@ -1,4 +1,4 @@
From 78a5652a8d86f51f479ced7b08864fe71f630905 Mon Sep 17 00:00:00 2001
From 2d0a8597409cd7a31d7718c1c9d6ebd2cdaa1c0d Mon Sep 17 00:00:00 2001
From: Alberto Ponces <ponces26@gmail.com>
Date: Tue, 2 Feb 2021 10:20:51 +0000
Subject: [PATCH 18/28] Fix Wakelock issue

2
patches_treble_phh/platform_frameworks_base/0019-SystemUI-Use-AVCProfileMain-for-screen-recorder.patch
View File

@@ -1,4 +1,4 @@
From 2cb4389377b69c5e53101536333838c6aa63d4fa Mon Sep 17 00:00:00 2001
From 243d10a369e231ca4f239d75c518a72bc1a55933 Mon Sep 17 00:00:00 2001
From: Arne Coucheron <arco68@gmail.com>
Date: Thu, 5 Nov 2020 05:38:44 +0100
Subject: [PATCH 19/28] SystemUI: Use AVCProfileMain for screen recorder

2
patches_treble_phh/platform_frameworks_base/0020-Automatically-detect-pick-up-sensor-so-that-an-overl.patch
View File

@@ -1,4 +1,4 @@
From 357f0fac32fc59b8f6349febd3a65f2ffb820279 Mon Sep 17 00:00:00 2001
From 3ae48d5109ac89634f9a7f96a8555d96025050c8 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sat, 20 Mar 2021 14:31:01 +0100
Subject: [PATCH 20/28] Automatically detect pick up sensor, so that an overlay

2
patches_treble_phh/platform_frameworks_base/0021-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch
View File

@@ -1,4 +1,4 @@
From f4f5e6173024f2057f4d4ffcdc77028d03b004e2 Mon Sep 17 00:00:00 2001
From 5b9aa5db4dc782ed9a6506cda78277d87f81ef31 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 23 Mar 2021 19:43:26 +0100
Subject: [PATCH 21/28] Catch broken mainBuiltInDisplayCutoutRectApproximation

2
patches_treble_phh/platform_frameworks_base/0022-backlight-Fix-backlight-control-on-Galaxy-S9.patch
View File

@@ -1,4 +1,4 @@
From 0935d80aa90b9575b77bd55a37432a5f4a6c3747 Mon Sep 17 00:00:00 2001
From 69316504d686f4365303f60a395634d5a9878725 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sat, 24 Mar 2018 08:01:48 +0100
Subject: [PATCH 22/28] backlight: Fix backlight control on Galaxy S9(+)

6
patches_treble_phh/platform_frameworks_base/0023-Add-support-for-app-signature-spoofing.patch
View File

@@ -1,4 +1,4 @@
From 7b0c25ae3dfe6af5d9d9a2b2518964f7c5f034bf Mon Sep 17 00:00:00 2001
From 3c7d6c5106eea744e08250998ce3d60af7c9b306 Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev>
Date: Sat, 16 Oct 2021 05:27:57 -0700
Subject: [PATCH 23/28] Add support for app signature spoofing
@@ -56,10 +56,10 @@ index 1de47b548a5c..52c7ea2e1321 100644
field public static final String MICROPHONE = "android.permission-group.MICROPHONE";
field public static final String NEARBY_DEVICES = "android.permission-group.NEARBY_DEVICES";
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 76b8547cea2a..8bd3206d1e3a 100644
index a006db9d8373..8c88f2d3dcba 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -3199,6 +3199,21 @@
@@ -3202,6 +3202,21 @@
android:description="@string/permdesc_getPackageSize"
android:protectionLevel="normal" />

2
patches_treble_phh/platform_frameworks_base/0024-Revert-Switch-long-press-power-behavior-in-AOSP.patch
View File

@@ -1,4 +1,4 @@
From 7003808f45a75893726d4073da9132c314091e98 Mon Sep 17 00:00:00 2001
From afdd9f16ebf1993e982389260129fed10c3820fa Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sat, 4 Sep 2021 08:26:30 +0000
Subject: [PATCH 24/28] Revert "Switch long-press power behavior in AOSP."

4
patches_treble_phh/platform_frameworks_base/0025-Reduce-the-size-of-udfps-enroll-progress-bar.-Some-d.patch
View File

@@ -1,4 +1,4 @@
From 72faf5ce1446d48e39961177519c92359e066312 Mon Sep 17 00:00:00 2001
From af7498ac0f380fd576e8c821d4a091ab242f20ba Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Fri, 17 Dec 2021 17:16:14 -0500
Subject: [PATCH 25/28] Reduce the size of udfps enroll progress bar. Some
@@ -11,7 +11,7 @@ Change-Id: I1609ad9ca316293dcaaf07f7e681d11aadfcd29c
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
index dbbb54f7ad6e..d0098b32f384 100644
index b2ccacd5fe42..ebf7b8407727 100644
--- a/packages/SystemUI/res/values/config.xml
+++ b/packages/SystemUI/res/values/config.xml
@@ -637,7 +637,7 @@

2
patches_treble_phh/platform_frameworks_base/0026-Add-UDFPS-support-for-various-devices.patch
View File

@@ -1,4 +1,4 @@
From 380896691e59acbc1af203a2433adaba68c1b5ee Mon Sep 17 00:00:00 2001
From 3c5f40c68535cf981e0d891fa368910ccf9a301a Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 19 Dec 2021 17:08:22 -0500
Subject: [PATCH 26/28] Add UDFPS support for various devices

2
patches_treble_phh/platform_frameworks_base/0027-Dynamically-resize-boot-animation-to-match-screen-si.patch
View File

@@ -1,4 +1,4 @@
From 8bee76c6e7f4524183ea134f59fd0254f958e07e Mon Sep 17 00:00:00 2001
From 901626c91714a65086a7a007290964f60da8464e Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 20 Dec 2021 15:01:41 -0500
Subject: [PATCH 27/28] Dynamically resize boot animation to match screen size

8
patches_treble_phh/platform_frameworks_base/0028-Once-we-integrate-Samsung-Power-hal-in-libpowermanag.patch
View File

@@ -1,4 +1,4 @@
From 16f900d9c0342636db048c22685d2a104a2a4e1f Mon Sep 17 00:00:00 2001
From 4be34967d45c4c8198be53c0190fa5b12b5cbb6e Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 27 Dec 2021 17:57:11 -0500
Subject: [PATCH 28/28] Once we integrate Samsung Power hal in libpowermanager,
@@ -11,11 +11,11 @@ Change-Id: I9084f64e505009abe9420d28b44199605cee52d8
1 file changed, 1 insertion(+)
diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp
index 8ddc16aae3d7..806b92bcbdab 100644
index 59256cc73df1..17736c3623c9 100644
--- a/services/core/jni/Android.bp
+++ b/services/core/jni/Android.bp
@@ -186,6 +186,7 @@ cc_defaults {
"vendor.lineage.power-V1-cpp",
@@ -185,6 +185,7 @@ cc_defaults {
"service.incremental",
"vendor.samsung.hardware.light@2.0",
"vendor.samsung.hardware.light@3.0",
+ "vendor.samsung.hardware.miscpower@2.0",

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

@@ -1,4 +1,4 @@
From 8a382e0be8155b21e0e99d03311476b8f0194736 Mon Sep 17 00:00:00 2001
From 297868e5aed30c197cc62805a2eba35fb604b63d 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/13] On Samsung, we need to send a hack-message to HAL to

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

@@ -1,4 +1,4 @@
From dbad169717d4780128085b04ca5a6d39a2f0c5f0 Mon Sep 17 00:00:00 2001
From ecc9c4502e39ee6f2c97a97ef836b670b30127b8 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/13] Use BKK's hwcomposer hacks to properly display FOD

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

@@ -1,4 +1,4 @@
From dfc8b5d9b4b9011de99a6b61dc2469a0fe71fe7f Mon Sep 17 00:00:00 2001
From f8cdc13f4a0c9c701c67d2bba831c9914883d7f4 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/13] Samsung + Xiaomi new FOD HBM controls

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

@@ -1,4 +1,4 @@
From 3da3fd1c7f9302110cf747e717d2d60307c023bf Mon Sep 17 00:00:00 2001
From fa1f31735f374849c7697086a83f25b9a8e01bdb 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/13] Matching an input with a display uses uniqueId

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

@@ -1,4 +1,4 @@
From 5f8dd3a2351d262cea42d7b17746349d20649271 Mon Sep 17 00:00:00 2001
From 6406d35dbf27d6c9d0a82e6ae6ec3c323f077e57 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/13] unshared_oob didn't exist in O/P, so detect its

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

@@ -1,4 +1,4 @@
From dfd43b7f2773b8e413b41fac4d3b916658a55f6e Mon Sep 17 00:00:00 2001
From fdd475f9d03ba45e855d12a7b8732e95e5d44794 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/13] Remove Samsung system permission on sensors

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

@@ -1,4 +1,4 @@
From 3f8be28fc09a5d3dba6528be7f6144cecc804b17 Mon Sep 17 00:00:00 2001
From 8d39a35611d3d167461e92e909ea05cd9a3506fa 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/13] Try to fallback mCallingSid to getpidcon

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

@@ -1,4 +1,4 @@
From bcef77e6159b832ff4fccd6968b3f8c1fd9f24e1 Mon Sep 17 00:00:00 2001
From e661deeaae72043ce07657476710498682e215b4 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/13] Mark accelerometer input as sensor exclusively if there

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

@@ -1,4 +1,4 @@
From 16f193c5d1d5a358a4d08432254477bdb69724ea Mon Sep 17 00:00:00 2001
From ddd7c07b9bc675ca50a4dfa1d15906791649b688 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/13] On Samsung devices for FOD HBM, set specific usage bits

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

@@ -1,4 +1,4 @@
From 215af0d1a309c8bf2f6e8b474fa5f99c4c09ef15 Mon Sep 17 00:00:00 2001
From fa8c48b68b12a28dd171abc0f6f52a60c12f6840 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/13] Update FOD/HBM method Xiaomi/Oplus

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

@@ -1,4 +1,4 @@
From 1636cbb066d3a7f835588dad5aee9c2e764117d1 Mon Sep 17 00:00:00 2001
From b5fe4477aa2acd28d60ce9f382dce31ac9d5c168 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/13] For FOD/HBM on Asus devices, call the HWC extended call

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

@@ -1,4 +1,4 @@
From e33af0dcd960fdbcc14b31ce22e21ce8297fad69 Mon Sep 17 00:00:00 2001
From a99bfcddc9930b3acd9b3e3f6026e962f2c62a59 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/13] powermanager: Add support Samsung miscpower HAL
@@ -18,54 +18,53 @@ Only tested configuration ATM is the latest one
Change-Id: I182a91ccb0a89f9d0d7d41f36eccab218b553bbc
---
include/powermanager/PowerHalLoader.h | 3 +
include/powermanager/PowerHalWrapper.h | 35 ++++++++-
include/powermanager/PowerHalWrapper.h | 35 +++++++++-
services/powermanager/Android.bp | 1 +
services/powermanager/PowerHalController.cpp | 7 +-
services/powermanager/PowerHalLoader.cpp | 16 ++++-
services/powermanager/PowerHalWrapper.cpp | 75 ++++++++++++++++++++
6 files changed, 134 insertions(+), 3 deletions(-)
services/powermanager/PowerHalWrapper.cpp | 70 ++++++++++++++++++++
6 files changed, 129 insertions(+), 3 deletions(-)
diff --git a/include/powermanager/PowerHalLoader.h b/include/powermanager/PowerHalLoader.h
index 18dfb50cb4..8822658706 100644
index ed6f6f35f5..53ecdd7e98 100644
--- a/include/powermanager/PowerHalLoader.h
+++ b/include/powermanager/PowerHalLoader.h
@@ -21,6 +21,7 @@
@@ -20,6 +20,7 @@
#include <android-base/thread_annotations.h>
#include <android/hardware/power/1.1/IPower.h>
#include <android/hardware/power/IPower.h>
#include <vendor/lineage/power/IPower.h>
+#include <vendor/samsung/hardware/miscpower/2.0/ISehMiscPower.h>
namespace android {
@@ -35,6 +36,7 @@ public:
@@ -32,12 +33,14 @@ public:
static sp<hardware::power::IPower> loadAidl();
static sp<hardware::power::V1_0::IPower> loadHidlV1_0();
static sp<hardware::power::V1_1::IPower> loadHidlV1_1();
static sp<vendor::lineage::power::IPower> loadLineageAidl();
+ static sp<vendor::samsung::hardware::miscpower::V2_0::ISehMiscPower> loadHidlSeh();
private:
static std::mutex gHalMutex;
@@ -43,6 +45,7 @@ private:
static sp<hardware::power::IPower> gHalAidl GUARDED_BY(gHalMutex);
static sp<hardware::power::V1_0::IPower> gHalHidlV1_0 GUARDED_BY(gHalMutex);
static sp<hardware::power::V1_1::IPower> gHalHidlV1_1 GUARDED_BY(gHalMutex);
static sp<vendor::lineage::power::IPower> gHalLineageAidl GUARDED_BY(gLineageHalMutex);
+ static sp<vendor::samsung::hardware::miscpower::V2_0::ISehMiscPower> gHalHidlSeh GUARDED_BY(gHalMutex);
static sp<hardware::power::V1_0::IPower> loadHidlV1_0Locked()
EXCLUSIVE_LOCKS_REQUIRED(gHalMutex);
diff --git a/include/powermanager/PowerHalWrapper.h b/include/powermanager/PowerHalWrapper.h
index d455b74564..8a0623f588 100644
index 2c6eacbfaa..672cf65ae6 100644
--- a/include/powermanager/PowerHalWrapper.h
+++ b/include/powermanager/PowerHalWrapper.h
@@ -24,6 +24,7 @@
@@ -23,6 +23,7 @@
#include <android/hardware/power/IPower.h>
#include <android/hardware/power/IPowerHintSession.h>
#include <android/hardware/power/Mode.h>
#include <vendor/lineage/power/IPower.h>
+#include <vendor/samsung/hardware/miscpower/2.0/ISehMiscPower.h>
namespace android {
@@ -185,7 +186,10 @@ private:
@@ -181,7 +182,10 @@ private:
// Wrapper for the AIDL Power HAL.
class AidlHalWrapper : public HalWrapper {
public:
@@ -77,7 +76,7 @@ index d455b74564..8a0623f588 100644
virtual ~AidlHalWrapper() = default;
virtual HalResult<void> setBoost(hardware::power::Boost boost, int32_t durationMs) override;
@@ -201,6 +205,7 @@ private:
@@ -196,6 +200,7 @@ private:
std::mutex mBoostMutex;
std::mutex mModeMutex;
sp<hardware::power::IPower> mHandle;
@@ -85,8 +84,8 @@ index d455b74564..8a0623f588 100644
// Android framework only sends boost upto DISPLAY_UPDATE_IMMINENT.
// Need to increase the array size if more boost supported.
std::array<std::atomic<HalSupport>,
@@ -231,6 +236,34 @@ private:
sp<vendor::lineage::power::IPower> mHandle;
@@ -208,6 +213,34 @@ private:
mModeSupportedArray GUARDED_BY(mModeMutex) = {HalSupport::UNKNOWN};
};
+class HidlHalWrapperSeh : public HalWrapper {
@@ -105,7 +104,6 @@ index d455b74564..8a0623f588 100644
+ int32_t tgid, int32_t uid, const std::vector<int32_t>& threadIds,
+ int64_t durationNanos) override;
+ virtual HalResult<int64_t> getHintSessionPreferredRate() override;
+ virtual HalResult<int> getFeature(vendor::lineage::power::Feature feature) override;
+
+protected:
+ virtual HalResult<void> sendPowerHint(hardware::power::V1_0::PowerHint hintId, uint32_t data);
@@ -117,23 +115,24 @@ index d455b74564..8a0623f588 100644
+ HalResult<void> setInteractive(bool enabled);
+ HalResult<void> setFeature(hardware::power::V1_0::Feature feature, bool enabled);
+};
+
}; // namespace power
}; // namespace android
diff --git a/services/powermanager/Android.bp b/services/powermanager/Android.bp
index e27e620729..e77cdc32b2 100644
index d828aa97a0..4bbe284ee9 100644
--- a/services/powermanager/Android.bp
+++ b/services/powermanager/Android.bp
@@ -40,6 +40,7 @@ cc_library_shared {
@@ -39,6 +39,7 @@ cc_library_shared {
"android.hardware.power@1.0",
"android.hardware.power@1.1",
"android.hardware.power-V2-cpp",
"vendor.lineage.power-V1-cpp",
+ "vendor.samsung.hardware.miscpower@2.0",
],
cflags: [
diff --git a/services/powermanager/PowerHalController.cpp b/services/powermanager/PowerHalController.cpp
index 7a1b5f7c0a..8577c3b931 100644
index 8c225d5d02..f67fbae08b 100644
--- a/services/powermanager/PowerHalController.cpp
+++ b/services/powermanager/PowerHalController.cpp
@@ -20,6 +20,7 @@
@@ -144,7 +143,7 @@ index 7a1b5f7c0a..8577c3b931 100644
#include <powermanager/PowerHalController.h>
#include <powermanager/PowerHalLoader.h>
#include <utils/Log.h>
@@ -35,11 +36,15 @@ namespace power {
@@ -34,11 +35,15 @@ namespace power {
std::unique_ptr<HalWrapper> HalConnector::connect() {
sp<IPower> halAidl = PowerHalLoader::loadAidl();
@@ -162,7 +161,7 @@ index 7a1b5f7c0a..8577c3b931 100644
return std::make_unique<HidlHalWrapperV1_1>(halHidlV1_0, halHidlV1_1);
}
diff --git a/services/powermanager/PowerHalLoader.cpp b/services/powermanager/PowerHalLoader.cpp
index e5c636344d..803888dabb 100644
index 1f1b43a607..f9f5bbc347 100644
--- a/services/powermanager/PowerHalLoader.cpp
+++ b/services/powermanager/PowerHalLoader.cpp
@@ -18,6 +18,7 @@
@@ -173,16 +172,16 @@ index e5c636344d..803888dabb 100644
#include <binder/IServiceManager.h>
#include <hardware/power.h>
#include <hardware_legacy/power.h>
@@ -59,6 +60,7 @@ sp<IPower> PowerHalLoader::gHalAidl = nullptr;
@@ -55,6 +56,7 @@ std::mutex PowerHalLoader::gHalMutex;
sp<IPower> PowerHalLoader::gHalAidl = nullptr;
sp<V1_0::IPower> PowerHalLoader::gHalHidlV1_0 = nullptr;
sp<V1_1::IPower> PowerHalLoader::gHalHidlV1_1 = nullptr;
sp<LineageAidl::IPower> PowerHalLoader::gHalLineageAidl = nullptr;
+sp<vendor::samsung::hardware::miscpower::V2_0::ISehMiscPower> PowerHalLoader::gHalHidlSeh = nullptr;
void PowerHalLoader::unloadAll() {
std::lock_guard<std::mutex> lock(gHalMutex);
@@ -98,10 +100,22 @@ sp<LineageAidl::IPower> PowerHalLoader::loadLineageAidl() {
return loadHal<LineageAidl::IPower>(gHalExists, gHalLineageAidl, loadFn, "Lineage AIDL");
@@ -82,10 +84,22 @@ sp<V1_1::IPower> PowerHalLoader::loadHidlV1_1() {
return loadHal<V1_1::IPower>(gHalExists, gHalHidlV1_1, loadFn, "HIDL v1.1");
}
+sp<vendor::samsung::hardware::miscpower::V2_0::ISehMiscPower> PowerHalLoader::loadHidlSeh() {
@@ -206,10 +205,10 @@ index e5c636344d..803888dabb 100644
// -------------------------------------------------------------------------------------------------
diff --git a/services/powermanager/PowerHalWrapper.cpp b/services/powermanager/PowerHalWrapper.cpp
index 49659e796e..775cdcf800 100644
index d74bd23a8d..a83990f2a4 100644
--- a/services/powermanager/PowerHalWrapper.cpp
+++ b/services/powermanager/PowerHalWrapper.cpp
@@ -220,6 +220,10 @@ HalResult<void> AidlHalWrapper::setMode(Mode mode, bool enabled) {
@@ -209,6 +209,10 @@ HalResult<void> AidlHalWrapper::setMode(Mode mode, bool enabled) {
std::unique_lock<std::mutex> lock(mModeMutex);
size_t idx = static_cast<size_t>(mode);
@@ -220,8 +219,8 @@ index 49659e796e..775cdcf800 100644
// Quick return if mode is not supported by HAL
if (idx >= mModeSupportedArray.size() || mModeSupportedArray[idx] == HalSupport::OFF) {
ALOGV("Skipped setMode %s because Power HAL doesn't support it", toString(mode).c_str());
@@ -296,6 +300,77 @@ HalResult<int> LineageAidlHalWrapper::getFeature(LineageAidl::Feature feature) {
return HalResult<int>::fromStatus(ret, value);
@@ -248,6 +252,72 @@ HalResult<int64_t> AidlHalWrapper::getHintSessionPreferredRate() {
return HalResult<int64_t>::fromStatus(result, rate);
}
+HalResult<void> HidlHalWrapperSeh::setBoost(Boost boost, int32_t durationMs) {
@@ -289,11 +288,6 @@ index 49659e796e..775cdcf800 100644
+ ALOGV("Skipped getHintSessionPreferredRate because Power HAL not available");
+ return HalResult<int64_t>::unsupported();
+}
+
+HalResult<int> HidlHalWrapperSeh::getFeature(LineageAidl::Feature) {
+ ALOGV("Skipped getFeature because Power HAL not available");
+ return HalResult<int>::unsupported();
+}
+
// -------------------------------------------------------------------------------------------------

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

@@ -1,4 +1,4 @@
From 184f59f82b11e4180a12586ab01b926b9187c418 Mon Sep 17 00:00:00 2001
From 71294e86127acffb85bd93dd6ebd867e1111ac8c 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/13] Fix loading power hidl v1.0
@@ -9,10 +9,10 @@ Change-Id: Ife20a98d2a11c79c7b42f359f30c28e2dede1f25
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/services/powermanager/PowerHalLoader.cpp b/services/powermanager/PowerHalLoader.cpp
index 803888dabb..f04abdcbd0 100644
index f9f5bbc347..412fda3c35 100644
--- a/services/powermanager/PowerHalLoader.cpp
+++ b/services/powermanager/PowerHalLoader.cpp
@@ -108,10 +108,11 @@ sp<vendor::samsung::hardware::miscpower::V2_0::ISehMiscPower> PowerHalLoader::lo
@@ -92,10 +92,11 @@ sp<vendor::samsung::hardware::miscpower::V2_0::ISehMiscPower> PowerHalLoader::lo
}
sp<V1_0::IPower> PowerHalLoader::loadHidlV1_0Locked() {

4
patches_treble_phh/platform_frameworks_opt_telephony/0001-telephony-forward-port-support-for-forceCognitive.patch
View File

@@ -1,7 +1,7 @@
From cc24a7e886eff42a0e2f160cabb2c11d87c1a384 Mon Sep 17 00:00:00 2001
From b5fd6bb53c710116c5138393a827117f3f02024c Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 13 Oct 2019 17:21:31 +0800
Subject: [PATCH 1/4] telephony: forward-port support for forceCognitive
Subject: [PATCH 1/5] telephony: forward-port support for forceCognitive
* This is needed on some MTK devices. Android 10 refactored some code,
so now the "non-persistent/cognitive" filter is relocated to RIL and

4
patches_treble_phh/platform_frameworks_opt_telephony/0002-Telephony-Don-not-call-onUssdRelease-for-Huawei-RIL.patch
View File

@@ -1,7 +1,7 @@
From fcfb842f7f35b38c07062f40a344412323317c2e Mon Sep 17 00:00:00 2001
From af27c3b5cb4829735c3304925f850144a12a85d1 Mon Sep 17 00:00:00 2001
From: Artem Borisov <dedsa2002@gmail.com>
Date: Sat, 10 Nov 2018 17:19:17 +0000
Subject: [PATCH 2/4] Telephony: Don not call onUssdRelease for Huawei RIL
Subject: [PATCH 2/5] Telephony: Don not call onUssdRelease for Huawei RIL
Huawei RIL doesn't seem to work properly with USSD_MODE_NW_RELEASE,
always releasing USSD when it should be finished instead.

4
patches_treble_phh/platform_frameworks_opt_telephony/0003-Fix-baseband-being-too-long-to-fit-into-a-91-chars-p.patch
View File

@@ -1,7 +1,7 @@
From 467090b06364a3c7874406eac519ef92c425bc82 Mon Sep 17 00:00:00 2001
From dd6a3ecb9423ab7aec4a007946eacf69f134f0cd Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 6 Dec 2021 16:28:22 -0500
Subject: [PATCH 3/4] Fix baseband being too long to fit into a 91 chars
Subject: [PATCH 3/5] Fix baseband being too long to fit into a 91 chars
property, preventing telephony subsystem from starting
Change-Id: I1762e4a8cc137626be89f350229d6be162bdaf57

4
patches_treble_phh/platform_frameworks_opt_telephony/0004-Reintroduce-public-void-TelephonyMetrics.writeRilSen.patch
View File

@@ -1,7 +1,7 @@
From fdf6b444ee616a00e8f2c96817fc94913015ab7d Mon Sep 17 00:00:00 2001
From 346ae5f3e226cb46c7e281d327785e2a600ea6f8 Mon Sep 17 00:00:00 2001
From: ironydelerium <42721860+ironydelerium@users.noreply.github.com>
Date: Fri, 31 Dec 2021 02:20:28 -0800
Subject: [PATCH 4/4] Reintroduce 'public void
Subject: [PATCH 4/5] Reintroduce 'public void
TelephonyMetrics.writeRilSendSms(int, int, int, int)'. (#8)
The MediaTek IMS package for Android Q, at the very least (likely for the rest, too)

184
patches_treble_phh/platform_frameworks_opt_telephony/0005-Fix-Huawei-signal-strength-indicator.patch Normal file
View File

@@ -0,0 +1,184 @@
From ceb8d445c0cad907e5685e4ca0388d1202e30e19 Mon Sep 17 00:00:00 2001
From: Ryan Press <ryan@presslab.us>
Date: Tue, 25 Jan 2022 11:29:41 -0800
Subject: [PATCH 5/5] Fix Huawei signal strength indicator
---
.../com/android/internal/telephony/RIL.java | 122 ++++++++++++++++++
.../internal/telephony/RadioIndication.java | 23 +++-
2 files changed, 141 insertions(+), 4 deletions(-)
diff --git a/src/java/com/android/internal/telephony/RIL.java b/src/java/com/android/internal/telephony/RIL.java
index af28bd8f9a..558a55e1b3 100644
--- a/src/java/com/android/internal/telephony/RIL.java
+++ b/src/java/com/android/internal/telephony/RIL.java
@@ -7478,6 +7478,128 @@ public class RIL extends BaseCommands implements CommandsInterface {
new CellSignalStrengthNr());
}
+
+ /**
+ * Fixup for SignalStrength for Huawei device
+ * @param signalStrength the initial signal strength
+ * @return a new SignalStrength
+ */
+ public SignalStrength fixupSignalStrengthHuawei(android.hardware.radio.V1_0.SignalStrength signalStrength) {
+ int gsmSignalStrength = signalStrength.gw.signalStrength;
+ int gsmBitErrorRate = signalStrength.gw.bitErrorRate;
+ int gsmTimingAdvance = signalStrength.gw.timingAdvance;
+ int mWcdmaRscp = 0;
+ int mWcdmaEcio = 0;
+ int cdmaDbm = signalStrength.cdma.dbm;
+ int cdmaEcio = signalStrength.cdma.ecio;
+ int evdoDbm = signalStrength.evdo.dbm;
+ int evdoEcio = signalStrength.evdo.ecio;
+ int evdoSnr = signalStrength.evdo.signalNoiseRatio;
+ int lteSignalStrength = signalStrength.lte.signalStrength;
+ int lteRsrp = signalStrength.lte.rsrp;
+ int lteRsrq = signalStrength.lte.rsrq;
+ int lteRssnr = signalStrength.lte.rssnr;
+ int lteCqi = signalStrength.lte.cqi;
+ int lteTimingAdvance = signalStrength.lte.timingAdvance;
+ int mGsm = 0;
+ int mRat = 0;
+
+
+
+ //Calcul level with Rssnr, Rsrq, Rsrp value - so specify KEY_PARAMETERS_USED_FOR_LTE_SIGNAL_BAR_INT (parameters_used_for_lte_signal_bar_int) to use this 3 values
+ //RSRP = 1 << 0
+ //RSRQ = 1 << 1
+ //RSSNR = 1 << 2
+ //
+ if (lteRsrp != 0) { // LTE
+ // Nothing to DO
+ } else if (gsmSignalStrength == 0 && lteRsrp == 0) { // 3G
+ lteRsrp = (mWcdmaRscp & 0xFF) - 256;
+ lteRsrq = (mWcdmaEcio & 0xFF) - 256;
+ if (lteRsrp > -20) { // None or Unknown
+ lteRssnr = -200;
+ } else if (lteRsrp >= -85) { // Great
+ lteRssnr = 300;
+ } else if (lteRsrp >= -95) { // Good
+ lteRssnr = 129;
+ } else if (lteRsrp >= -105) { // Moderate
+ lteRssnr = 44;
+ } else if (lteRsrp >= -115) { // Poor
+ lteRssnr = 9;
+ } else if (lteRsrp >= -140) { // None or Unknown
+ lteRssnr = -200;
+ }
+ } else if (mWcdmaRscp == 0 && lteRsrp == 0) { // 2G
+ lteRsrp = (gsmSignalStrength & 0xFF) - 256;
+ if (lteRsrp > -20) { // None or Unknown
+ lteRsrq = -21;
+ lteRssnr = -200;
+ } else if (lteRsrp >= -85) { // Great
+ lteRsrq = -3;
+ lteRssnr = 300;
+ } else if (lteRsrp >= -95) { // Good
+ lteRsrq = -7;
+ lteRssnr = 129;
+ } else if (lteRsrp >= -105) { // Moderate
+ lteRsrq = -12;
+ lteRssnr = 44;
+ } else if (lteRsrp >= -115) { // Poor
+ lteRsrq = -17;
+ lteRssnr = 9;
+ } else if (lteRsrp >= -140) { // None or Unknown
+ lteRsrq = -21;
+ lteRssnr = -200;
+ }
+ }
+
+
+
+ // 4G - LTE
+ // .lte = {.signalStrength = 99, .rsrp = -104, .rsrq = -16, .rssnr = -4, .cqi = 2147483647, .timingAdvance = -1},
+ // public CellSignalStrengthLte(int rssi, int rsrp, int rsrq, int rssnr, int cqi, int timingAdvance) {
+ CellSignalStrengthLte lteStrength = new CellSignalStrengthLte(SignalStrength.INVALID,
+ lteRsrp,
+ lteRsrq,
+ lteRssnr,
+ lteCqi,
+ lteTimingAdvance);
+
+ // GSM
+ // .gw = {.signalStrength = -91, .bitErrorRate = -1, .timingAdvance = 0}
+ // public CellSignalStrengthGsm(int rssi, int ber, int ta) {
+ // rssi in dBm [-113, -51] or UNAVAILABLE
+ // bit error rate (0-7, 99) TS 27.007 8.5 or UNAVAILABLE
+ CellSignalStrengthGsm gsmStrength = new CellSignalStrengthGsm(gsmSignalStrength,
+ gsmBitErrorRate,
+ gsmTimingAdvance);
+
+ if (RILJ_LOGD) {
+ riljLog("Huawei signal : LTE dbm : " + String.valueOf(lteStrength.getDbm()) +
+ ", level : " + String.valueOf(lteStrength.getLevel()) +
+ ", Rsrp : " + String.valueOf(lteStrength.getRsrp()) +
+ ", Rsrq : " + String.valueOf(lteStrength.getRsrq()) +
+ ", Rssi : " + String.valueOf(lteStrength.getRssi()) +
+ ", Rssnr : " + String.valueOf(lteStrength.getRssnr()));
+ riljLog("Huawei signal : GSM dbm : " + String.valueOf(gsmStrength.getDbm()) +
+ ", errorrate : " + String.valueOf(gsmStrength.getBitErrorRate()) +
+ ", timingadvance : " + String.valueOf(gsmStrength.getTimingAdvance()));
+ }
+
+
+
+ // Perhaps add also gsm signalStrength
+ return new SignalStrength(
+ new CellSignalStrengthCdma(),
+ gsmStrength,
+ new CellSignalStrengthWcdma(),
+ new CellSignalStrengthTdscdma(),
+ lteStrength,
+ new CellSignalStrengthNr());
+
+ }
+
+
+
/**
* Convert CellInfo defined in 1.4/types.hal to CellInfo type.
* @param records List of CellInfo defined in 1.4/types.hal.
diff --git a/src/java/com/android/internal/telephony/RadioIndication.java b/src/java/com/android/internal/telephony/RadioIndication.java
index d18efdcb9c..26c0f51ab8 100644
--- a/src/java/com/android/internal/telephony/RadioIndication.java
+++ b/src/java/com/android/internal/telephony/RadioIndication.java
@@ -243,14 +243,29 @@ public class RadioIndication extends IRadioIndication.Stub {
public void currentSignalStrength(int indicationType,
android.hardware.radio.V1_0.SignalStrength signalStrength) {
+ SignalStrength ss = null;
+
mRil.processIndication(indicationType);
- SignalStrength ssInitial = new SignalStrength(signalStrength);
+ // Note this is set to "verbose" because it happens frequently
+ if (RIL.RILJ_LOGV) mRil.unsljLogvRet(RIL_UNSOL_SIGNAL_STRENGTH, signalStrength);
+
+ // Fix signalStrength for Huawei
+ String hardware = android.os.SystemProperties.get("ro.hardware", "");
+ if(hardware.contains("hi3660") || hardware.contains("hi6250") || hardware.contains("hi3670") || hardware.contains("kirin"))
+ {
+ if (RIL.RILJ_LOGV) mRil.riljLog("currentSignalStrength Found Huawei device");
+ ss = mRil.fixupSignalStrengthHuawei(signalStrength);
+ }
+ else
+ {
+ SignalStrength ssInitial = new SignalStrength(signalStrength);
+ ss = mRil.fixupSignalStrength10(ssInitial);
+ }
- SignalStrength ss = mRil.fixupSignalStrength10(ssInitial);
- // Note this is set to "verbose" because it happens frequently
- if (RIL.RILJ_LOGV) mRil.unsljLogvRet(RIL_UNSOL_SIGNAL_STRENGTH, ss);
+ // Note this is set to "verbose" because it happens frequently
+ if (RIL.RILJ_LOGV) mRil.unsljLogvRet(RIL_UNSOL_SIGNAL_STRENGTH, ss);
if (mRil.mSignalStrengthRegistrant != null) {
mRil.mSignalStrengthRegistrant.notifyRegistrant(new AsyncResult (null, ss, null));
}
--
2.25.1

10
patches_treble_phh/platform_system_core/0001-Stop-overriding-system-properties-from-vendor.patch
View File

@@ -1,7 +1,7 @@
From bec8dc46031766ec06bbdf5364dda19ed1c27e4e Mon Sep 17 00:00:00 2001
From 72db5bb7c714b25b9fd162647eeb5fd6ad3f6a12 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Thu, 7 Oct 2021 15:48:11 -0400
Subject: [PATCH 1/5] Stop overriding system properties from vendor
Subject: [PATCH 1/6] Stop overriding system properties from vendor
This is annoying to disable apexes, or force adb
@@ -11,10 +11,10 @@ Change-Id: Ifd0072c631349b23945df4ab401ba26eca07131f
1 file changed, 1 deletion(-)
diff --git a/init/property_service.cpp b/init/property_service.cpp
index 2d67bf5d7..5974065f5 100644
index 5a8fc5418..bc9a29dea 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -725,7 +725,6 @@ static void LoadProperties(char* data, const char* filter, const char* filename,
@@ -726,7 +726,6 @@ static void LoadProperties(char* data, const char* filter, const char* filename,
} else if (it->second != value) {
LOG(WARNING) << "Overriding previous property '" << key << "':'" << it->second
<< "' with new value '" << value << "'";
@@ -23,5 +23,5 @@ index 2d67bf5d7..5974065f5 100644
} else {
LOG(ERROR) << "Do not have permissions to set '" << key << "' to '" << value
--
2.29.2
2.25.1

6
patches_treble_phh/platform_system_core/0002-first-stage-If-Vboot2-fails-fall-back-to-Vboot1.patch → patches_treble_phh/platform_system_core/0002-If-Vboot2-fails-fall-back-to-Vboot1.patch
View File

@@ -1,7 +1,7 @@
From 6cb2b52642892379df490dc44ff977e55e9bde02 Mon Sep 17 00:00:00 2001
From dd023d4b5b9e3611b0daf250dec3818cba301d9a Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Thu, 12 Sep 2019 13:05:37 +0200
Subject: [PATCH 2/5] [first stage] If Vboot2 fails, fall-back to Vboot1
Subject: [PATCH 2/6] If Vboot2 fails, fall-back to Vboot1
Some devices, for instance Honor View 10, running Pie vendor declares
vbmeta in their device-tree, but doesn't have a vbmeta partition.
@@ -42,5 +42,5 @@ index f5c10bbd4..9562af35d 100644
void SetInitAvbVersionInRecovery() {
--
2.29.2
2.25.1

6
patches_treble_phh/platform_system_core/0003-Don-t-abandon-creating-property-tree-if-there-is-a-c.patch
View File

@@ -1,7 +1,7 @@
From 9df676e24531b46250ac239879baa51163305823 Mon Sep 17 00:00:00 2001
From 22a748594817b296b363f64cdb8db13987ea1cc6 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 18 Oct 2020 18:14:47 +0200
Subject: [PATCH 3/5] Don't abandon creating property tree if there is a
Subject: [PATCH 3/6] Don't abandon creating property tree if there is a
conflict, and hope for the best
Change-Id: I194c815fdd58bfb84aaf7db02b8f0d00b4db21e8
@@ -31,5 +31,5 @@ index 803657ab8..ecdd0be20 100644
}
--
2.29.2
2.25.1

6
patches_treble_phh/platform_system_core/0004-Detect-allowed-sdcard-options-based-on-vndk.patch
View File

@@ -1,7 +1,7 @@
From 86431a4936479bf7f80b982a12d64732f494b14f Mon Sep 17 00:00:00 2001
From 4776b1f3bd94b8a035fc0608e71844b97dac6390 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 14 Aug 2018 19:33:03 +0200
Subject: [PATCH 4/5] Detect allowed sdcard options based on vndk
Subject: [PATCH 4/6] Detect allowed sdcard options based on vndk
Some kernel crashes when using too recent sdcardfs options
@@ -39,5 +39,5 @@ index 622de5b7a..e580190e9 100644
// handle older kernels that aren't updated yet.
for (int i = 0; i <= new_opts_list.size(); ++i) {
--
2.29.2
2.25.1

6
patches_treble_phh/platform_system_core/0005-Ugly-but-secure-Set-dev-uinput-as-0666-to-fix-finger.patch
View File

@@ -1,7 +1,7 @@
From 8807d3ac8c9fe662a6d5610b421bb54d0e05603e Mon Sep 17 00:00:00 2001
From 05cada88a45c9260f7085f6c953341ac1f92adbb Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Fri, 1 Nov 2019 18:22:13 +0100
Subject: [PATCH 5/5] Ugly but secure: Set /dev/uinput as 0666 to fix
Subject: [PATCH 5/6] Ugly but secure: Set /dev/uinput as 0666 to fix
fingerprint sensor on some devices
cf https://github.com/phhusson/device_phh_treble/pull/122/commits/e000d69c286b6686777ea6f1867f379e30273e48
@@ -28,5 +28,5 @@ index 56e774bdc..67230e051 100644
/dev/tty0 0660 root system
/dev/graphics/* 0660 root graphics
--
2.29.2
2.25.1

136
patches_treble_phh/platform_system_core/0006-Add-my-own-OTA-mechanism-going-over-data.patch Normal file
View File

@@ -0,0 +1,136 @@
From 40be0112b1316800a3e496caed7bb73bfb3d801f Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sat, 22 Jan 2022 14:34:45 -0500
Subject: [PATCH 6/6] Add my own OTA mechanism going over /data
Change-Id: I9cacff2d761affa0376b4bb8ca63353a9d95b5de
---
fs_mgr/libfiemap/image_manager.cpp | 2 +-
init/selinux.cpp | 64 ++++++++++++++++++++++++++++++
2 files changed, 65 insertions(+), 1 deletion(-)
diff --git a/fs_mgr/libfiemap/image_manager.cpp b/fs_mgr/libfiemap/image_manager.cpp
index dcbbc5448..ea2f4254d 100644
--- a/fs_mgr/libfiemap/image_manager.cpp
+++ b/fs_mgr/libfiemap/image_manager.cpp
@@ -156,7 +156,7 @@ bool ImageManager::MetadataDirIsTest() const {
}
bool ImageManager::IsUnreliablePinningAllowed() const {
- return IsSubdir(data_dir_, "/data/gsi/dsu/") || MetadataDirIsTest();
+ return IsSubdir(data_dir_, "/data/gsi/dsu/") || MetadataDirIsTest() || IsSubdir(data_dir_, "/data/gsi/phh/");
}
FiemapStatus ImageManager::CreateBackingImage(
diff --git a/init/selinux.cpp b/init/selinux.cpp
index 42d302324..068849989 100644
--- a/init/selinux.cpp
+++ b/init/selinux.cpp
@@ -58,6 +58,9 @@
#include <stdlib.h>
#include <sys/wait.h>
#include <unistd.h>
+#include <fcntl.h>
+#include <strings.h>
+#include <sys/sysmacros.h>
#include <android-base/chrono_utils.h>
#include <android-base/file.h>
@@ -71,12 +74,16 @@
#include <libgsi/libgsi.h>
#include <libsnapshot/snapshot.h>
#include <selinux/android.h>
+#include <sys/mount.h>
+#include <libfiemap/image_manager.h>
+#include <liblp/partition_opener.h>
#include "block_dev_initializer.h"
#include "debug_ramdisk.h"
#include "reboot_utils.h"
#include "snapuserd_transition.h"
#include "util.h"
+#include "switch_root.h"
using namespace std::string_literals;
@@ -85,6 +92,7 @@ using android::base::Timer;
using android::base::unique_fd;
using android::fs_mgr::AvbHandle;
using android::snapshot::SnapshotManager;
+using android::fiemap::IImageManager;
namespace android {
namespace init {
@@ -696,6 +704,60 @@ static void LoadSelinuxPolicy(std::string& policy) {
}
}
+static void setupPhhOta() {
+ setenv("PHH_STEP2", (char*)"1", 1);
+ if(getenv("PHH_OTA")) return;
+ setenv("PHH_STEP3", (char*)"1", 1);
+
+ std::string phh_ota;
+ if(!base::ReadFileToString("/metadata/phh/img", &phh_ota)) return;
+ const char *slot = "a";
+ if(phh_ota.c_str()[0] == 'b')
+ slot = "b";
+ setenv("PHH_OTA_SLOT", (char*)slot, 1);
+ setenv("PHH_STEP4", (char*)"1", 1);
+
+ std::string imageNameStr = "system_otaphh_"s + slot;
+
+ BlockDevInitializer block_dev_init;
+ block_dev_init.InitDeviceMapper();
+ block_dev_init.InitDevices({"userdata"});
+
+ auto images = IImageManager::Open("phh", 0ms);
+ std::string blockDev;
+ android::fs_mgr::PartitionOpener opener;
+ if(!images->MapImageWithDeviceMapper(opener, imageNameStr, &blockDev)) return;
+
+ // For some reason, I can't get block_dev_init to find system_otaphh_X, so construct it ourselves
+ int major = atoi(blockDev.c_str());
+ const char *minorStr = strstr(blockDev.c_str(), ":")+1;
+ int minor = atoi(minorStr);
+ int eee = mknod("/dev/root-otaphh", 0644 | S_IFBLK, makedev(major, minor));
+
+ base::WriteStringToFile("phh mknod returned " + std::to_string(eee) + " of " + std::to_string(major) + " " + std::to_string(minor), "/dev/kmsg");
+ setenv("PHH_STEP5", (char*)"1", 1);
+
+ umount2("/debug_ramdisk", 0);
+ umount2("/debug_ramdisk", MNT_DETACH);
+ int mountRes = mount("/dev/root-otaphh", "/debug_ramdisk", "ext4", MS_RDONLY, "");
+ putenv((char*)"PHH_OTA=1");
+ base::WriteStringToFile("phh_ota setup " + blockDev, "/dev/kmsg");
+ base::WriteStringToFile("phh mount returned " + std::to_string(mountRes), "/dev/kmsg");
+ base::WriteStringToFile("errno is " + std::to_string(errno), "/dev/kmsg");
+
+ if(mountRes != 0) return;
+
+ SwitchRoot("/debug_ramdisk");
+
+ const char* path = "/system/bin/init";
+ const char* args[] = {path, "selinux_setup", nullptr};
+ auto fd = open("/dev/kmsg", O_WRONLY | O_CLOEXEC);
+ dup2(fd, STDOUT_FILENO);
+ dup2(fd, STDERR_FILENO);
+ close(fd);
+ execv(path, const_cast<char**>(args));
+}
+
// The SELinux setup process is carefully orchestrated around snapuserd. Policy
// must be loaded off dynamic partitions, and during an OTA, those partitions
// cannot be read without snapuserd. But, with kernel-privileged snapuserd
@@ -718,6 +780,8 @@ int SetupSelinux(char** argv) {
if (REBOOT_BOOTLOADER_ON_PANIC) {
InstallRebootSignalHandlers();
}
+ setenv("PHH_STEP1", (char*)"1", 1);
+ setupPhhOta();
boot_clock::time_point start_time = boot_clock::now();
--
2.25.1