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

Changes for January 2023

Browse Source
This commit is contained in:
Andy CrossGate Yan 2023-01-12 13:33:25 +00:00
parent a64922781e
commit ecd9df23d3
53 changed files with 115769 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patches_treble/device_phh_treble/0001-treble-Lineage-ify.patch
View File

@ -1,4 +1,4 @@
From cf205c8dc59895cef8b511fd521807c458b572d9 Mon Sep 17 00:00:00 2001
From 87116e2dbe93e5587da65788ff4ebd1bf1d644a7 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/8] treble: Lineage-ify

2
patches_treble/device_phh_treble/0002-treble-Set-BOARD_EXT4_SHARE_DUP_BLOCKS-explicitly.patch
View File

@ -1,4 +1,4 @@
From a5a079d6bbd31b7097919022aed36266d72087a6 Mon Sep 17 00:00:00 2001
From 5b7c8a7ecfd6ccfa4d0652020eed3aa8ff234f59 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/8] treble: Set BOARD_EXT4_SHARE_DUP_BLOCKS explicitly

2
patches_treble/device_phh_treble/0003-treble-Set-TARGET_NO_KERNEL_OVERRIDE.patch
View File

@ -1,4 +1,4 @@
From d7754c89b3ce468e52b3f08d1fa1d84fcfab0256 Mon Sep 17 00:00:00 2001
From 878186aa88a5dc234fd90005d454b419384fd5df 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/8] treble: Set TARGET_NO_KERNEL_OVERRIDE

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

@ -1,4 +1,4 @@
From 60aff0ef335bb79dda6d36b6e00a3c1673563f0e Mon Sep 17 00:00:00 2001
From c387e045607b7353bff4d887548b11232d6074bc 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/8] treble: Set OTA JSON URL

2
patches_treble/device_phh_treble/0005-treble-Enable-call-recording.patch
View File

@ -1,4 +1,4 @@
From e938558882351e2bcbf2e7781efe377a912ce9fe Mon Sep 17 00:00:00 2001
From 0efbc3a793daf2e5c5caaf38958561de0c4dc276 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/8] treble: Enable call recording

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

@ -1,43 +0,0 @@
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

6
patches_treble/device_phh_treble/0007-treble-Stop-securing-ADB.patch → patches_treble/device_phh_treble/0006-treble-Stop-securing-ADB.patch
View File

@ -1,7 +1,7 @@
From 89c2303f3043e93fb6c1aaee0e346cef6e65b404 Mon Sep 17 00:00:00 2001
From 25a86e882e057f248966784b0348db5eb82935eb 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
Subject: [PATCH 6/8] treble: Stop securing ADB
Seems to kill USB Debugging altogether on certain devices,
and unrelated to SN anyway
@ -13,7 +13,7 @@ Change-Id: I0215b3ed970dd53a124f48e30ca2cf4b0c6d2899
1 file changed, 4 deletions(-)
diff --git a/rw-system.sh b/rw-system.sh
index 607c4e6..6da3e80 100644
index 5f324b3..33b3591 100644
--- a/rw-system.sh
+++ b/rw-system.sh
@@ -764,14 +764,10 @@ if [ -f /system/phh/secure ] || [ -f /metadata/phh/secure ];then

48
patches_treble/device_phh_treble/0007-treble-Securize-on-demand.patch Normal file
View File

@ -0,0 +1,48 @@
From a434b3926218c07dcd6e763a827adeaea5332c66 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Thu, 29 Dec 2022 15:12:03 +0000
Subject: [PATCH 7/8] treble: Securize on-demand
Status is stored in /metadata and controlled by persist prop
Change-Id: I8069b6f471ad87ab34c18b743689ab3584cee35b
---
phh-prop-handler.sh | 14 ++++++++++++++
vndk.rc | 2 ++
2 files changed, 16 insertions(+)
diff --git a/phh-prop-handler.sh b/phh-prop-handler.sh
index 4371632..a8cea3f 100644
--- a/phh-prop-handler.sh
+++ b/phh-prop-handler.sh
@@ -210,3 +210,17 @@ if [ "$1" == "persist.sys.phh.disable_soundvolume_effect" ];then
restartAudio
exit
fi
+
+if [ "$1" == "persist.sys.phh.securize" ];then
+ if [[ "$prop_value" != "true" && "$prop_value" != "false" ]]; then
+ exit 1
+ fi
+
+ if [[ "$prop_value" == "true" ]]; then
+ mkdir /metadata/phh
+ touch /metadata/phh/secure
+ else
+ rm /metadata/phh/secure
+ fi
+ exit
+fi
diff --git a/vndk.rc b/vndk.rc
index c150ace..74402a8 100644
--- a/vndk.rc
+++ b/vndk.rc
@@ -83,3 +83,5 @@ on property:sys.phh.uninstall-ota=true
on property:ro.vendor.radio.default_network=*
setprop ro.telephony.default_network ${ro.vendor.radio.default_network}
+on property:persist.sys.phh.securize=*
+ exec u:r:phhsu_daemon:s0 root -- /system/bin/phh-prop-handler.sh "persist.sys.phh.securize"
--
2.25.1

2
patches_treble/device_phh_treble/0008-add-offline-charger-sepolicy.patch
View File

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

115463
patches_treble/vendor_hardware_overlay/0001-TEMP-Up-TrebleApp-to-20221229.patch Normal file
View File

File diff suppressed because it is too large Load Diff

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

@ -1,7 +1,7 @@
From fadd335a853b7cec72fe2e1dd83b8b07e84c9cbb Mon Sep 17 00:00:00 2001
From 3ef127e42298fa7ea378186cde99459424dba137 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/34] Fallback to stupid autobrightness if brightness values
Subject: [PATCH 01/35] Fallback to stupid autobrightness if brightness values
are broken
This is needed because of:

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

@ -1,7 +1,7 @@
From 0fb476c9b3e516fce135d6998f374c0245f07e43 Mon Sep 17 00:00:00 2001
From 89b38938e3470b765f036d17c2f6c11c95fdcd22 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/34] Relax requirement for visible flag to sdcards
Subject: [PATCH 02/35] Relax requirement for visible flag to sdcards
The vast majority of sdcard readers are stable enough to be declared by
the API. (I see no counter-example)

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

@ -1,7 +1,7 @@
From 49a5de896b2b0b7ec561d38016f545ff69798e4d Mon Sep 17 00:00:00 2001
From 698fa45b258f1770e51091f619237a56a558dba7 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/34] Don't crash if there is IR HAL is not declared
Subject: [PATCH 03/35] Don't crash if there is IR HAL is not declared
Change-Id: I3afded27441bbee8244d5fda544b3e6d1238dc1b
---

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

@ -1,7 +1,7 @@
From 8b6d78167e4ac1b7a08a890b9e29032218857209 Mon Sep 17 00:00:00 2001
From 0741a644a5d038b31f3f6df1a9ad03228de620c2 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/34] Show APN Settings for CDMA carriers
Subject: [PATCH 04/35] Show APN Settings for CDMA carriers
---
telephony/java/android/telephony/CarrierConfigManager.java | 2 +-

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

@ -1,7 +1,7 @@
From a916b75327843895cfc6dc4e10ef9c7f7e4e98ab Mon Sep 17 00:00:00 2001
From 298e26f824578dc6949cf6e844295821c324f432 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/34] Re-order services so that it works even without qtaguid
Subject: [PATCH 05/35] Re-order services so that it works even without qtaguid
Change-Id: I0c0f527b3ae151d45c68f7ac6c205da3f34e74df
---
@ -9,10 +9,10 @@ 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 0a85854b2af8..2b3b9b1572d7 100644
index 7d70b6d73497..3faace448bb5 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 {
@@ -883,6 +883,10 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
Trace.traceBegin(Trace.TRACE_TAG_NETWORK, "systemReady");
final int oldPriority = Process.getThreadPriority(Process.myTid());
try {
@ -23,7 +23,7 @@ index 0a85854b2af8..2b3b9b1572d7 100644
// Boost thread's priority during system server init
Process.setThreadPriority(Process.THREAD_PRIORITY_FOREGROUND);
if (!isBandwidthControlEnabled()) {
@@ -885,10 +889,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
@@ -890,10 +894,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
return;
}

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

@ -1,7 +1,7 @@
From d9fa9b2d639b6f6889508731b3e3b51d4c45e784 Mon Sep 17 00:00:00 2001
From 34a2141186d697e13c7085b4b194dfa23d959549 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/34] Support samsung Pie and Q light hal
Subject: [PATCH 06/35] Support samsung Pie and Q light hal
Change-Id: I01f94acd7d0672733e48854d80368f9ac6f861c6
---

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

@ -1,7 +1,7 @@
From d1e005577a3123702758f646328f11515d1d5d62 Mon Sep 17 00:00:00 2001
From e6b2a294c9a2fa8c688c9a99a889d205ae68a4ee 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/34] Add support for samsung touch, physical and hover
Subject: [PATCH 07/35] Add support for samsung touch, physical and hover
proximity sensor as fallback to real proximity sensor
Change-Id: I7a0f8b4665c802140d19197d850b77b2a7ac1865
@ -10,10 +10,10 @@ Change-Id: I7a0f8b4665c802140d19197d850b77b2a7ac1865
1 file changed, 35 insertions(+)
diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
index 6ba1ed4dabf8..4909681eed48 100644
index d590ae8fa6d0..2bdad4cf61e2 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -1756,6 +1756,27 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
@@ -1741,6 +1741,27 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
? Sensor.TYPE_PROXIMITY : SensorUtils.NO_FALLBACK;
mProximitySensor = SensorUtils.findSensor(mSensorManager, proxSensor.type, proxSensor.name,
fallbackType);
@ -41,7 +41,7 @@ index 6ba1ed4dabf8..4909681eed48 100644
if (mProximitySensor != null) {
mProximityThreshold = Math.min(mProximitySensor.getMaximumRange(),
TYPICAL_PROXIMITY_THRESHOLD);
@@ -2528,6 +2549,20 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
@@ -2505,6 +2526,20 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
public void onSensorChanged(SensorEvent event) {
if (mProximitySensorEnabled) {
final long time = SystemClock.uptimeMillis();

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

@ -1,7 +1,7 @@
From 92067e16f7aa9c8790b25e44707c72795876ce75 Mon Sep 17 00:00:00 2001
From 725e5dc4ce032c2541005b3a8db0124649ee7a72 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/34] Always allow overriding the number of work profiles
Subject: [PATCH 08/35] Always allow overriding the number of work profiles
Change-Id: I6eb09aa71663c6fbe7563e3038bffcabdba0ff6a
---
@ -9,10 +9,10 @@ Change-Id: I6eb09aa71663c6fbe7563e3038bffcabdba0ff6a
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index f4680a0db37f..ffffbb5fa2a5 100644
index dbc4c22f6609..f32c6e014fe1 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -5867,12 +5867,8 @@ public class UserManagerService extends IUserManager.Stub {
@@ -5908,12 +5908,8 @@ public class UserManagerService extends IUserManager.Stub {
*/
private static int getMaxUsersOfTypePerParent(UserTypeDetails userTypeDetails) {
final int defaultMax = userTypeDetails.getMaxAllowedPerParent();

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

@ -1,7 +1,7 @@
From 9411e55c6c41fbc88fb3c522c0fb0f5dc3e95efd Mon Sep 17 00:00:00 2001
From 52e0d6e8b64f763e778ae2ba586530ec07ee183f 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/34] HOME deserves to wake-up devices just as well as back
Subject: [PATCH 09/35] HOME deserves to wake-up devices just as well as back
and menu
Change-Id: Ia562bafd8c620d00c17e8eb338e4701c6c4a3c3a

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

@ -1,7 +1,7 @@
From fbd6159d4d925b6b9b8e79119711a5e79cf75a37 Mon Sep 17 00:00:00 2001
From f75c51d6ad79690ea7670821a0bcb78ff419b2d0 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/34] Some devices have proximity sensor reporting NaN as max
Subject: [PATCH 10/35] Some devices have proximity sensor reporting NaN as max
range for some reason. Make them behave standard way by setting 5 cm
Change-Id: I3c39e3e914a05903c140235702e0480d2d58a612
@ -10,10 +10,10 @@ Change-Id: I3c39e3e914a05903c140235702e0480d2d58a612
1 file changed, 3 insertions(+)
diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
index 4909681eed48..4599e57d1cb5 100644
index 2bdad4cf61e2..c418e446d48a 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -1780,6 +1780,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
@@ -1765,6 +1765,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
if (mProximitySensor != null) {
mProximityThreshold = Math.min(mProximitySensor.getMaximumRange(),
TYPICAL_PROXIMITY_THRESHOLD);

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

@ -1,7 +1,7 @@
From 3ba41883c6bab58cba50c785317a4b54930267d0 Mon Sep 17 00:00:00 2001
From eb2b5a69e99c21138e3d666c0dc21d7f0babe19a 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/34] Fix brightness range not being complete on Samsung
Subject: [PATCH 11/35] Fix brightness range not being complete on Samsung
devices
On some devices, minimum brightness is 0, which totally messes with

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

@ -1,7 +1,7 @@
From 7dc979fa49b584abb5ad96f1d7496e0d47b48d19 Mon Sep 17 00:00:00 2001
From c155f5412d40bffe53e4efb3bf37d6489b053ee7 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/34] Re-implement fnmatch-like behaviour for RRO java-side
Subject: [PATCH 12/35] Re-implement fnmatch-like behaviour for RRO java-side
Change-Id: Id38292a9a1453aa87b8401c1fdb390fa4e63c7d1
---

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

@ -1,7 +1,7 @@
From 218534d5b15dcaed3f77ac95d3cea895b6bac9ba Mon Sep 17 00:00:00 2001
From c67644842d8ad141ebe666ae42333f8ec211768a 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/34] Make rounded corners padding overridable with
Subject: [PATCH 13/35] Make rounded corners padding overridable with
persist.sys.phh.rounded_corners_padding
Change-Id: I481c1c8849b2f22a7cdfb2896a6d3c2e7e3b44d9
@ -12,7 +12,7 @@ Change-Id: I481c1c8849b2f22a7cdfb2896a6d3c2e7e3b44d9
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
index d744df2a18c0..edeeb1448088 100644
index a2d7d9e7c263..272474516590 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
@@ -23,6 +23,7 @@ import android.content.res.Configuration;
@ -23,7 +23,7 @@ index d744df2a18c0..edeeb1448088 100644
import android.os.UserHandle;
import android.provider.AlarmClock;
import android.util.AttributeSet;
@@ -271,8 +272,10 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu
@@ -268,8 +269,10 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu
mConfigShowBatteryEstimate = resources.getBoolean(R.bool.config_showBatteryEstimateQSBH);

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

@ -1,7 +1,7 @@
From 18078f99759f01514db703cd9f855979a94f57b3 Mon Sep 17 00:00:00 2001
From 39fad63d453806ab6eac68d4c79a2e9c50c07302 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/34] Remove useless notification about "console" service
Subject: [PATCH 14/35] Remove useless notification about "console" service
being running
---

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

@ -1,7 +1,7 @@
From 8b662832a172ad596fd5d66b7f6ceb682a378bd2 Mon Sep 17 00:00:00 2001
From 08ae2303cb18e3ecfab91c3e28689df1660cda83 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/34] Revert "Remove unused SystemProperties.set"
Subject: [PATCH 15/35] Revert "Remove unused SystemProperties.set"
This reverts commit debb4616ef67f9ed5054eca51ec58592358ff55f.

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

@ -1,7 +1,7 @@
From ba28408efd4c65ad2c53be68cdd36e90678ea6e8 Mon Sep 17 00:00:00 2001
From 2a94ed85920e4fa4e45b67e6aa7d69b15172aa2a 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/34] TelephonyManager: bring back getNetworkClass()
Subject: [PATCH 16/35] TelephonyManager: bring back getNetworkClass()
This partially reverts commit c058cac051ab083dc7fb7ea6aa85699110b2e9bf.

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

@ -1,7 +1,7 @@
From 5061480e837991d9b4802b97558c8c671d450190 Mon Sep 17 00:00:00 2001
From a85ce10c8a23579c5c2cb85891b84079109dcda2 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/34] TelephonyManager: add API annotations for
Subject: [PATCH 17/35] TelephonyManager: add API annotations for
setTelephonyProperty
* This method was added back by reverting commit

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

@ -1,7 +1,7 @@
From 35e8250f5f205d1b41be82b2883be6dc867cb9e0 Mon Sep 17 00:00:00 2001
From b0cd7883fd66c27496d2ea3386f6060620cd572d 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/34] Fix Wakelock issue
Subject: [PATCH 18/35] Fix Wakelock issue
Prevent SystemUI crash due to "WakeLock under-locked Doze" (issue #12) by only releasing a wakelock that was not already released
---

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

@ -1,7 +1,7 @@
From 55131f080770fc91e72a06958fc855390d8521e5 Mon Sep 17 00:00:00 2001
From 889cea5c57d6c4e3900c22082f57af5a30798024 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 19/34] Automatically detect pick up sensor, so that an overlay
Subject: [PATCH 19/35] Automatically detect pick up sensor, so that an overlay
is required for the sole purpose of enabling pulse doze on pick up sensor
---

4
patches_treble_phh/platform_frameworks_base/0020-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch
View File

@ -1,7 +1,7 @@
From dbadb14a0ad20b8621282e52bb8d50fdbe042a18 Mon Sep 17 00:00:00 2001
From 8edbad3ddd427e421d4b13f8b84566bfe58d3150 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 20/34] Catch broken mainBuiltInDisplayCutoutRectApproximation
Subject: [PATCH 20/35] Catch broken mainBuiltInDisplayCutoutRectApproximation
Some devices (Redmi Note 9T) have:
mainBuiltInDisplayCutoutRectApproximation = @android:mainBuiltInDisplayCutout

4
patches_treble_phh/platform_frameworks_base/0021-backlight-Fix-backlight-control-on-Galaxy-S9.patch
View File

@ -1,7 +1,7 @@
From c7ab959714fd2607162dd58e377844219926f634 Mon Sep 17 00:00:00 2001
From 8abd1e72a2cf0ea9a10e2f28136f795b1aeec5d7 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 21/34] backlight: Fix backlight control on Galaxy S9(+)
Subject: [PATCH 21/35] backlight: Fix backlight control on Galaxy S9(+)
Change-Id: I1fbbb47939c377597ef8ad6b88b2acea5f4acaa6

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

@ -1,7 +1,7 @@
From dcc433afc16a9835ee89ba062d3bf8ae58ff6ebb Mon Sep 17 00:00:00 2001
From 41187ad1cdd62e7829a11a51241438025398c04b Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev>
Date: Sat, 16 Oct 2021 05:27:57 -0700
Subject: [PATCH 22/34] Add support for app signature spoofing
Subject: [PATCH 22/35] Add support for app signature spoofing
This is needed by microG GmsCore to pretend to be the official Google
Play Services package, because client apps check the package signature
@ -105,7 +105,7 @@ index 166d6abd1809..cba87ff17600 100644
<string name="permlab_statusBar">disable or modify status bar</string>
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index d579f816f821..280f58c4d571 100644
index fbe436007cd8..ccbbd72a08f5 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -3330,6 +3330,29 @@ public class PackageManagerService extends IPackageManager.Stub

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

@ -1,7 +1,7 @@
From 6fbe03725202e93eaf03e33b9173440ac9e874ec Mon Sep 17 00:00:00 2001
From c2817ecca6b800fe6bd0207f934599ec6e9ccbb6 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 23/34] Revert "Switch long-press power behavior in AOSP."
Subject: [PATCH 23/35] Revert "Switch long-press power behavior in AOSP."
This reverts commit 803c77a0a24624111944832098c6f65158051dc4.
---

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

@ -1,7 +1,7 @@
From 8785afb3787e9a4ff319d971eae22c9f34bd0d69 Mon Sep 17 00:00:00 2001
From 5c190b0bcc4e71a0aa1d1dc3687a308809eec331 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 24/34] Reduce the size of udfps enroll progress bar. Some
Subject: [PATCH 24/35] Reduce the size of udfps enroll progress bar. Some
devices have their udfps pretty low, and the progress bar would make the icon
at the wrong place

4
patches_treble_phh/platform_frameworks_base/0025-Add-UDFPS-support-for-various-devices.patch
View File

@ -1,7 +1,7 @@
From 250bbf1691c1fcf2ef2c469d41dc42d535e28787 Mon Sep 17 00:00:00 2001
From 43a98edc778a0dccb4b598de90e1b83340b331f6 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 25/34] Add UDFPS support for various devices
Subject: [PATCH 25/35] Add UDFPS support for various devices
Successfully tested on Galaxy A51, Xiaomi Mi 9, and OnePlus Nord 2

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

@ -1,7 +1,7 @@
From 986169aff899220d77732909b92e64689d58345d Mon Sep 17 00:00:00 2001
From 3d76474ed616173bc0ce7b0276f16475f899e870 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 26/34] Dynamically resize boot animation to match screen size
Subject: [PATCH 26/35] Dynamically resize boot animation to match screen size
Change-Id: I54e49fc6b8c670103852e212d1416e27ff976205
---

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

@ -1,7 +1,7 @@
From 51bb678ad3c4cacc269175fd29f268128a64922a Mon Sep 17 00:00:00 2001
From cce35950a87dcc320a6a31d46f5abf98af6357f8 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 27/34] Once we integrate Samsung Power hal in libpowermanager,
Subject: [PATCH 27/35] Once we integrate Samsung Power hal in libpowermanager,
libpowermanager and its deps require linking against
vendor.samsung.hardware.miscpower@2.0

4
patches_treble_phh/platform_frameworks_base/0028-Add-persist.sys.phh.ultrasonic_udfps-property-to-dis.patch
View File

@ -1,7 +1,7 @@
From 8f0212fce8025b4a6aa0c816779106c508f27488 Mon Sep 17 00:00:00 2001
From f5afb1366c7218e27a5e37c73c8987c6650bcc2d Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Thu, 3 Mar 2022 09:15:32 -0500
Subject: [PATCH 28/34] Add persist.sys.phh.ultrasonic_udfps property to
Subject: [PATCH 28/35] Add persist.sys.phh.ultrasonic_udfps property to
disable green circle for udfps
---

4
patches_treble_phh/platform_frameworks_base/0029-Allow-128bits-SHA1-IPSec-keys.-This-is-required-to-i.patch
View File

@ -1,7 +1,7 @@
From 5d1ab82db553a7a752e7c4dade5317a26a4f70d5 Mon Sep 17 00:00:00 2001
From c73d4efd8b693efd50ef38807bad19c3ea548754 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Thu, 3 Mar 2022 09:17:17 -0500
Subject: [PATCH 29/34] Allow 128bits SHA1 IPSec keys. This is required to
Subject: [PATCH 29/35] Allow 128bits SHA1 IPSec keys. This is required to
implement VoLTE with this API
---

4
patches_treble_phh/platform_frameworks_base/0030-Fix-FOD-on-ZF8.patch
View File

@ -1,7 +1,7 @@
From a953023d5a8f824a4ae78edfe31d8afb5134e3a7 Mon Sep 17 00:00:00 2001
From da1da18e246c6a1951e6f65ba2c4083e86296069 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Fri, 4 Mar 2022 19:26:53 -0500
Subject: [PATCH 30/34] Fix FOD on ZF8
Subject: [PATCH 30/35] Fix FOD on ZF8
Goodix HAL expects events in this order:
- Fingerprint down when touchscreen says fp down

4
patches_treble_phh/platform_frameworks_base/0031-Allow-disabling-of-fingerprint-cleanups-needed-on-so.patch
View File

@ -1,7 +1,7 @@
From f2fd2b994ed1de4fdacc37ff0256f6bb4029918f Mon Sep 17 00:00:00 2001
From efe8d80cf3c36772ab711b8721568efb49f8cc23 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sat, 2 Apr 2022 18:04:01 -0400
Subject: [PATCH 31/34] Allow disabling of fingerprint cleanups, needed on some
Subject: [PATCH 31/35] Allow disabling of fingerprint cleanups, needed on some
Realme devices that cant enumerate
---

4
patches_treble_phh/platform_frameworks_base/0032-Switch-FOD-to-WHITE.patch
View File

@ -1,7 +1,7 @@
From 4b3cbe1e153d829ca41928bb61214c7f8d575619 Mon Sep 17 00:00:00 2001
From 539b36f10555416f5500f63ed35371b7f28c136c Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 2 May 2022 18:02:25 -0400
Subject: [PATCH 32/34] Switch FOD to WHITE
Subject: [PATCH 32/35] Switch FOD to WHITE
---
.../src/com/android/systemui/biometrics/UdfpsSurfaceView.java | 2 +-

4
patches_treble_phh/platform_frameworks_base/0033-Support-samsung-ultrasonic-udfps.patch
View File

@ -1,7 +1,7 @@
From 681870c97be670bda84598c2ac438d7b0e8d2582 Mon Sep 17 00:00:00 2001
From 75ed311adebc4339904177875d9e724bc2db3a7a Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 2 May 2022 18:02:40 -0400
Subject: [PATCH 33/34] Support samsung ultrasonic udfps
Subject: [PATCH 33/35] Support samsung ultrasonic udfps
---
.../systemui/biometrics/UdfpsView.java | 4 +++-

4
patches_treble_phh/platform_frameworks_base/0034-Allow-FOD-color-to-be-customized-with-persist.sys.ph.patch
View File

@ -1,7 +1,7 @@
From 488af2f18bc78eb7abb1cbcfae645bd71732f71b Mon Sep 17 00:00:00 2001
From 27935fa95d92df6e7fc627431452696370609e20 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Thu, 9 Jun 2022 14:08:46 -0400
Subject: [PATCH 34/34] Allow FOD color to be customized with
Subject: [PATCH 34/35] Allow FOD color to be customized with
persist.sys.phh.fod_color
---

100
patches_treble_phh/platform_frameworks_base/0035-Call-Samsung-s-ISehSysInputDev-to-report-screen-stat.patch Normal file
View File

@ -0,0 +1,100 @@
From 104e691c4ff897207be632ed281738642459f5a5 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Wed, 14 Dec 2022 17:21:00 -0500
Subject: [PATCH 35/35] Call Samsung's ISehSysInputDev to report screen state
to touchscreen driver
This fixes touchscreen not waking up on Galaxy F23
---
services/core/Android.bp | 1 +
.../server/display/LocalDisplayAdapter.java | 31 +++++++++++++++++++
2 files changed, 32 insertions(+)
diff --git a/services/core/Android.bp b/services/core/Android.bp
index 2f5594b4869d..d2608baec37a 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -167,6 +167,7 @@ java_library_static {
"overlayable_policy_aidl-java",
"SurfaceFlingerProperties",
"com.android.sysprop.watchdog",
+ "vendor.samsung.hardware.sysinput-V1.2-java", // HIDL
],
javac_shard_size: 50,
}
diff --git a/services/core/java/com/android/server/display/LocalDisplayAdapter.java b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
index 5a9efd707f5d..4c11f86d457a 100644
--- a/services/core/java/com/android/server/display/LocalDisplayAdapter.java
+++ b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
@@ -29,6 +29,7 @@ import android.os.SystemProperties;
import android.os.Trace;
import android.util.LongSparseArray;
import android.util.Slog;
+import android.util.Log;
import android.util.SparseArray;
import android.view.Display;
import android.view.DisplayAddress;
@@ -44,6 +45,8 @@ import com.android.server.LocalServices;
import com.android.server.lights.LightsManager;
import com.android.server.lights.LogicalLight;
+import vendor.samsung.hardware.sysinput.V1_1.ISehSysInputDev;
+
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Arrays;
@@ -214,6 +217,8 @@ final class LocalDisplayAdapter extends DisplayAdapter {
private DisplayEventReceiver.FrameRateOverride[] mFrameRateOverrides =
new DisplayEventReceiver.FrameRateOverride[0];
+ private boolean triedSamsungHal = false;
+ private ISehSysInputDev samsungSysinput = null;
LocalDisplayDevice(IBinder displayToken, long physicalDisplayId,
SurfaceControl.StaticDisplayInfo staticDisplayInfo,
@@ -744,16 +749,42 @@ final class LocalDisplayAdapter extends DisplayAdapter {
}
mSidekickActive = false;
}
+ if (!triedSamsungHal) {
+ triedSamsungHal = true;
+ try {
+ samsungSysinput = ISehSysInputDev.getService();
+ } catch(Throwable t) {}
+ }
final int mode = getPowerModeForState(state);
Trace.traceBegin(Trace.TRACE_TAG_POWER, "setDisplayState("
+ "id=" + physicalDisplayId
+ ", state=" + Display.stateToString(state) + ")");
+
+ if (samsungSysinput != null) {
+ try {
+ Log.d("PHH", "setTspEnable 1, " + state + ", true");
+ samsungSysinput.setTspEnable(1, state, true);
+ } catch(Throwable t) {
+ Log.d("PHH", "Failed settings tsp enable", t);
+ }
+ }
+
try {
mSurfaceControlProxy.setDisplayPowerMode(token, mode);
Trace.traceCounter(Trace.TRACE_TAG_POWER, "DisplayPowerMode", mode);
} finally {
Trace.traceEnd(Trace.TRACE_TAG_POWER);
}
+
+ if (samsungSysinput != null) {
+ try {
+ Log.d("PHH", "setTspEnable 1, " + state + ", false");
+ samsungSysinput.setTspEnable(1, state, false);
+ } catch(Throwable t) {
+ Log.d("PHH", "Failed settings tsp enable", t);
+ }
+ }
+
// If we're entering a suspended (but not OFF) power state and we
// have a sidekick available, tell it now that it can take control.
if (Display.isSuspendedState(state) && state != Display.STATE_OFF
--
2.25.1

4
patches_treble_phh/platform_system_vold/0001-Allow-deletion-of-symlink.patch
View File

@ -1,7 +1,7 @@
From c4f1b9d1e0fecc819f41781aab3e5251b0bd0bb1 Mon Sep 17 00:00:00 2001
From 86ce5c90c9ad63295c84bce4c8371585f28639a7 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sat, 17 Feb 2018 19:39:38 +0100
Subject: [PATCH 1/7] Allow deletion of symlink
Subject: [PATCH 1/5] Allow deletion of symlink
Change-Id: I9731895f88729072297f753088583aabbe6990f4
---

4
patches_treble_phh/platform_system_vold/0004-Failing-to-create-facedata-shouldn-t-be-fatal.patch → patches_treble_phh/platform_system_vold/0002-Failing-to-create-facedata-shouldn-t-be-fatal.patch
View File

@ -1,7 +1,7 @@
From 75a4589a6a6bbde9b1273c64dce37ab80d5342a0 Mon Sep 17 00:00:00 2001
From 273ea129c9879f3761dbc1f1775351796795742d Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sat, 7 Mar 2020 14:49:09 +0100
Subject: [PATCH 4/7] Failing to create facedata shouldn't be fatal
Subject: [PATCH 2/5] Failing to create facedata shouldn't be fatal
Some Pie vendors create it on their own, so SELinux would deny that
Also not all devices have face unlock anyway

44
patches_treble_phh/platform_system_vold/0002-Support-Samsung-s-implementation-of-exfat-called-sdf.patch
View File

@ -1,44 +0,0 @@
From cc8870fbad8382da092438af78381fac9bbee251 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 20 Aug 2018 22:37:54 +0200
Subject: [PATCH 2/7] Support Samsung's implementation of exfat, called sdfat
---
fs/Exfat.cpp | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/fs/Exfat.cpp b/fs/Exfat.cpp
index 7782dd3b..91a4c50d 100644
--- a/fs/Exfat.cpp
+++ b/fs/Exfat.cpp
@@ -35,7 +35,7 @@ static const char* kFsckPath = "/system/bin/fsck.exfat";
bool IsSupported() {
return access(kMkfsPath, X_OK) == 0 && access(kFsckPath, X_OK) == 0 &&
- IsFilesystemSupported("exfat");
+ (IsFilesystemSupported("exfat") || IsFilesystemSupported("sdfat"));
}
status_t Check(const std::string& source) {
@@ -61,13 +61,16 @@ status_t Mount(const std::string& source, const std::string& target, int ownerUi
auto mountData = android::base::StringPrintf("uid=%d,gid=%d,fmask=%o,dmask=%o", ownerUid,
ownerGid, permMask, permMask);
- if (mount(source.c_str(), target.c_str(), "exfat", mountFlags, mountData.c_str()) == 0) {
+ const char *fs = "exfat";
+ if(IsFilesystemSupported("sdfat"))
+ fs = "sdfat";
+ if (mount(source.c_str(), target.c_str(), fs, mountFlags, mountData.c_str()) == 0) {
return 0;
}
PLOG(ERROR) << "Mount failed; attempting read-only";
mountFlags |= MS_RDONLY;
- if (mount(source.c_str(), target.c_str(), "exfat", mountFlags, mountData.c_str()) == 0) {
+ if (mount(source.c_str(), target.c_str(), fs, mountFlags, mountData.c_str()) == 0) {
return 0;
}
--
2.25.1

4
patches_treble_phh/platform_system_vold/0007-Don-t-unmount-rw-system.sh-binds.patch → patches_treble_phh/platform_system_vold/0003-Don-t-unmount-rw-system.sh-binds.patch
View File

@ -1,7 +1,7 @@
From aecee9a897b803b4e65fcd21357c76226e8c4e4c Mon Sep 17 00:00:00 2001
From 640654f5ab326cfaa2389933148a6abf13ae2703 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 29 Nov 2021 17:49:13 -0500
Subject: [PATCH 7/7] Don't unmount rw-system.sh binds
Subject: [PATCH 3/5] Don't unmount rw-system.sh binds
Change-Id: If9132c21defa8b09879b79a70794c5275d6852d0
---

38
patches_treble_phh/platform_system_vold/0003-Sony-has-texfat-exfat-fs.patch
View File

@ -1,38 +0,0 @@
From abc668333338ec0ee2c8a4042551eea0a924eccc Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 28 Jan 2020 00:27:17 +0100
Subject: [PATCH 3/7] Sony has `texfat` exfat fs
---
fs/Exfat.cpp | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/fs/Exfat.cpp b/fs/Exfat.cpp
index 91a4c50d..6c49c10c 100644
--- a/fs/Exfat.cpp
+++ b/fs/Exfat.cpp
@@ -35,7 +35,11 @@ static const char* kFsckPath = "/system/bin/fsck.exfat";
bool IsSupported() {
return access(kMkfsPath, X_OK) == 0 && access(kFsckPath, X_OK) == 0 &&
- (IsFilesystemSupported("exfat") || IsFilesystemSupported("sdfat"));
+ (
+ IsFilesystemSupported("exfat") ||
+ IsFilesystemSupported("sdfat") ||
+ IsFilesystemSupported("texfat")
+ );
}
status_t Check(const std::string& source) {
@@ -64,6 +68,8 @@ status_t Mount(const std::string& source, const std::string& target, int ownerUi
const char *fs = "exfat";
if(IsFilesystemSupported("sdfat"))
fs = "sdfat";
+ if(IsFilesystemSupported("texfat"))
+ fs = "texfat";
if (mount(source.c_str(), target.c_str(), fs, mountFlags, mountData.c_str()) == 0) {
return 0;
}
--
2.25.1

60
patches_treble_phh/platform_system_vold/0004-Exfat-can-be-mounted-with-exfat-kernel-fs-driver-or-.patch Normal file
View File

@ -0,0 +1,60 @@
From 144b6510babc101562bb3f9033bb6fecba81fb69 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 18 Oct 2022 16:08:09 -0400
Subject: [PATCH 4/5] Exfat can be mounted with "exfat" kernel fs driver, or
"sdfat" or "texfat" (Samsung and Sony variants)
@AndyCGYan: Adapt to LineageOS vold
Change-Id: I331e66d8cb37664adbd493b9190123e29f01fd9d
---
Utils.cpp | 5 +++++
fs/Exfat.cpp | 11 +++++++++--
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/Utils.cpp b/Utils.cpp
index 65e78871..a22cd67f 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -1007,6 +1007,11 @@ bool IsFilesystemSupported(const std::string& fsType) {
/* fuse filesystems */
supported.append("fuse\tntfs\n");
+ /* treat sdfat/texfat as exfat */
+ if (supported.find("sdfat\n") != std::string::npos || supported.find("texfat\n") != std::string::npos) {
+ supported.append("\texfat\n");
+ }
+
return supported.find(fsType + "\n") != std::string::npos;
}
diff --git a/fs/Exfat.cpp b/fs/Exfat.cpp
index 7782dd3b..f2d5754e 100644
--- a/fs/Exfat.cpp
+++ b/fs/Exfat.cpp
@@ -61,13 +61,20 @@ status_t Mount(const std::string& source, const std::string& target, int ownerUi
auto mountData = android::base::StringPrintf("uid=%d,gid=%d,fmask=%o,dmask=%o", ownerUid,
ownerGid, permMask, permMask);
- if (mount(source.c_str(), target.c_str(), "exfat", mountFlags, mountData.c_str()) == 0) {
+ const char *fs = "exfat";
+ if (IsFilesystemSupported("sdfat")) {
+ fs = "sdfat";
+ } else if (IsFilesystemSupported("texfat")) {
+ fs = "texfat";
+ }
+
+ if (mount(source.c_str(), target.c_str(), fs, mountFlags, mountData.c_str()) == 0) {
return 0;
}
PLOG(ERROR) << "Mount failed; attempting read-only";
mountFlags |= MS_RDONLY;
- if (mount(source.c_str(), target.c_str(), "exfat", mountFlags, mountData.c_str()) == 0) {
+ if (mount(source.c_str(), target.c_str(), fs, mountFlags, mountData.c_str()) == 0) {
return 0;
}
--
2.25.1

4
patches_treble_phh/platform_system_vold/0005-Every-voldmanaged-storage-is-adoptable.patch
View File

@ -1,7 +1,7 @@
From d414bcc51b7527764055b20776cb71ec85580106 Mon Sep 17 00:00:00 2001
From 389facf897f8c8c493c340cb2b4bf532abed23d7 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Wed, 11 Mar 2020 14:02:35 +0100
Subject: [PATCH 5/7] Every voldmanaged storage is adoptable
Subject: [PATCH 5/5] Every voldmanaged storage is adoptable
---
main.cpp | 2 +-

27
patches_treble_phh/platform_system_vold/0006-Log-support-for-exfat-texfat-FS-driver-names.patch
View File

@ -1,27 +0,0 @@
From 968689281ef36e9de7743419137eba72c3472803 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Wed, 24 Nov 2021 15:50:30 -0500
Subject: [PATCH 6/7] Log support for exfat/texfat FS driver names
Change-Id: I5ae38741374b25b84595a9eae9bdda7afe2cac05
---
main.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/main.cpp b/main.cpp
index 3af0dcf3..05b2db62 100644
--- a/main.cpp
+++ b/main.cpp
@@ -71,7 +71,8 @@ int main(int argc, char** argv) {
<< (android::vold::IsFilesystemSupported("ext4") ? " ext4" : "")
<< (android::vold::IsFilesystemSupported("f2fs") ? " f2fs" : "")
<< (android::vold::IsFilesystemSupported("ntfs") ? " ntfs" : "")
- << (android::vold::IsFilesystemSupported("vfat") ? " vfat" : "");
+ << (android::vold::IsFilesystemSupported("vfat") ? " vfat" : "")
+ << (android::vold::IsFilesystemSupported("texfat") ? " texfat" : "");
VolumeManager* vm;
NetlinkManager* nm;
--
2.25.1