Changes for March 2023

2023-03-23 11:50:19 +00:00 · 2023-03-23 11:50:19 +00:00 · dbc6fa9ce3
commit dbc6fa9ce3
parent e5f5c09b6c
9 changed files with 70 additions and 24 deletions
--- a/patches_treble/device_phh_treble/0001-treble-Lineage-ify.patch
+++ b/patches_treble/device_phh_treble/0001-treble-Lineage-ify.patch
@ -1,7 +1,7 @@
-From 87116e2dbe93e5587da65788ff4ebd1bf1d644a7 Mon Sep 17 00:00:00 2001
+From 36d4972e3fa6befa6d5a05d46b53239bea3943ed 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
+Subject: [PATCH 1/9] treble: Lineage-ify

 Squash of:
 - Proper target names
@ -203,5 +203,5 @@ index 999ff97..11dd447 100644
 
 /sec_storage(/.*)?      u:object_r:teecd_data_file:s0
 -- 
-2.25.1
+2.34.1

--- a/patches_treble/device_phh_treble/0002-treble-Set-BOARD_EXT4_SHARE_DUP_BLOCKS-explicitly.patch
+++ b/patches_treble/device_phh_treble/0002-treble-Set-BOARD_EXT4_SHARE_DUP_BLOCKS-explicitly.patch
@ -1,7 +1,7 @@
-From 5b7c8a7ecfd6ccfa4d0652020eed3aa8ff234f59 Mon Sep 17 00:00:00 2001
+From 061dfa999de1fef818ec82a9d7b3b97c151f8995 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
+Subject: [PATCH 2/9] treble: Set BOARD_EXT4_SHARE_DUP_BLOCKS explicitly

 Change-Id: I725443154fabde548d2e6c1b072d34c27596c421
 ---
@ -19,5 +19,5 @@ index 1ddacaf..e363dd5 100644
 +
 +BOARD_EXT4_SHARE_DUP_BLOCKS := true
 -- 
-2.25.1
+2.34.1

--- a/patches_treble/device_phh_treble/0003-treble-Set-TARGET_NO_KERNEL_OVERRIDE.patch
+++ b/patches_treble/device_phh_treble/0003-treble-Set-TARGET_NO_KERNEL_OVERRIDE.patch
@ -1,7 +1,7 @@
-From 878186aa88a5dc234fd90005d454b419384fd5df Mon Sep 17 00:00:00 2001
+From 08c5d49779061a407875159591a564ef8f5fcc0b 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
+Subject: [PATCH 3/9] treble: Set TARGET_NO_KERNEL_OVERRIDE

 Taken from Lineage generic targets - skips building kernel cleanly

@ -21,5 +21,5 @@ index e363dd5..3900f97 100644
 +
 +TARGET_NO_KERNEL_OVERRIDE := true
 -- 
-2.25.1
+2.34.1

--- a/patches_treble/device_phh_treble/0004-treble-Set-OTA-JSON-URL.patch
+++ b/patches_treble/device_phh_treble/0004-treble-Set-OTA-JSON-URL.patch
@ -1,7 +1,7 @@
-From c387e045607b7353bff4d887548b11232d6074bc Mon Sep 17 00:00:00 2001
+From 5befcded0b6af0c0141f368544fc802815a5821d 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
+Subject: [PATCH 4/9] treble: Set OTA JSON URL

 Change-Id: I8f817b90d42629c208ceb45598daf5293850b953
 ---
@ -20,5 +20,5 @@ index 172bb01..68b57f4 100644
 +PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
 +    ro.system.ota.json_url=https://downloads.sourceforge.net/project/andyyan-gsi/lineage-19.x/ota.json
 -- 
-2.25.1
+2.34.1

--- a/patches_treble/device_phh_treble/0005-treble-Enable-call-recording.patch
+++ b/patches_treble/device_phh_treble/0005-treble-Enable-call-recording.patch
@ -1,7 +1,7 @@
-From 0efbc3a793daf2e5c5caaf38958561de0c4dc276 Mon Sep 17 00:00:00 2001
+From aae7db89b8e8c2898a9c34adc6dde18bd8a61445 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
+Subject: [PATCH 5/9] treble: Enable call recording

 Change-Id: I57ca3604363547419a566b37b5151b6b30c46d28
 ---
@ -36,5 +36,5 @@ index 0000000..4cacde5
 +    <integer name="call_recording_audio_source">4</integer>
 +</resources>
 -- 
-2.25.1
+2.34.1

--- a/patches_treble/device_phh_treble/0006-treble-Stop-securing-ADB.patch
+++ b/patches_treble/device_phh_treble/0006-treble-Stop-securing-ADB.patch
@ -1,7 +1,7 @@
-From 25a86e882e057f248966784b0348db5eb82935eb Mon Sep 17 00:00:00 2001
+From 878d2b2112f37bfca6da9cee0b5b4d17ae1ee9ab 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/8] treble: Stop securing ADB
+Subject: [PATCH 6/9] treble: Stop securing ADB

 Seems to kill USB Debugging altogether on certain devices,
 and unrelated to SN anyway
@ -32,5 +32,5 @@ index 5f324b3..33b3591 100644
     mount /mnt/phh/empty_dir /system/xbin
     mount /mnt/phh/empty_dir /system/app/me.phh.superuser
 -- 
-2.25.1
+2.34.1

--- a/patches_treble/device_phh_treble/0007-treble-Securize-on-demand.patch
+++ b/patches_treble/device_phh_treble/0007-treble-Securize-on-demand.patch
@ -1,7 +1,7 @@
-From a434b3926218c07dcd6e763a827adeaea5332c66 Mon Sep 17 00:00:00 2001
+From 184de8e7227f21de180bb36916abcb316e2986c9 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
+Subject: [PATCH 7/9] treble: Securize on-demand

 Status is stored in /metadata and controlled by persist prop

@ -44,5 +44,5 @@ index c150ace..74402a8 100644
 +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.34.1

--- a/patches_treble/device_phh_treble/0008-treble-Also-use-data-adb-for-securize-status.patch
+++ b/patches_treble/device_phh_treble/0008-treble-Also-use-data-adb-for-securize-status.patch
@ -0,0 +1,46 @@
+From 5301dd1c023179e5db95be2e7eed56a64b947da2 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
+
+Change-Id: I778f2be5407ae0a548a098c72031cce9be83cf96
+---
+ phh-prop-handler.sh | 5 ++++-
+ rw-system.sh        | 2 +-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/phh-prop-handler.sh b/phh-prop-handler.sh
+index a8cea3f..3739eb4 100644
+--- a/phh-prop-handler.sh
+++ b/phh-prop-handler.sh
+@@ -217,10 +217,13 @@ if [ "$1" == "persist.sys.phh.securize" ];then
+     fi
+ 
+     if [[ "$prop_value" == "true" ]]; then
+-        mkdir /metadata/phh
+        mkdir -p /metadata/phh
+         touch /metadata/phh/secure
+        mkdir -p /data/adb/phh
+        touch /data/adb/phh/secure
+     else
+         rm /metadata/phh/secure
+        rm /data/adb/phh/secure
+     fi
+     exit
+ fi
+diff --git a/rw-system.sh b/rw-system.sh
+index 33b3591..3812b12 100644
+--- a/rw-system.sh
+++ b/rw-system.sh
+@@ -727,7 +727,7 @@ copyprop() {
+         resetprop_phh "$1" "$(getprop "$2")"
+     fi
+ }
+-if [ -f /system/phh/secure ] || [ -f /metadata/phh/secure ];then
+if [ -f /system/phh/secure ] || [ -f /metadata/phh/secure ] || [ -f /data/adb/phh/secure ];then
+     copyprop ro.build.device ro.vendor.build.device
+     copyprop ro.system.build.fingerprint ro.vendor.build.fingerprint
+     copyprop ro.bootimage.build.fingerprint ro.vendor.build.fingerprint
+-- 
+2.34.1
+
--- a/patches_treble/device_phh_treble/0009-add-offline-charger-sepolicy.patch
+++ b/patches_treble/device_phh_treble/0009-add-offline-charger-sepolicy.patch
@ -1,7 +1,7 @@
-From e926e59d7745fa0baecda61fb9ff4803a44a4b22 Mon Sep 17 00:00:00 2001
+From 273e01312171fa003667343330ce08d6d127597f 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
+Subject: [PATCH 9/9] add offline charger sepolicy

 ---
 sepolicy/gsicharger.te | 1 +
@ -16,5 +16,5 @@ index 0000000..91cfb5c
@@ -0,0 +1 @@
 +permissive charger;
 -- 
-2.25.1
+2.34.1