venus: Patch some blobs to depend on libtinyxml2-v34.so

libtinyxml2 10.1.0 update which landed in BP4A contains ABI
incompatible changes which cause runtime crashes.

Change-Id: Icc67da5f754b0bb30dce6192b1e520fdf1349ac5

BoardConfig.mk

@@ -26,9 +26,16 @@ TARGET_KERNEL_CONFIG += vendor/venus_QGKI.config
 
 # Kernel modules
 BOOT_KERNEL_MODULES := \
+    adsp_loader_dlkm.ko \
+    apr_dlkm.ko \
     fts_touch_spi.ko \
     hwid.ko \
+    mmhardware_sysfs_dlkm.ko \
     msm_drm.ko \
+    q6_notifier_dlkm.ko \
+    q6_pdr_dlkm.ko \
+    qti_battery_charger_main.ko \
+    snd_event_dlkm.ko \
     xiaomi_touch.ko
 BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD := $(BOOT_KERNEL_MODULES)
 

device.mk

@@ -9,7 +9,7 @@ $(call inherit-product, device/xiaomi/sm8350-common/common.mk)
 
 # Inherit from miuicamera-venus
 $(call inherit-product-if-exists, device/xiaomi/miuicamera-venus/device.mk)
-$(call soong_config_set,camera,override_format_from_reserved,true)
+$(call soong_config_set_bool,camera,override_format_from_reserved,true)
 $(call soong_config_set,camera,package_name,com.android.camera)
 
 # Display Device Config
@@ -20,6 +20,28 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     libudfpshandler
 
+# Logging
+SPAMMY_LOG_TAGS := \
+    MiStcImpl \
+    SDM \
+    SDM-histogram \
+    SRE \
+    SensorService \
+    WifiHAL \
+    cnss-daemon \
+    libcitsensorservice@2.0-impl \
+    libsensor-displayalgo \
+    libsensor-parseRGB \
+    libsensor-ssccalapi \
+    sensors \
+    vendor.qti.hardware.display.composer-service \
+    vendor.xiaomi.sensor.citsensorservice@2.0-service
+
+ifneq ($(TARGET_BUILD_VARIANT),eng)
+PRODUCT_VENDOR_PROPERTIES += \
+    $(foreach tag,$(SPAMMY_LOG_TAGS),log.tag.$(tag)=W)
+endif
+
 # Overlays
 DEVICE_PACKAGE_OVERLAYS += \
     $(LOCAL_PATH)/overlay \

evolution.dependencies

@@ -15,6 +15,10 @@
     "repository": "hardware_xiaomi",
     "target_path": "hardware/xiaomi"
   },
+  {
+    "repository": "hardware_dolby",
+    "target_path": "hardware/dolby"
+  },
   {
     "repository": "device_xiaomi_miuicamera-venus",
     "target_path": "device/xiaomi/miuicamera-venus"
@@ -23,12 +27,14 @@
     "repository": "vendor_xiaomi_miuicamera-venus",
     "target_path": "vendor/xiaomi/miuicamera-venus"
   },
-  {
-    "repository": "packages_apps_ViPER4AndroidFX",
-    "target_path": "packages/apps/ViPER4AndroidFX"
-  },
   {
     "repository": "kernel_xiaomi_venus",
     "target_path": "kernel/xiaomi/sm8350"
+  },
+  {
+    "repository": "LineageOS/android_hardware_sony_timekeep",
+    "target_path": "hardware/sony/timekeep",
+    "remote": "github-non-los",
+    "branch": "lineage-22.2"
   }
 ]

extract-files.py

@@ -38,8 +38,8 @@ lib_fixups: lib_fixups_user_type = {
 blob_fixups: blob_fixups_user_type = {
     'vendor/etc/camera/pureShot_parameter.xml': blob_fixup()
         .regex_replace(r'=(\d+)>', r'="\1">'),
-    'vendor/etc/libnfc-nxp.conf': blob_fixup()
-        .regex_replace(r'NXP_T4T_NFCEE_ENABLE=0x01', r'NXP_T4T_NFCEE_ENABLE=0x00'),
+    ('vendor/lib/hw/audio.primary.lahaina.so', 'vendor/lib/libaudioroute_ext.so'): blob_fixup()
+        .replace_needed('libaudioroute.so', 'libaudioroute-v34.so'),
     'vendor/lib64/hw/camera.qcom.so': blob_fixup()
         .binary_regex_replace(b'\x73\x74\x5F\x6C\x69\x63\x65\x6E\x73\x65\x2E\x6C\x69\x63', b'\x63\x61\x6D\x65\x72\x61\x5F\x63\x6E\x66\x2E\x74\x78\x74')
         .add_needed('libprocessgroup_shim.so'),
@@ -66,6 +66,10 @@ blob_fixups: blob_fixups_user_type = {
         .sig_replace('8D 0A 00 94', '1F 20 03 D5'),
     'vendor/lib64/vendor.xiaomi.hardware.cameraperf@1.0-impl.so': blob_fixup()
         .sig_replace('21 00 80 52 7C 00 00 94', '21 00 80 52 1F 20 03 D5'),
+    (
+        'vendor/lib/libaudiocloudctrl.so',
+    ): blob_fixup()
+        .replace_needed('libtinyxml2.so', 'libtinyxml2-v34.so'),
 }  # fmt: skip
 
 module = ExtractUtilsModule(

overlay/frameworks/base/core/res/res/values/config.xml

@@ -70,114 +70,114 @@
          array. The brightness values must be non-negative and non-decreasing. This must be
          overridden in platform specific overlays -->
     <array name="config_autoBrightnessDisplayValuesNits">
-        <item>4.5</item>
-        <item>6.6</item>
-        <item>8</item>
-        <item>20</item>
-        <item>24.3</item>
-        <item>29.7</item>
-        <item>34</item>
-        <item>46</item>
-        <item>59</item>
-        <item>76</item>
-        <item>81</item>
-        <item>82</item>
-        <item>82</item>
-        <item>82</item>
-        <item>83</item>
-        <item>83</item>
-        <item>83</item>
-        <item>84</item>
-        <item>84</item>
-        <item>85</item>
-        <item>85</item>
-        <item>85</item>
-        <item>85</item>
-        <item>86</item>
-        <item>86</item>
-        <item>87</item>
-        <item>89</item>
-        <item>90</item>
-        <item>91</item>
-        <item>93</item>
-        <item>94</item>
-        <item>96</item>
-        <item>97</item>
-        <item>99</item>
-        <item>100</item>
-        <item>101</item>
-        <item>104</item>
-        <item>105</item>
-        <item>106</item>
-        <item>108</item>
-        <item>109</item>
-        <item>111</item>
-        <item>112</item>
-        <item>114</item>
-        <item>116</item>
-        <item>137</item>
-        <item>157</item>
-        <item>180</item>
-        <item>205</item>
-        <item>226</item>
-        <item>257</item>
-        <item>280</item>
-        <item>295</item>
-        <item>369</item>
-        <item>400</item>
-        <item>416.7</item>
-        <item>433.3</item>
-        <item>450</item>
+        <item>5.4</item>
+        <item>7.5</item>
+        <item>8.9</item>
+        <item>20.9</item>
+        <item>25.2</item>
+        <item>30.5</item>
+        <item>34.8</item>
+        <item>46.8</item>
+        <item>59.8</item>
+        <item>76.8</item>
+        <item>81.7</item>
+        <item>82.7</item>
+        <item>82.7</item>
+        <item>82.7</item>
+        <item>83.7</item>
+        <item>83.7</item>
+        <item>83.7</item>
+        <item>84.7</item>
+        <item>84.7</item>
+        <item>85.7</item>
+        <item>85.7</item>
+        <item>85.7</item>
+        <item>85.7</item>
+        <item>86.7</item>
+        <item>86.7</item>
+        <item>87.7</item>
+        <item>89.7</item>
+        <item>90.7</item>
+        <item>91.7</item>
+        <item>93.7</item>
+        <item>94.7</item>
+        <item>96.7</item>
+        <item>97.7</item>
+        <item>99.7</item>
+        <item>100.7</item>
+        <item>101.7</item>
+        <item>104.7</item>
+        <item>105.7</item>
+        <item>106.7</item>
+        <item>108.7</item>
+        <item>109.7</item>
+        <item>111.7</item>
+        <item>112.7</item>
+        <item>114.7</item>
+        <item>116.7</item>
+        <item>137.6</item>
+        <item>157.6</item>
+        <item>180.6</item>
+        <item>210.5</item>
+        <item>226.5</item>
+        <item>257.4</item>
+        <item>280.4</item>
+        <item>295.3</item>
+        <item>369.2</item>
+        <item>400.1</item>
+        <item>416.8</item>
+        <item>433.4</item>
+        <item>450.0</item>
         <item>466.7</item>
         <item>483.3</item>
-        <item>500</item>
-        <item>512.5</item>
-        <item>525</item>
-        <item>537.5</item>
-        <item>550</item>
-        <item>562.5</item>
-        <item>575</item>
-        <item>587.5</item>
-        <item>600</item>
-        <item>610</item>
-        <item>620</item>
-        <item>630</item>
-        <item>640</item>
-        <item>650</item>
-        <item>660</item>
-        <item>670</item>
-        <item>680</item>
-        <item>690</item>
-        <item>700</item>
-        <item>705</item>
-        <item>710</item>
-        <item>715</item>
-        <item>720</item>
-        <item>725</item>
-        <item>730</item>
-        <item>735</item>
-        <item>740</item>
-        <item>745</item>
-        <item>750</item>
-        <item>755</item>
-        <item>760</item>
-        <item>765</item>
-        <item>770</item>
-        <item>775</item>
-        <item>800</item>
-        <item>816.7</item>
-        <item>833.3</item>
-        <item>850</item>
-        <item>866.7</item>
-        <item>883.3</item>
-        <item>900</item>
-        <item>914.3</item>
-        <item>928.6</item>
-        <item>942.9</item>
-        <item>957.1</item>
-        <item>971.4</item>
-        <item>985.7</item>
-        <item>1000</item>
+        <item>499.9</item>
+        <item>512.4</item>
+        <item>524.9</item>
+        <item>537.4</item>
+        <item>555.0</item>
+        <item>566.3</item>
+        <item>576.8</item>
+        <item>590.3</item>
+        <item>601.7</item>
+        <item>611.7</item>
+        <item>621.7</item>
+        <item>631.7</item>
+        <item>643.7</item>
+        <item>649.6</item>
+        <item>659.6</item>
+        <item>669.6</item>
+        <item>679.6</item>
+        <item>689.6</item>
+        <item>703.6</item>
+        <item>704.5</item>
+        <item>709.5</item>
+        <item>714.5</item>
+        <item>719.5</item>
+        <item>724.5</item>
+        <item>729.5</item>
+        <item>734.5</item>
+        <item>739.5</item>
+        <item>744.5</item>
+        <item>749.5</item>
+        <item>754.4</item>
+        <item>759.4</item>
+        <item>764.4</item>
+        <item>769.4</item>
+        <item>774.4</item>
+        <item>799.4</item>
+        <item>816.0</item>
+        <item>832.6</item>
+        <item>849.3</item>
+        <item>865.9</item>
+        <item>882.5</item>
+        <item>899.2</item>
+        <item>913.4</item>
+        <item>927.7</item>
+        <item>942.0</item>
+        <item>956.2</item>
+        <item>970.4</item>
+        <item>984.7</item>
+        <item>999.0</item>
     </array>
 
     <!-- Array of light sensor lux values to define our levels for auto backlight brightness support.
@@ -360,7 +360,7 @@
 
     <!-- The maximum range of gamma adjustment possible using the screen
          auto-brightness adjustment setting. -->
-    <fraction name="config_autoBrightnessAdjustmentMaxGamma">100%</fraction>
+    <fraction name="config_autoBrightnessAdjustmentMaxGamma">105%</fraction>
 
     <!-- Stability requirements in milliseconds for accepting a new brightness level.  This is used
          for debouncing the light sensor.  Different constants are used to debounce the light sensor
@@ -368,7 +368,7 @@
          brightness changes occur in response to an observed change in light level that exceeds the
          hysteresis threshold. -->
     <integer name="config_autoBrightnessBrighteningLightDebounce">1000</integer>
-    <integer name="config_autoBrightnessDarkeningLightDebounce">1000</integer>
+    <integer name="config_autoBrightnessDarkeningLightDebounce">2000</integer>
 
     <!-- Minimum screen brightness setting allowed by power manager.
          The user is forbidden from setting the brightness below this level.
@@ -438,6 +438,19 @@
         @left
     </string>
 
+    <!-- A string config in svg path format for the main display shape.
+         (@see https://www.w3.org/TR/SVG/paths.html#PathData).
+
+         This config must be set unless:
+         1. {@link Configuration#isScreenRound} is true which means the display shape is circular
+            and the system will auto-generate a circular shape.
+         2. The display has no rounded corner and the system will auto-generate a rectangular shape.
+         (@see DisplayShape#createDefaultDisplayShape)
+
+         Note: If the display supports multiple resolutions, please define the path config based on
+         the highest resolution so that it can be scaled correctly in each resolution. -->
+    <string name="config_mainDisplayShape" translatable="false">M 243,0 L 1197,0 S 1280.7,-3.232 1325,18 C 1346.3,28.211 1376.426,43.96 1409,91 C 1445.328,143.462 1440,243 1440,243 L 1440,3006 S 1442.227,3072.916 1418,3113 C 1392.5,3155.185 1370.563,3165.773 1355,3176 C 1316.289,3201.438 1246,3200 1246,3200 L 194,3200 S 123.711,3201.438 85,3176 C 69.437,3165.773 47.5,3155.185 22,3113 C -2.227,3072.916 0,3006 0,3006 L 0,243 S -5.328,143.462 31,91 C 63.574,43.96 93.7,28.211 115,18 C 159.3,-3.232 243,0 243,0 Z</string>
+
     <!-- Whether the display cutout region of the main built-in display should be forced to
          black in software (to avoid aliasing or emulate a cutout that is not physically existent).
     -->
@@ -471,6 +484,13 @@
 
     <!-- How long it takes for the HW to start illuminating after the illumination is requested. -->
     <integer name="config_udfps_illumination_transition_ms">0</integer>
+
+    <!-- Whether to enable fp unlock when screen turns off on udfps devices -->
+    <bool name="config_screen_off_udfps_enabled">true</bool>
+
+    <!-- Default value for fp screen off unlock toggle, it only works for the devices that support
+         fp screen off unlock-->
+    <bool name="config_screen_off_udfps_default_on">true</bool>
 </resources>
 
 

overlay/packages/apps/Settings/res/values/evolution_strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2019-2024 Evolution X
+     Copyright (C) 2019-2025 Evolution X
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

proprietary-files.txt

@@ -103,7 +103,7 @@ vendor/lib/liba2dpoffload.so
 vendor/lib/libadm.so
 vendor/lib/libaudio_log_utils.so
 vendor/lib/libaudioalsa.so
-vendor/lib/libaudiocloudctrl.so
+vendor/lib/libaudiocloudctrl.so|bca9cc142b0b021a8011434fb319a80c4ed5b848
 vendor/lib/libaudioconfigstore.so
 vendor/lib/libaudioparsers.so
 vendor/lib/libaudioroute_ext.so
@@ -188,6 +188,7 @@ vendor/lib64/hw/camera.xiaomi.so
 vendor/lib64/hw/com.qti.chi.override.so
 vendor/lib64/libBlinkStub.so
 vendor/lib64/libI420colorconvert.so
+vendor/lib64/libQnnHtpStub.so
 vendor/lib64/libSNPE.so
 vendor/lib64/libaidenoiser.so
 vendor/lib64/libalAILDC.so;DISABLE_CHECKELF
@@ -647,14 +648,6 @@ vendor/lib64/sensors.mius.proximity.so
 vendor/lib64/sensors.ssc.so
 vendor/lib64/sensors.touch.detect.so
 
-# Sensors (citsensor)
-vendor/bin/hw/vendor.xiaomi.hardware.citsensorservice@1.1-service
-vendor/etc/init/vendor.xiaomi.hardware.citsensorservice@1.1-service.rc
-vendor/etc/vintf/manifest/vendor.xiaomi.hardware.citsensorservice@1.1-service.xml
-vendor/lib64/hw/vendor.xiaomi.hardware.citsensorservice@1.1-impl.so
-vendor/lib64/vendor.xiaomi.hardware.citsensorservice@1.0.so
-vendor/lib64/vendor.xiaomi.hardware.citsensorservice@1.1.so
-
 # Sensors configs
 vendor/etc/sensor_diag.cfg
 vendor/etc/sensors/config/ak991x_dri_0.json

vendorsetup.sh

@@ -0,0 +1 @@
+cd h*/l*/c* && git fetch https://github.com/yaap/hardware_lineage_compat && git cherry-pick ff324381288b4e097e22dc523eb2e28b5eb14f56 && cd ../../..