Changes for March 2023, syncing up to 20230315

patches_treble_personal/device_phh_treble/0001-Add-Meizu-18-vibrator-support.patch

@@ -1,4 +1,4 @@
-From 363c57e1fc2566b3818315ed982ea3a5e976331a Mon Sep 17 00:00:00 2001
+From c329331ba9e37c24809afbd026bcc770f7950384 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Tue, 22 Jun 2021 13:38:31 +0000
 Subject: [PATCH 1/3] Add Meizu 18 vibrator support
@@ -28,13 +28,13 @@ Change-Id: Iecf12cd814e8773abfd78a19f98e31125a73761a
  create mode 100644 meizu-vibrator/service.cpp
 
 diff --git a/base.mk b/base.mk
-index 3d59ba6..82cae16 100644
+index 49c4da6..3a99248 100644
 --- a/base.mk
 +++ b/base.mk
-@@ -250,3 +250,7 @@ include build/make/target/product/gsi_release.mk
- # Protect deskclock from power save
- PRODUCT_COPY_FILES += \
- 	device/phh/treble/files/com.android.deskclock_whitelist.xml:system/etc/sysconfig/com.android.deskclock_whitelist.xml
+@@ -259,3 +259,7 @@ PRODUCT_PACKAGES += \
+ # Two-pane layout in Settings
+ PRODUCT_PACKAGES += \
+     androidx.window.extensions
 +
 +# Meizu vibrator
 +PRODUCT_PACKAGES += \
@@ -427,5 +427,5 @@ index cb44422..280ae2d 100644
 +allow hal_vibrator_default vib_strength_sysfs:dir rw_dir_perms;
 +allow hal_vibrator_default vib_strength_sysfs:file rw_file_perms;
 -- 
-2.25.1
+2.34.1
 

patches_treble_personal/device_phh_treble/0002-Revert-Include-sim-toolkit-app.patch

@@ -1,4 +1,4 @@
-From e7a31e6a0a55d45b56de3d6d99aae143bd20a4a2 Mon Sep 17 00:00:00 2001
+From cfc2fd859fb445535d9de131697c56f21d1cee48 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Thu, 28 Oct 2021 01:51:27 +0000
 Subject: [PATCH 2/3] Revert "Include sim toolkit app"
@@ -11,10 +11,10 @@ Change-Id: I1eb7f4bb070eea649b4cea6280299e629d1edb3d
  1 file changed, 3 deletions(-)
 
 diff --git a/base.mk b/base.mk
-index 82cae16..225fc0f 100644
+index 3a99248..877a408 100644
 --- a/base.mk
 +++ b/base.mk
-@@ -171,9 +171,6 @@ PRODUCT_PACKAGES += \
+@@ -172,9 +172,6 @@ PRODUCT_PACKAGES += \
  	xiaomi-motor \
  	oneplus-motor
  
@@ -25,5 +25,5 @@ index 82cae16..225fc0f 100644
  	resetprop_phh
  
 -- 
-2.25.1
+2.34.1
 

patches_treble_personal/device_phh_treble/0003-Revert-treble-Set-BOARD_EXT4_SHARE_DUP_BLOCKS-explic.patch

@@ -1,4 +1,4 @@
-From b4a2306f04fa26d24c6f5b6dd4f66a967c62974f Mon Sep 17 00:00:00 2001
+From 719b8e8406f6dbb72aac8029c37cdef445339292 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 8 Aug 2021 09:31:01 +0000
 Subject: [PATCH 3/3] Revert "treble: Set BOARD_EXT4_SHARE_DUP_BLOCKS
@@ -23,5 +23,5 @@ index 9d1d45e..8cde64f 100644
 -
  TARGET_NO_KERNEL_OVERRIDE := true
 -- 
-2.25.1
+2.34.1