Changes for March 2023, syncing up to 20230315

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

@@ -1,7 +1,7 @@
-From 05f4b920214c3d4145ca39d2c4334dc68c8faecb Mon Sep 17 00:00:00 2001
+From ea3fbad21a0874e5215003596cebc63ace7066c5 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/7] treble: Lineage-ify
+Subject: [PATCH 1/9] treble: Lineage-ify
 
 Squash of:
 - Proper target names
@@ -13,11 +13,11 @@ Squash of:
 Change-Id: I25eee7a3804f335430a447ae1424402d7e37851b
 ---
  base-pre.mk                                   |  3 -
- base.mk                                       | 16 ++--
+ base.mk                                       | 12 +--
  generate.sh                                   |  4 +-
  .../lineage/res/res/values/config.xml         | 81 +++++++++++++++++++
  .../base/core/res/res/values/config.xml       |  1 -
- 5 files changed, 92 insertions(+), 13 deletions(-)
+ 5 files changed, 90 insertions(+), 11 deletions(-)
  create mode 100644 overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
 
 diff --git a/base-pre.mk b/base-pre.mk
@@ -29,7 +29,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 5d4ed0b..6097e3d 100644
+index 348799e..17bfdc3 100644
 --- a/base.mk
 +++ b/base.mk
 @@ -17,12 +17,14 @@ PRODUCT_COPY_FILES += \
@@ -52,20 +52,6 @@ index 5d4ed0b..6097e3d 100644
  
  $(call inherit-product, vendor/hardware_overlay/overlay.mk)
  $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-@@ -40,11 +42,11 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
- 	ro.adb.secure=0 \
- 	ro.logd.auditd=true \
- 	ro.logd.kernel=true \
--	
-+
- #Huawei HiSuite (also other OEM custom programs I guess) it's of no use in AOSP builds
- PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
- 	persist.sys.usb.config=adb \
--	ro.cust.cdrom=/dev/null	
-+	ro.cust.cdrom=/dev/null
- 
- #VNDK config files
- PRODUCT_COPY_FILES += \
 diff --git a/generate.sh b/generate.sh
 index 9c20eb5..89fa88b 100644
 --- a/generate.sh
@@ -176,7 +162,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 479bff7..964524c 100644
+index 09895a4..fa07f40 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 @@
@@ -188,5 +174,5 @@ index 479bff7..964524c 100644
  	<integer name="config_multiuserMaximumUsers">5</integer>
  	<bool name="config_enableMultiUserUI">true</bool>
 -- 
-2.25.1
+2.34.1
 

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

@@ -1,7 +1,7 @@
-From 53244ebbb4a2da9fbcf02834f40b8083549e3ca7 Mon Sep 17 00:00:00 2001
+From cdc58cf7521058bf50f6835fa41a2cedc6dab008 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/7] 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 2cb5dbc..e493d1c 100644
 +
 +BOARD_EXT4_SHARE_DUP_BLOCKS := true
 -- 
-2.25.1
+2.34.1
 

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

@@ -1,7 +1,7 @@
-From 515176d3ca472dd8ffe122ebf91af4ecc5533c3f Mon Sep 17 00:00:00 2001
+From 637ec8c42fd5946eb7e9df549b980d605b22dad6 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/7] 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 e493d1c..9d1d45e 100644
 +
 +TARGET_NO_KERNEL_OVERRIDE := true
 -- 
-2.25.1
+2.34.1
 

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

@@ -1,7 +1,7 @@
-From 027b59c5b6d68570be7025632f985d8569f6dc85 Mon Sep 17 00:00:00 2001
+From eec1dc55bfe0733d1c6d8a5d870cd6411b02bd0d 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/7] treble: Enable call recording
+Subject: [PATCH 4/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
 

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

@@ -1,26 +1,46 @@
-From b77fda8daa3632ef92f3299180506bcbd7c53189 Mon Sep 17 00:00:00 2001
+From be808ccab89637aa591c6ec13ab6187848e2c55c 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/7] treble: Switch to MindTheGapps
+Subject: [PATCH 5/9] treble: Switch to MindTheGapps
 
 Change-Id: I1b80d4c5176cbf4af21d147c71b0abce6027c7c7
 ---
- generate.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ generate.sh | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
 
 diff --git a/generate.sh b/generate.sh
-index 89fa88b..d847430 100644
+index 89fa88b..8654eeb 100644
 --- a/generate.sh
 +++ b/generate.sh
-@@ -26,7 +26,7 @@ for part in a ab;do
+@@ -24,9 +24,15 @@ for part in a ab;do
+ 				extra_packages=""
+                 vndk="vndk.mk"
  		optional_base=""
++
++				baseArch="$arch"
++				if [ "$arch" = "a64" ];then
++					baseArch="arm"
++				fi
++
  				if [ "$apps" == "gapps" ];then
  					apps_suffix="g"
 -					apps_script='$(call inherit-product, device/phh/treble/gapps.mk)'
-+					apps_script='$(call inherit-product, vendor/gapps/arm64/arm64-vendor.mk)'
++					apps_script='$(call inherit-product, vendor/gapps/'$baseArch'/'$baseArch'-vendor.mk)'
  					apps_name="with GApps"
  				fi
  				if [ "$apps" == "gapps-go" ];then
+@@ -66,11 +72,6 @@ for part in a ab;do
+ 
+ 				target="lineage_${arch}_${part_suffix}${apps_suffix}${su_suffix}"
+ 
+-				baseArch="$arch"
+-				if [ "$arch" = "a64" ];then
+-					baseArch="arm"
+-				fi
+-
+ 				zygote=32
+ 				if [ "$arch" = "arm64" ];then
+ 					zygote=64_32
 -- 
-2.25.1
+2.34.1
 

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

@@ -1,7 +1,7 @@
-From 2a9382e9a122f3a34adfed4da687e2bf23383d58 Mon Sep 17 00:00:00 2001
+From 4901e97f452afa7eccffa22d50d6ccaa7eae8ffe 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/7] 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, 4 deletions(-)
 
 diff --git a/rw-system.sh b/rw-system.sh
-index 42d315f..798e5e3 100644
+index e1ad994..d78655e 100644
 --- a/rw-system.sh
 +++ b/rw-system.sh
-@@ -764,14 +764,10 @@ if [ -f /system/phh/secure ] || [ -f /metadata/phh/secure ];then
+@@ -772,14 +772,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
@@ -32,5 +32,5 @@ index 42d315f..798e5e3 100644
      mount /mnt/phh/empty_dir /system/xbin
      mount /mnt/phh/empty_dir /system/app/me.phh.superuser
 -- 
-2.25.1
+2.34.1
 

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

@@ -1,7 +1,7 @@
-From f57a44efd56ca41a593e6d1ebb948f486960f714 Mon Sep 17 00:00:00 2001
+From 4a2ed5f6bf414ac6d493f78c0ad89572b1aef5f2 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/7] 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 d1fffde..7db62b7 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
 

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

@@ -0,0 +1,46 @@
+From c8537ab48366a14bf90706fc44667fc1b6003b73 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 d78655e..7291547 100644
+--- a/rw-system.sh
++++ b/rw-system.sh
+@@ -735,7 +735,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
+

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

@@ -0,0 +1,27 @@
+From 267d881c8ad8a6626ea64768b20e0a86897091a8 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
+
+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 17bfdc3..49c4da6 100644
+--- a/base.mk
++++ b/base.mk
+@@ -255,3 +255,7 @@ PRODUCT_COPY_FILES += \
+ # QCOM in-call audio fix as a standalone app
+ PRODUCT_PACKAGES += \
+     QcRilAm
++
++# Two-pane layout in Settings
++PRODUCT_PACKAGES += \
++    androidx.window.extensions
+-- 
+2.34.1
+