Changes for January 2023

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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
-

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

@@ -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

patches_treble/device_phh_treble/0007-treble-Securize-on-demand.patch

@@ -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
+

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

@@ -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