Changes for June 2023, syncing up to 20230614

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

@@ -1,4 +1,4 @@
-From cdc58cf7521058bf50f6835fa41a2cedc6dab008 Mon Sep 17 00:00:00 2001
+From 563e108c7b4ed5328da2b7e679a32f895143a7b9 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

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

@@ -1,4 +1,4 @@
-From 637ec8c42fd5946eb7e9df549b980d605b22dad6 Mon Sep 17 00:00:00 2001
+From 2aecfd767a70bf3453ff5b1d6248acb66c216237 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

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

@@ -1,4 +1,4 @@
-From eec1dc55bfe0733d1c6d8a5d870cd6411b02bd0d Mon Sep 17 00:00:00 2001
+From 037d75cd9b7001493c29b9ef998fb61ec77bee49 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

patches_treble/device_phh_treble/0005-treble-Switch-to-MindTheGapps.patch

@@ -1,4 +1,4 @@
-From be808ccab89637aa591c6ec13ab6187848e2c55c Mon Sep 17 00:00:00 2001
+From 406d4622bf17d63dee581ee2d1645827708211d1 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

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

@@ -1,4 +1,4 @@
-From 4901e97f452afa7eccffa22d50d6ccaa7eae8ffe Mon Sep 17 00:00:00 2001
+From 59403a7591029a82ca2201f95b97a17019caa7a7 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
@@ -9,14 +9,14 @@ Build-time macro coupled with vendor/lineage might do better...
 
 Change-Id: I0215b3ed970dd53a124f48e30ca2cf4b0c6d2899
 ---
- rw-system.sh | 4 ----
- 1 file changed, 4 deletions(-)
+ rw-system.sh | 3 ---
+ 1 file changed, 3 deletions(-)
 
 diff --git a/rw-system.sh b/rw-system.sh
-index e1ad994..d78655e 100644
+index 5dc493f..9c7cc42 100644
 --- a/rw-system.sh
 +++ b/rw-system.sh
-@@ -772,14 +772,10 @@ if [ -f /system/phh/secure ] || [ -f /metadata/phh/secure ];then
+@@ -776,13 +776,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
@@ -26,7 +26,6 @@ index e1ad994..d78655e 100644
      resetprop_phh ro.build.selinux 0
  
 -    resetprop_phh ro.adb.secure 1
--    setprop ctl.restart adbd
 -
      # Hide system/xbin/su
      mount /mnt/phh/empty_dir /system/xbin

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

@@ -1,4 +1,4 @@
-From 4a2ed5f6bf414ac6d493f78c0ad89572b1aef5f2 Mon Sep 17 00:00:00 2001
+From e3df20ed1f82e8cefe0914bdf7a6cb0b34736c25 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
@@ -8,14 +8,14 @@ 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(+)
+ vndk.rc             |  3 +++
+ 2 files changed, 17 insertions(+)
 
 diff --git a/phh-prop-handler.sh b/phh-prop-handler.sh
-index 4371632..a8cea3f 100644
+index 32a1f19..a6ddab8 100644
 --- a/phh-prop-handler.sh
 +++ b/phh-prop-handler.sh
-@@ -210,3 +210,17 @@ if [ "$1" == "persist.sys.phh.disable_soundvolume_effect" ];then
+@@ -218,3 +218,17 @@ if [ "$1" == "persist.bluetooth.system_audio_hal.enabled" ]; then
      restartAudio
      exit
  fi
@@ -34,13 +34,14 @@ index 4371632..a8cea3f 100644
 +    exit
 +fi
 diff --git a/vndk.rc b/vndk.rc
-index d1fffde..7db62b7 100644
+index 478bc37..674977d 100644
 --- a/vndk.rc
 +++ b/vndk.rc
-@@ -82,3 +82,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}
- 
+@@ -81,3 +81,6 @@ service watchdogd-gsi /system/bin/watchdogd 10 20
+     class core
+     oneshot
+     seclabel u:r:watchdogd:s0
++
 +on property:persist.sys.phh.securize=*
 +    exec u:r:phhsu_daemon:s0 root -- /system/bin/phh-prop-handler.sh "persist.sys.phh.securize"
 -- 

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

@@ -1,4 +1,4 @@
-From c8537ab48366a14bf90706fc44667fc1b6003b73 Mon Sep 17 00:00:00 2001
+From adbae267d33896e4904b95d0960e6f118c91e265 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 a8cea3f..3739eb4 100644
+index a6ddab8..0ad7a1f 100644
 --- a/phh-prop-handler.sh
 +++ b/phh-prop-handler.sh
-@@ -217,10 +217,13 @@ if [ "$1" == "persist.sys.phh.securize" ];then
+@@ -225,10 +225,13 @@ if [ "$1" == "persist.sys.phh.securize" ];then
      fi
  
      if [[ "$prop_value" == "true" ]]; then
@@ -29,10 +29,10 @@ index a8cea3f..3739eb4 100644
      exit
  fi
 diff --git a/rw-system.sh b/rw-system.sh
-index d78655e..7291547 100644
+index 9c7cc42..8a188f7 100644
 --- a/rw-system.sh
 +++ b/rw-system.sh
-@@ -735,7 +735,7 @@ copyprop() {
+@@ -739,7 +739,7 @@ copyprop() {
          resetprop_phh "$1" "$(getprop "$2")"
      fi
  }

patches_treble/device_phh_treble/0009-treble-Include-androidx.window.extensions.patch

@@ -1,4 +1,4 @@
-From 267d881c8ad8a6626ea64768b20e0a86897091a8 Mon Sep 17 00:00:00 2001
+From ada7dfd43781e97480001f24365a76d55548928f Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Fri, 24 Mar 2023 00:13:01 +0000
 Subject: [PATCH 9/9] treble: Include androidx.window.extensions
@@ -11,13 +11,13 @@ Change-Id: I2503c1c510151ea8463c86521a9164727467c551
  1 file changed, 4 insertions(+)
 
 diff --git a/base.mk b/base.mk
-index 17bfdc3..49c4da6 100644
+index 98a8c59..aea10fa 100644
 --- a/base.mk
 +++ b/base.mk
-@@ -255,3 +255,7 @@ PRODUCT_COPY_FILES += \
- # QCOM in-call audio fix as a standalone app
+@@ -257,3 +257,7 @@ PRODUCT_PACKAGES += \
+ 
  PRODUCT_PACKAGES += \
-     QcRilAm
+ 	slsi-booted
 +
 +# Two-pane layout in Settings
 +PRODUCT_PACKAGES += \