Changes for October 2023, syncing up to 20230905

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

@@ -1,7 +1,7 @@
-From 598c7139b69f6af6337c3c8829c4b3292ae7cc7c Mon Sep 17 00:00:00 2001
+From 68c0449432e3e18095ccd6d0a76675cee7c37306 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 01/10] treble: Lineage-ify
+Subject: [PATCH 1/9] treble: Lineage-ify
 
 Squash of:
 - Proper target names
@@ -40,7 +40,7 @@ index 6a317e4..e69de29 100644
 -PRODUCT_COPY_FILES += \
 -	device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
 diff --git a/base.mk b/base.mk
-index c26a533..98a8c59 100644
+index bf8f117..aea10fa 100644
 --- a/base.mk
 +++ b/base.mk
 @@ -17,12 +17,14 @@ PRODUCT_COPY_FILES += \

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

@@ -1,7 +1,7 @@
-From 54306139fa3c14dd61d4b25ede267a4caa931116 Mon Sep 17 00:00:00 2001
+From 5f607c73f8601349d166c461d2d96237ce2779cf 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 02/10] treble: Set BOARD_EXT4_SHARE_DUP_BLOCKS explicitly
+Subject: [PATCH 2/9] treble: Set BOARD_EXT4_SHARE_DUP_BLOCKS explicitly
 
 Change-Id: I725443154fabde548d2e6c1b072d34c27596c421
 ---

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

@@ -1,7 +1,7 @@
-From e2169e811a3462fdbf0cb0678102fd1864c578af Mon Sep 17 00:00:00 2001
+From 637b46fa0db205ba2b592e8a081680d3c281c792 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 03/10] 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
 

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

@@ -1,7 +1,7 @@
-From e2cdfc45356d89ecc9dd91d96d0fd02c4edcf8a7 Mon Sep 17 00:00:00 2001
+From 8db167728d498636399cf2ca04cbdd4a3e23b9f9 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 04/10] treble: Enable call recording
+Subject: [PATCH 4/9] treble: Enable call recording
 
 Change-Id: I57ca3604363547419a566b37b5151b6b30c46d28
 ---

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

@@ -1,7 +1,7 @@
-From 899d500aa8720c1fff5460658fd133b4c2e515f1 Mon Sep 17 00:00:00 2001
+From eec24080edaf13ebf8d4b58815a5ef7c22f88658 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 05/10] treble: Switch to MindTheGapps
+Subject: [PATCH 5/9] treble: Switch to MindTheGapps
 
 Change-Id: I1b80d4c5176cbf4af21d147c71b0abce6027c7c7
 ---

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

@@ -1,7 +1,7 @@
-From f49f0bd3576140681192449ddb0ce822ae2a0bf6 Mon Sep 17 00:00:00 2001
+From fd621da49491bdb2272a076778c7c0374b3f6d1f 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 06/10] 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
@@ -13,10 +13,10 @@ Change-Id: I0215b3ed970dd53a124f48e30ca2cf4b0c6d2899
  1 file changed, 3 deletions(-)
 
 diff --git a/rw-system.sh b/rw-system.sh
-index e986b03..07e1d96 100644
+index d78d6f2..dfd9305 100644
 --- a/rw-system.sh
 +++ b/rw-system.sh
-@@ -778,13 +778,10 @@ if [ -f /system/phh/secure ] || [ -f /metadata/phh/secure ];then
+@@ -786,13 +786,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

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

@@ -1,7 +1,7 @@
-From 67159b9dacdd2271e18926ebc6955261f3a5ac3f Mon Sep 17 00:00:00 2001
+From 81f34a4c35c904fdb34fae8f35229dc2f0580df9 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 07/10] treble: Securize on-demand
+Subject: [PATCH 7/9] treble: Securize on-demand
 
 Status is stored in /metadata and controlled by persist prop
 
@@ -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 b01c0cc..390b76f 100644
+index 2d30ab7..92db128 100644
 --- a/phh-prop-handler.sh
 +++ b/phh-prop-handler.sh
-@@ -233,3 +233,17 @@ if [ "$1" == "persist.bluetooth.system_audio_hal.enabled" ]; then
+@@ -257,3 +257,17 @@ if [ "$1" == "persist.bluetooth.system_audio_hal.enabled" ]; then
      restartAudio
      exit
  fi
@@ -34,10 +34,10 @@ index b01c0cc..390b76f 100644
 +    exit
 +fi
 diff --git a/vndk.rc b/vndk.rc
-index d319c9e..08bc1aa 100644
+index 823456a..1ec8ccb 100644
 --- a/vndk.rc
 +++ b/vndk.rc
-@@ -87,3 +87,6 @@ service watchdogd-gsi /system/bin/watchdogd 10 20
+@@ -90,3 +90,6 @@ service watchdogd-gsi /system/bin/watchdogd 10 20
      class core
      oneshot
      seclabel u:r:watchdogd:s0

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

@@ -1,7 +1,7 @@
-From d4a0510c935ba76e83c93bb3bb500ded1df2ca0e Mon Sep 17 00:00:00 2001
+From d67665b77e18082ef9362e4047f99de0a1b0f81f 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 08/10] treble: Also use /data/adb for securize status
+Subject: [PATCH 8/9] treble: Also use /data/adb for securize status
 
 Change-Id: I778f2be5407ae0a548a098c72031cce9be83cf96
 ---
@@ -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 390b76f..c976b49 100644
+index 92db128..0b862d1 100644
 --- a/phh-prop-handler.sh
 +++ b/phh-prop-handler.sh
-@@ -240,10 +240,13 @@ if [ "$1" == "persist.sys.phh.securize" ];then
+@@ -264,10 +264,13 @@ if [ "$1" == "persist.sys.phh.securize" ];then
      fi
  
      if [[ "$prop_value" == "true" ]]; then
@@ -29,10 +29,10 @@ index 390b76f..c976b49 100644
      exit
  fi
 diff --git a/rw-system.sh b/rw-system.sh
-index 07e1d96..709fa1b 100644
+index dfd9305..a716c9b 100644
 --- a/rw-system.sh
 +++ b/rw-system.sh
-@@ -741,7 +741,7 @@ copyprop() {
+@@ -749,7 +749,7 @@ copyprop() {
          resetprop_phh "$1" "$(getprop "$2")"
      fi
  }

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

@@ -1,7 +1,7 @@
-From d6185304554ddfb720241b2f42d76b928b4056cb Mon Sep 17 00:00:00 2001
+From d3f254e564bbc7f4d9659cb5f69819420f4a3431 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 10/10] treble: Import prebuilt PHH Superuser
+Subject: [PATCH 9/9] treble: Import prebuilt PHH Superuser
 
 Change-Id: I9655d706ef3e1f32d0584a68384823db895e0283
 ---

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

@@ -1,27 +0,0 @@
-From dd2922cc2edf2130e13117383208bfd96f59ea68 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 09/10] treble: Include androidx.window.extensions
-
-This enables two-pane layout in Settings for tablets
-
-Change-Id: I2503c1c510151ea8463c86521a9164727467c551
----
- base.mk | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/base.mk b/base.mk
-index 98a8c59..aea10fa 100644
---- a/base.mk
-+++ b/base.mk
-@@ -257,3 +257,7 @@ PRODUCT_PACKAGES += \
- 
- PRODUCT_PACKAGES += \
- 	slsi-booted
-+
-+# Two-pane layout in Settings
-+PRODUCT_PACKAGES += \
-+    androidx.window.extensions
--- 
-2.34.1
-