Changes for February 2022, syncing up to v402

2022-02-12 13:14:08 +00:00
parent d4c58201c8
commit f16874a663
124 changed files with 1330 additions and 964 deletions
--- a/patches_treble_personal/device_phh_treble/0001-Add-Meizu-18-vibrator-support.patch
+++ b/patches_treble_personal/device_phh_treble/0001-Add-Meizu-18-vibrator-support.patch
@@ -1,4 +1,4 @@
-From d18f52a69d550666acab021aa3d6261c83cf9299 Mon Sep 17 00:00:00 2001
+From d457d9a320d5b87cb994b2e0d09fc1ef35fad1fc 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/4] Add Meizu 18 vibrator support
@@ -10,7 +10,7 @@ Thanks to:

 Change-Id: Iecf12cd814e8773abfd78a19f98e31125a73761a
 ---
- base.mk                                       |   3 +
+ base.mk                                       |   5 +-
 framework_manifest.xml                        |  10 ++
 hal/meizu-vibrator/Android.bp                 |  31 ++++
 hal/meizu-vibrator/Vibrator.cpp               | 140 ++++++++++++++++++
@@ -19,7 +19,7 @@ Change-Id: Iecf12cd814e8773abfd78a19f98e31125a73761a
 hal/meizu-vibrator/service.cpp                |  72 +++++++++
 sepolicy/file_contexts                        |   1 +
 sepolicy/hal.te                               |  11 ++
- 9 files changed, 332 insertions(+)
+ 9 files changed, 333 insertions(+), 1 deletion(-)
 create mode 100644 hal/meizu-vibrator/Android.bp
 create mode 100644 hal/meizu-vibrator/Vibrator.cpp
 create mode 100644 hal/meizu-vibrator/Vibrator.h
@@ -27,16 +27,19 @@ Change-Id: Iecf12cd814e8773abfd78a19f98e31125a73761a
 create mode 100644 hal/meizu-vibrator/service.cpp

 diff --git a/base.mk b/base.mk
-index a372603..a537411 100644
+index 057ad0c..7e1cdc9 100644
 --- a/base.mk
 +++ b/base.mk
-@@ -218,4 +218,7 @@ PRODUCT_COPY_FILES += \
- 	device/phh/treble/proprietary-files/gome/fs16xx_01s_right.preset:system/phh/gome/fs16xx_01s_right.preset \
- 	device/phh/treble/proprietary-files/umidigi/fs16xx_01s_mono.preset:system/phh/umidigi/fs16xx_01s_mono.preset
+@@ -221,6 +221,9 @@ PRODUCT_COPY_FILES += \
+ PRODUCT_PACKAGES += phh-ota
 
+ PRODUCT_PACKAGES += \
+-    xiaomi-touch
+	xiaomi-touch
+
 +PRODUCT_PACKAGES += \
 +	android.hardware.vibrator@1.3-service.meizu
-+
+ 
 include build/make/target/product/gsi_release.mk
 diff --git a/framework_manifest.xml b/framework_manifest.xml
 index cb37b49..1b45b4a 100644
@@ -396,10 +399,10 @@ index 0000000..1405dfb
 +    joinRpcThreadpool();
 +}
 diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
-index 5e39d5b..41d395d 100644
+index 11dd447..faa7256 100644
 --- a/sepolicy/file_contexts
 +++ b/sepolicy/file_contexts
-@@ -13,6 +13,7 @@
+@@ -14,6 +14,7 @@
 
 /system/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.oppo.compat u:object_r:hal_fingerprint_oppo_compat_exec:s0
 /system/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.oplus.compat u:object_r:hal_fingerprint_oppo_compat_exec:s0
--- a/patches_treble_personal/device_phh_treble/0002-Only-use-meizu-vibrator-on-Meizu-18.patch
+++ b/patches_treble_personal/device_phh_treble/0002-Only-use-meizu-vibrator-on-Meizu-18.patch
@@ -1,4 +1,4 @@
-From 0cca559de53a92eac0e6810ebed31967d70d4ca0 Mon Sep 17 00:00:00 2001
+From 72db86f75fae20fef140c4760383acf21902002a Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 27 Jun 2021 05:21:38 +0000
 Subject: [PATCH 2/4] Only use meizu-vibrator on Meizu 18
@@ -12,8 +12,8 @@ Change-Id: I97fc52a98a77aa72bbd5601f36abc0cf18efbaea
 hal/meizu-vibrator/Android.bp                         |  1 +
 .../android.hardware.vibrator@1.3-service.meizu.xml   | 11 +++++++++++
 hal/meizu-vibrator/manifest_dummy.xml                 |  3 +++
- rw-system.sh                                          | 10 ++++++++--
- 5 files changed, 23 insertions(+), 12 deletions(-)
+ rw-system.sh                                          |  6 ++++++
+ 5 files changed, 21 insertions(+), 10 deletions(-)
 create mode 100644 hal/meizu-vibrator/android.hardware.vibrator@1.3-service.meizu.xml
 create mode 100644 hal/meizu-vibrator/manifest_dummy.xml

@@ -76,10 +76,10 @@ index 0000000..b34a10b
 +<manifest version="1.0" type="framework">
 +</manifest>
 diff --git a/rw-system.sh b/rw-system.sh
-index ee4df70..3ed1cdd 100644
+index 5e275af..e8bd30b 100644
 --- a/rw-system.sh
 +++ b/rw-system.sh
-@@ -356,6 +356,12 @@ if [ "$foundFingerprint" = false ];then
+@@ -355,6 +355,12 @@ if [ "$foundFingerprint" = false ];then
     mount -o bind system/phh/empty /system/etc/permissions/android.hardware.fingerprint.xml
 fi
 
@@ -92,24 +92,6 @@ index ee4df70..3ed1cdd 100644
 if ! grep android.hardware.bluetooth /vendor/manifest.xml && ! grep android.hardware.bluetooth /vendor/etc/vintf/manifest.xml; then
     mount -o bind system/phh/empty /system/etc/permissions/android.hardware.bluetooth.xml
     mount -o bind system/phh/empty /system/etc/permissions/android.hardware.bluetooth_le.xml
-@@ -427,7 +433,7 @@ if getprop ro.build.overlay.deviceid |grep -q -e CPH1859 -e CPH1861 -e RMX1811 -
-     setprop persist.sys.qcom-brightness "$(cat /sys/class/leds/lcd-backlight/max_brightness)"
- fi
- 
-if getprop ro.build.overlay.deviceid |grep -iq -e RMX2020 -e RMX2027 -e RMX2040 -e RMX2193 -e RMX2191;then	
-+if getprop ro.build.overlay.deviceid |grep -iq -e RMX2020 -e RMX2027 -e RMX2040 -e RMX2193 -e RMX2191;then
-     setprop persist.sys.qcom-brightness 2047
-     setprop persist.sys.overlay.devinputjack true
-     setprop persist.sys.phh.fingerprint.nocleanup true
-@@ -940,7 +946,7 @@ if (getprop ro.vendor.build.fingerprint;getprop ro.odm.build.fingerprint) |grep
-     setprop persist.sys.phh.fod.bbk true
- fi
- 
-if getprop ro.build.overlay.deviceid |grep -iq -e RMX1941 -e RMX1945 -e RMX1943 -e RMX1942;then	
-+if getprop ro.build.overlay.deviceid |grep -iq -e RMX1941 -e RMX1945 -e RMX1943 -e RMX1942;then
-     setprop persist.sys.qcom-brightness "$(cat /sys/class/leds/lcd-backlight/max_brightness)"
-     setprop persist.sys.phh.mainkeys 0
- fi
 -- 
 2.25.1

--- a/patches_treble_personal/device_phh_treble/0003-Revert-Include-sim-toolkit-app.patch
+++ b/patches_treble_personal/device_phh_treble/0003-Revert-Include-sim-toolkit-app.patch
@@ -1,4 +1,4 @@
-From 0ff36ed6acdc7addbc61fff048b6f2b028f615c0 Mon Sep 17 00:00:00 2001
+From a13abcf3906e73f9a7a1310cbab867488e7627d5 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 3/4] Revert "Include sim toolkit app"
@@ -11,7 +11,7 @@ Change-Id: I1eb7f4bb070eea649b4cea6280299e629d1edb3d
 1 file changed, 3 deletions(-)

 diff --git a/base.mk b/base.mk
-index a537411..bc5ba37 100644
+index 7e1cdc9..09952c8 100644
 --- a/base.mk
 +++ b/base.mk
@@ -157,9 +157,6 @@ PRODUCT_PACKAGES += \
--- a/patches_treble_personal/device_phh_treble/0004-Revert-treble-Set-BOARD_EXT4_SHARE_DUP_BLOCKS-explic.patch
+++ b/patches_treble_personal/device_phh_treble/0004-Revert-treble-Set-BOARD_EXT4_SHARE_DUP_BLOCKS-explic.patch
@@ -1,4 +1,4 @@
-From dfb80c5cb89c33b2be845fec1cca084399a7f71f Mon Sep 17 00:00:00 2001
+From 43e4d35bd355a04b3e1692f03400fe853b581ee5 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 4/4] Revert "treble: Set BOARD_EXT4_SHARE_DUP_BLOCKS