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

Changes for May 2024, syncing up to 20240508

Browse Source
This commit is contained in:
Andy CrossGate Yan
2024-05-25 20:07:30 +08:00
parent e9902a4450
commit 3963eaa06e
300 changed files with 15353 additions and 40472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From b444ea5ab4942f4877aee7227a8e4408dd12ba98 Mon Sep 17 00:00:00 2001
From e50480813b4a96cb3f3105dc5b1ccb7e5928ac68 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/9] treble: Lineage-ify
@@ -31,7 +31,7 @@ Change-Id: I25eee7a3804f335430a447ae1424402d7e37851b
create mode 100644 overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
diff --git a/base.mk b/base.mk
index 620fb96..d7b71b0 100644
index 22525cd..e40af53 100644
--- a/base.mk
+++ b/base.mk
@@ -18,7 +18,13 @@ PRODUCT_COPY_FILES += \
@@ -57314,7 +57314,7 @@ index 0000000..8df673a
+ <integer name="config_deviceHardwareWakeKeys">127</integer>
+</resources>
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 52f44a2..0561e2b 100644
index b832a66..4e9b176 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -22,7 +22,6 @@

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

@@ -1,4 +1,4 @@
From ae62c13bca7549786b4705d4fb7913ccceb6917e Mon Sep 17 00:00:00 2001
From 50987c84d728f49fc04c78e4a935231caaf6317f 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/9] 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 bb54a87ee1d14bd80308129c1ab38ad042d807a2 Mon Sep 17 00:00:00 2001
From aece8f5deb59a054729539eef6957bd5db325bb5 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/9] treble: Set TARGET_NO_KERNEL_OVERRIDE

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

@@ -1,4 +1,4 @@
From c4cf51f21f0b23e57fd4eb49cce0056f459ebc65 Mon Sep 17 00:00:00 2001
From 29d58c7756130f41aaa10d457cef3806792b5d13 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 4/9] treble: Enable call recording

2
patches_treble/device_phh_treble/0005-treble-Switch-to-MindTheGapps.patch
View File

@@ -1,4 +1,4 @@
From 7295a2f4cd712111205bcbc356e468f2a8ad01fd Mon Sep 17 00:00:00 2001
From 1a5f992428f38427b3d3e25984bc0b425ff6d4f1 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sat, 5 Nov 2022 23:49:11 +0000
Subject: [PATCH 5/9] treble: Switch to MindTheGapps

8
patches_treble/device_phh_treble/0006-treble-Stop-securing-ADB.patch
View File

@@ -1,4 +1,4 @@
From 86cd9fa8131d6a7534b7ee7944e7ac177d032442 Mon Sep 17 00:00:00 2001
From d0c31b8531c239d6c550ed14690496fa9d6b13d2 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 6/9] treble: Stop securing ADB
@@ -13,17 +13,17 @@ Change-Id: I0215b3ed970dd53a124f48e30ca2cf4b0c6d2899
1 file changed, 3 deletions(-)
diff --git a/rw-system.sh b/rw-system.sh
index 358f232..e631b64 100644
index 968b903..4dd61f3 100644
--- a/rw-system.sh
+++ b/rw-system.sh
@@ -793,13 +793,10 @@ if [ -f /system/phh/secure ] || [ -f /metadata/phh/secure ];then
@@ -804,13 +804,10 @@ if [ -f /system/phh/secure ] || [ -f /metadata/phh/secure ];then
resetprop_phh ro.boot.veritymode enforcing
resetprop_phh ro.boot.warranty_bit 0
resetprop_phh ro.warranty_bit 0
- resetprop_phh ro.debuggable 0
resetprop_phh ro.secure 1
resetprop_phh ro.build.type user
resetprop_phh ro.build.selinux 0
resetprop_phh --delete ro.build.selinux
- resetprop_phh ro.adb.secure 1
-

16
patches_treble/device_phh_treble/0007-treble-Securize-on-demand.patch
View File

@@ -1,4 +1,4 @@
From 211c16eca1949b5813b7e4d65eaa0fa8cdeb2b01 Mon Sep 17 00:00:00 2001
From 77488a9ec7f97c5b658cd6224b0ef147ef9752cd 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/9] treble: Securize on-demand
@@ -12,10 +12,10 @@ Change-Id: I8069b6f471ad87ab34c18b743689ab3584cee35b
2 files changed, 17 insertions(+)
diff --git a/phh-prop-handler.sh b/phh-prop-handler.sh
index aea5bb0..0020d21 100644
index e187466..fe857b7 100644
--- a/phh-prop-handler.sh
+++ b/phh-prop-handler.sh
@@ -279,3 +279,17 @@ if [ "$1" == "persist.bluetooth.system_audio_hal.enabled" ]; then
@@ -281,3 +281,17 @@ if [ "$1" == "persist.bluetooth.system_audio_hal.enabled" ]; then
restartAudio
exit
fi
@@ -34,13 +34,13 @@ index aea5bb0..0020d21 100644
+ exit
+fi
diff --git a/vndk.rc b/vndk.rc
index 3029abf..d75bc9e 100644
index 9f74ffd..dfcfcfe 100644
--- a/vndk.rc
+++ b/vndk.rc
@@ -102,3 +102,6 @@ service watchdogd-gsi /system/bin/watchdogd 10 20
class core
oneshot
seclabel u:r:watchdogd:s0
@@ -112,3 +112,6 @@ service watchdogd-gsi /system/bin/watchdogd 10 20
# Fix for non-AMOLED Transsion devices where brightness would be dimmer than usual
on property:ro.vendor.transsion.backlight_12bit=*
setprop ro.vendor.transsion.backlight_hal.optimization ${ro.vendor.transsion.backlight_12bit}
+
+on property:persist.sys.phh.securize=*
+ exec u:r:phhsu_daemon:s0 root -- /system/bin/phh-prop-handler.sh "persist.sys.phh.securize"

10
patches_treble/device_phh_treble/0008-treble-Also-use-data-adb-for-securize-status.patch
View File

@@ -1,4 +1,4 @@
From 985159eedef9f48dececcef108b9bee809adef3b Mon Sep 17 00:00:00 2001
From 74ec0afa2767a82f22e16d8499ef1a48ffa34f1c Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Wed, 22 Mar 2023 23:37:05 +0000
Subject: [PATCH 8/9] treble: Also use /data/adb for securize status
@@ -10,10 +10,10 @@ Change-Id: I778f2be5407ae0a548a098c72031cce9be83cf96
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/phh-prop-handler.sh b/phh-prop-handler.sh
index 0020d21..750f1eb 100644
index fe857b7..c21438c 100644
--- a/phh-prop-handler.sh
+++ b/phh-prop-handler.sh
@@ -286,10 +286,13 @@ if [ "$1" == "persist.sys.phh.securize" ];then
@@ -288,10 +288,13 @@ if [ "$1" == "persist.sys.phh.securize" ];then
fi
if [[ "$prop_value" == "true" ]]; then
@@ -29,10 +29,10 @@ index 0020d21..750f1eb 100644
exit
fi
diff --git a/rw-system.sh b/rw-system.sh
index e631b64..c5df982 100644
index 4dd61f3..2817795 100644
--- a/rw-system.sh
+++ b/rw-system.sh
@@ -756,7 +756,7 @@ copyprop() {
@@ -767,7 +767,7 @@ copyprop() {
resetprop_phh "$1" "$(getprop "$2")"
fi
}

2
patches_treble/device_phh_treble/0009-treble-Import-prebuilt-PHH-Superuser.patch
View File

@@ -1,4 +1,4 @@
From b931a3f8b6b6c9744881b7d88b730b1a6e7fa02c Mon Sep 17 00:00:00 2001
From 4f32c09f61ab0c69b3768257764d1257e812839e Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sat, 15 Jul 2023 17:01:27 +0800
Subject: [PATCH 9/9] treble: Import prebuilt PHH Superuser

20
patches_treble/system_core/0001-Restore-sbin-for-Magisk-compatibility.patch
View File

@@ -1,4 +1,4 @@
From 10c70671dc889ac496c433ee312a5b7259bed22e Mon Sep 17 00:00:00 2001
From 7b5af6750bdcfd107e607906b886a3034d52cb53 Mon Sep 17 00:00:00 2001
From: Victor Bo <bvoid@yandex.ru>
Date: Wed, 3 Mar 2021 06:31:17 -0500
Subject: [PATCH] Restore /sbin for Magisk compatibility
@@ -30,10 +30,10 @@ index 0a534a2bd..81150a0fa 100644
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product_services.img)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product_services)
diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp
index 8aadc3bb7..5535425e2 100644
index 9ab7f4305..c45317d0f 100644
--- a/libcutils/fs_config.cpp
+++ b/libcutils/fs_config.cpp
@@ -80,6 +80,7 @@ static const struct fs_path_config android_dirs[] = {
@@ -76,6 +76,7 @@ static const struct fs_path_config android_dirs[] = {
{ 00771, AID_SYSTEM, AID_SYSTEM, 0, "data" },
{ 00755, AID_ROOT, AID_SYSTEM, 0, "mnt" },
{ 00751, AID_ROOT, AID_SHELL, 0, "product/bin" },
@@ -41,7 +41,7 @@ index 8aadc3bb7..5535425e2 100644
{ 00751, AID_ROOT, AID_SHELL, 0, "product/apex/*/bin" },
{ 00777, AID_ROOT, AID_ROOT, 0, "sdcard" },
{ 00751, AID_ROOT, AID_SDCARD_R, 0, "storage" },
@@ -168,6 +169,7 @@ static const struct fs_path_config android_files[] = {
@@ -164,6 +165,7 @@ static const struct fs_path_config android_files[] = {
{ 00600, AID_ROOT, AID_ROOT, 0, "system_ext/build.prop" },
{ 00444, AID_ROOT, AID_ROOT, 0, system_ext_conf_dir + 1 },
{ 00444, AID_ROOT, AID_ROOT, 0, system_ext_conf_file + 1 },
@@ -49,7 +49,7 @@ index 8aadc3bb7..5535425e2 100644
{ 00755, AID_ROOT, AID_SHELL, 0, "system/bin/crash_dump32" },
{ 00755, AID_ROOT, AID_SHELL, 0, "system/bin/crash_dump64" },
{ 00755, AID_ROOT, AID_SHELL, 0, "system/bin/debuggerd" },
@@ -222,6 +224,7 @@ static const struct fs_path_config android_files[] = {
@@ -219,6 +221,7 @@ static const struct fs_path_config android_files[] = {
{ 00750, AID_ROOT, AID_SHELL, 0, "init*" },
{ 00755, AID_ROOT, AID_SHELL, 0, "odm/bin/*" },
{ 00755, AID_ROOT, AID_SHELL, 0, "product/bin/*" },
@@ -58,20 +58,20 @@ index 8aadc3bb7..5535425e2 100644
{ 00755, AID_ROOT, AID_SHELL, 0, "system/bin/*" },
{ 00755, AID_ROOT, AID_SHELL, 0, "system/xbin/*" },
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 3362872c0..1b686c38f 100644
index 7deb17324..aeeaad496 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -91,7 +91,7 @@ endif
@@ -96,7 +96,7 @@ endif
#
# create some directories (some are mount points) and symlinks
LOCAL_POST_INSTALL_CMD := mkdir -p $(addprefix $(TARGET_ROOT_OUT)/, \
- dev proc sys system data data_mirror odm oem acct config storage mnt apex debug_ramdisk \
+ sbin dev proc sys system data data_mirror odm oem acct config storage mnt apex debug_ramdisk \
- dev proc sys system data data_mirror odm oem acct config storage mnt apex bootstrap-apex debug_ramdisk \
+ sbin dev proc sys system data data_mirror odm oem acct config storage mnt apex bootstrap-apex debug_ramdisk \
linkerconfig second_stage_resources postinstall $(BOARD_ROOT_EXTRA_FOLDERS)); \
ln -sf /system/bin $(TARGET_ROOT_OUT)/bin; \
ln -sf /system/etc $(TARGET_ROOT_OUT)/etc; \
diff --git a/rootdir/init.environ.rc.in b/rootdir/init.environ.rc.in
index bf6e986c4..090fa5a78 100644
index 7ba1f46e7..f54aa60f7 100644
--- a/rootdir/init.environ.rc.in
+++ b/rootdir/init.environ.rc.in
@@ -10,6 +10,7 @@ on early-init

99
patches_treble/treble_app/0001-Simplify-Securize-to-CheckBoxPreference-and-persist-.patch Normal file
View File

@@ -0,0 +1,99 @@
From 66534cd4c678494e0aa0e74197a39fcee57e313a Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Thu, 29 Dec 2022 15:08:49 +0000
Subject: [PATCH] Simplify Securize to CheckBoxPreference and persist prop
For "Securize on-demand"
---
app/src/main/java/me/phh/treble/app/Misc.kt | 5 +++
.../java/me/phh/treble/app/MiscSettings.kt | 33 -------------------
app/src/main/res/xml/pref_misc.xml | 7 ++--
3 files changed, 10 insertions(+), 35 deletions(-)
diff --git a/app/src/main/java/me/phh/treble/app/Misc.kt b/app/src/main/java/me/phh/treble/app/Misc.kt
index a56b460..8861d51 100644
--- a/app/src/main/java/me/phh/treble/app/Misc.kt
+++ b/app/src/main/java/me/phh/treble/app/Misc.kt
@@ -302,6 +302,10 @@ object Misc: EntryStartup {
val value = sp.getString(key, "0")
SystemProperties.set("persist.sys.bt.esco_transport_unit_size", value)
}
+ MiscSettings.securize -> {
+ val value = sp.getBoolean(key, false)
+ SystemProperties.set("persist.sys.phh.securize", if (value) "true" else "false")
+ }
}
}
@@ -328,5 +332,6 @@ object Misc: EntryStartup {
spListener.onSharedPreferenceChanged(sp, MiscSettings.noHwcomposer)
spListener.onSharedPreferenceChanged(sp, MiscSettings.storageFUSE)
spListener.onSharedPreferenceChanged(sp, MiscSettings.dt2w)
+ spListener.onSharedPreferenceChanged(sp, MiscSettings.securize)
}
}
diff --git a/app/src/main/java/me/phh/treble/app/MiscSettings.kt b/app/src/main/java/me/phh/treble/app/MiscSettings.kt
index e3b5312..5fe481f 100644
--- a/app/src/main/java/me/phh/treble/app/MiscSettings.kt
+++ b/app/src/main/java/me/phh/treble/app/MiscSettings.kt
@@ -56,39 +56,6 @@ class MiscSettingsFragment : SettingsFragment() {
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
super.onCreatePreferences(savedInstanceState, rootKey)
- val securizePref = findPreference<Preference>(MiscSettings.securize)
- securizePref!!.setOnPreferenceClickListener {
- val builder = AlertDialog.Builder( this.getActivity() )
- builder.setTitle(getString(R.string.remove_root))
- builder.setMessage(getString(R.string.continue_question))
-
- builder.setPositiveButton(android.R.string.yes) { dialog, which ->
-
- var cmds = listOf(
- arrayOf("/sbin/su", "-c", "/system/bin/phh-securize.sh"),
- arrayOf("/system/xbin/su", "-c", "/system/bin/phh-securize.sh"),
- arrayOf("/system/xbin/phh-su", "-c", "/system/bin/phh-securize.sh"),
- arrayOf("/sbin/su", "0", "/system/bin/phh-securize.sh"),
- arrayOf("/system/xbin/su", "0", "/system/bin/phh-securize.sh"),
- arrayOf("/system/xbin/phh-su", "0", "/system/bin/phh-securize.sh")
- )
- for (cmd in cmds) {
- try {
- Runtime.getRuntime().exec(cmd).waitFor()
- break
- } catch (t: Throwable) {
- Log.d("PHH", "Failed to exec \"" + cmd.joinToString(separator = " ") + "\", skipping")
- }
- }
- }
-
- builder.setNegativeButton(android.R.string.no) { dialog, which ->
- }
-
- builder.show()
- return@setOnPreferenceClickListener true
- }
-
val removeTelephonyPref = findPreference<Preference>(MiscSettings.removeTelephony)
removeTelephonyPref!!.setOnPreferenceClickListener {
diff --git a/app/src/main/res/xml/pref_misc.xml b/app/src/main/res/xml/pref_misc.xml
index e41659d..bdf1147 100644
--- a/app/src/main/res/xml/pref_misc.xml
+++ b/app/src/main/res/xml/pref_misc.xml
@@ -193,8 +193,11 @@
android:entryValues="@array/pref_misc_fod_color_values"
android:key="key_misc_fod_color"
android:title="Under-display fp color" />
- <Preference android:title="Securize"
- android:key="key_misc_securize" />
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="key_misc_securize"
+ android:title="Spoof system properties"
+ android:summary="For better chances of passing SafetyNet\nMight cause bootloop on some devices" />
</PreferenceCategory>
<PreferenceCategory android:title="Debugging">
<Preference android:title="Debug Sensors">
--
2.34.1

36419
patches_treble/vendor_hardware_overlay/0001-TEMP-Up-TrebleApp-to-20240216.patch
View File

File diff suppressed because it is too large Load Diff

6
patches_treble/vendor_lineage/0001-build_soong-Disable-generated_kernel_headers.patch
View File

@@ -1,4 +1,4 @@
From 3e4384c994002a3164ece52d9a942d6c3451feb1 Mon Sep 17 00:00:00 2001
From 329e8930c11cd2a90dae2f127645ec2e830d3aa2 Mon Sep 17 00:00:00 2001
From: AndyCGYan <GeForce8800Ultra@gmail.com>
Date: Sun, 3 Mar 2019 14:07:33 +0800
Subject: [PATCH 1/2] build_soong: Disable generated_kernel_headers
@@ -11,7 +11,7 @@ Change-Id: I630857cec208f1830e776bf5031d7bb9bc4435d0
1 file changed, 12 deletions(-)
diff --git a/build/soong/Android.bp b/build/soong/Android.bp
index 2a21c5c0..417fac02 100644
index 5899c987..3846fa01 100644
--- a/build/soong/Android.bp
+++ b/build/soong/Android.bp
@@ -20,9 +20,6 @@ bootstrap_go_package {
@@ -19,7 +19,7 @@ index 2a21c5c0..417fac02 100644
name: "generated_kernel_includes",
- // The headers make command
- cmd: "$(PATH_OVERRIDE_SOONG) $(KERNEL_MAKE_CMD) $(KERNEL_MAKE_FLAGS) -C $(TARGET_KERNEL_SOURCE) O=$(KERNEL_BUILD_OUT_PREFIX)$(genDir) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) headers_install",
- cmd: "$(PATH_OVERRIDE_SOONG) $(KERNEL_MAKE_CMD) $(KERNEL_MAKE_FLAGS) -C $(TARGET_KERNEL_SOURCE) O=$(KERNEL_BUILD_OUT_PREFIX)$(genDir) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) headers_install && vendor/lineage/tools/clean_headers.sh $(KERNEL_BUILD_OUT_PREFIX)$(genDir)",
-
// Directories that can be imported by a cc_* module generated_headers property
export_include_dirs: [

8
patches_treble/vendor_lineage/0002-vendor_lineage-Disable-ADB-authentication.patch
View File

@@ -1,4 +1,4 @@
From c942de76b74fa53e3b3983d17444c051a8a38dcc Mon Sep 17 00:00:00 2001
From 12793ea2bcf49d7ffa7231aa8560d5a629e48c88 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Tue, 19 Oct 2021 15:48:43 +0000
Subject: [PATCH 2/2] vendor_lineage: Disable ADB authentication
@@ -9,11 +9,11 @@ Change-Id: I4370583ecab1c88ef6f42e29d3eaa52c24d13f09
1 file changed, 5 deletions(-)
diff --git a/config/common.mk b/config/common.mk
index 00d0a416..c9930600 100644
index cc81102d..460a0085 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -13,16 +13,11 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
ro.com.google.clientidbase=$(PRODUCT_GMS_CLIENTID_BASE)
@@ -23,16 +23,11 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
endif
endif
-ifeq ($(TARGET_BUILD_VARIANT),eng)