h

Revert "redwood: sepolicy: Remove commonized labels"
This reverts commit db563fedf4.
2026-01-17 20:07:48 +05:30 · 2026-01-17 20:06:04 +05:30 · 2026-01-16 21:03:59 +05:30 · 2026-01-16 21:00:12 +05:30 · 2026-01-16 20:50:23 +05:30 · 2026-01-16 20:49:56 +05:30
40 changed files with 477 additions and 951 deletions
--- a/Android.bp
+++ b/Android.bp
@@ -6,9 +6,6 @@
 soong_namespace {
    imports: [
        "hardware/xiaomi",
-        "hardware/google/interfaces",
-        "hardware/google/pixel",
-        "hardware/lineage/interfaces/power-libperfmgr",
    ],
 }

--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -5,10 +5,7 @@
 #

 DEVICE_PATH := device/xiaomi/redwood
-
-BUILD_BROKEN_DUP_RULES := true
-
-BOARD_VENDOR := xiaomi
+KERNEL_PATH := device/xiaomi/redwood-kernel

 # A/B
 AB_OTA_PARTITIONS += \
@@ -49,11 +46,6 @@ TARGET_BOOTLOADER_BOARD_NAME := redwood
 # Bootloader
 TARGET_NO_BOOTLOADER := true

-# Camera
-TARGET_CAMERA_SERVICE_EXT_LIB := //$(DEVICE_PATH):libcameraservice_extension.xiaomi_redwood
-TARGET_CAMERA_OVERRIDE_FORMAT_FROM_RESERVED := true
-TARGET_CAMERA_PACKAGE_NAME := com.android.camera
-
 # Display
 TARGET_SCREEN_DENSITY := 440
 USE_OPENGL_RENDERER := true
@@ -67,12 +59,11 @@ BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := default
 # HIDL
 DEVICE_MATRIX_FILE := $(DEVICE_PATH)/hidl/compatibility_matrix.xml

-DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
+DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += \
    $(DEVICE_PATH)/hidl/vendor_framework_compatibility_matrix.xml \
-    $(DEVICE_PATH)/hidl/xiaomi_framework_compatibility_matrix.xml \
-    vendor/lineage/config/device_framework_matrix.xml
+    $(DEVICE_PATH)/hidl/xiaomi_framework_compatibility_matrix.xml

-DEVICE_MANIFEST_FILE := \
+DEVICE_MANIFEST_FILE += \
    $(DEVICE_PATH)/hidl/manifest_lahaina.xml \
    $(DEVICE_PATH)/hidl/manifest_xiaomi.xml \
    $(if $(TARGET_NFC_SUPPORTED_SKUS),$(DEVICE_PATH)/hidl/manifest_no_nfc.xml,)
@@ -95,9 +86,6 @@ BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION)

 TARGET_KERNEL_ADDITIONAL_FLAGS := TARGET_PRODUCT=$(PRODUCT_DEVICE)
 TARGET_KERNEL_NO_GCC := true
-TARGET_KERNEL_SOURCE := kernel/xiaomi/redwood
-TARGET_KERNEL_CONFIG := vendor/xiaomi-qgki_defconfig vendor/debugfs.config
- TARGET_KERNEL_CONFIG += vendor/redwood.config

 BOARD_KERNEL_CMDLINE += androidboot.console=ttyMSM0
 BOARD_KERNEL_CMDLINE += androidboot.hardware=qcom
@@ -115,11 +103,12 @@ BOARD_KERNEL_CMDLINE += ip6table_raw.raw_before_defrag=1
 BOARD_KERNEL_CMDLINE += kpti=off
 BOARD_KERNEL_CMDLINE += androidboot.init_fatal_reboot_target=recovery

-# Lineage Health
-TARGET_HEALTH_CHARGING_CONTROL_CHARGING_PATH := /sys/class/qcom-battery/input_suspend
-TARGET_HEALTH_CHARGING_CONTROL_CHARGING_ENABLED := 0
-TARGET_HEALTH_CHARGING_CONTROL_CHARGING_DISABLED := 1
-TARGET_HEALTH_CHARGING_CONTROL_SUPPORTS_BYPASS := false
+# Kernel Pre-compiled
+TARGET_NO_KERNEL_OVERRIDE := true
+TARGET_KERNEL_SOURCE := $(KERNEL_PATH)/kernel-headers
+BOARD_PREBUILT_DTBOIMAGE := $(KERNEL_PATH)/dtbo.img
+BOARD_PREBUILT_DTBIMAGE_DIR := $(KERNEL_PATH)/dtb
+BOARD_MKBOOTIMG_ARGS += --dtb $(BOARD_PREBUILT_DTBIMAGE_DIR)/01_dtbdump_Qualcomm_Technologies,_Inc._Yupik_SoC.dtb

 # Partitions
 BOARD_FLASH_BLOCK_SIZE := 262144 # (BOARD_KERNEL_PAGESIZE * 64)
@@ -167,9 +156,6 @@ TARGET_USERIMAGES_SPARSE_F2FS_DISABLED := true
 # Platform
 TARGET_BOARD_PLATFORM := lahaina

-# Power
-TARGET_POWER_LIBPERFMGR_MODE_EXTENSION_LIB := //$(DEVICE_PATH):libperfmgr-ext-xiaomi
-
 # Properties
 TARGET_ODM_PROP += $(DEVICE_PATH)/odm.prop
 TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop
@@ -191,10 +177,9 @@ TARGET_USERIMAGES_USE_F2FS := true
 ENABLE_VENDOR_RIL_SERVICE := true

 # Security patch level
-VENDOR_SECURITY_PATCH := 2025-06-01
+VENDOR_SECURITY_PATCH := 2025-11-01

 # Sepolicy
-include device/lineage/sepolicy/libperfmgr/sepolicy.mk
 include device/qcom/sepolicy_vndr/SEPolicy.mk

 SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/private
@@ -217,9 +202,9 @@ BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX_LOCATION := 1
 # WiFi
 BOARD_WLAN_DEVICE := qcwcn
 BOARD_HOSTAPD_DRIVER := NL80211
-BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE)
+BOARD_HOSTAPD_PRIVATE_LIB := //hardware/qcom-caf/wlan/qcwcn:lib_driver_cmd_$(BOARD_WLAN_DEVICE)
 BOARD_WPA_SUPPLICANT_DRIVER := NL80211
-BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE)
+BOARD_WPA_SUPPLICANT_PRIVATE_LIB := //hardware/qcom-caf/wlan/qcwcn:lib_driver_cmd_$(BOARD_WLAN_DEVICE)
 WIFI_DRIVER_DEFAULT := wlan
 WIFI_DRIVER_STATE_CTRL_PARAM := "/dev/wlan"
 WIFI_DRIVER_STATE_OFF := "OFF"
--- a/audio/audio_effects.xml
+++ b/audio/audio_effects.xml
@@ -30,6 +30,9 @@
    <libraries>
        <library name="bundle" path="libbundlewrapper.so"/>
        <library name="reverb" path="libreverbwrapper.so"/>
+        <library name="qcbassboost" path="libqcbassboost.so"/>
+        <library name="qcvirt" path="libqcvirt.so"/>
+        <library name="qcreverb" path="libqcreverb.so"/>
        <library name="visualizer_sw" path="libvisualizer.so"/>
        <library name="visualizer_hw" path="libqcomvisualizer.so"/>
        <library name="downmix" path="libdownmix.so"/>
@@ -41,14 +44,27 @@
        <library name="volume_listener" path="libvolumelistener.so"/>
        <library name="audiosphere" path="libasphere.so"/>
        <library name="shoebox" path="libshoebox.so"/>
+        <!--DOLBY DAP-->
+        <library name="dap" path="libswdap.so"/>
+        <library name="dvl" path="libdlbvol.so"/>
+        <!--DOLBY END-->
+        <!--DOLBY GAME-->
+        <library name="gamedap" path="libswgamedap.so"/>
+        <!--DOLBY END-->
+        <!--DOLBY VQE-->
+        <library name="vqe" path="libswvqe.so"/>
+        <!--DOLBY END-->
+        <!--Spatial Audio-->
+        <library name="spatializer" path="libspatialaudio.so"/>
+	<!--Spatial Audio-->
    </libraries>
    <effects>
        <effectProxy name="bassboost" library="proxy" uuid="14804144-a5ee-4d24-aa88-0002a5d5c51b">
-            <libsw library="bundle" uuid="8631f300-72e2-11df-b57e-0002a5d5c51b"/>
+            <libsw library="qcbassboost" uuid="23aca180-44bd-11e2-bcfd-0800200c9a66"/>
            <libhw library="offload_bundle" uuid="2c4a8c24-1581-487f-94f6-0002a5d5c51b"/>
        </effectProxy>
        <effectProxy name="virtualizer" library="proxy" uuid="d3467faa-acc7-4d34-acaf-0002a5d5c51b">
-            <libsw library="bundle" uuid="1d4033c0-8557-11df-9f2d-0002a5d5c51b"/>
+            <libsw library="qcvirt" uuid="e6c98a16-22a3-11e2-b87b-f23c91aec05e"/>
            <libhw library="offload_bundle" uuid="509a4498-561a-4bea-b3b1-0002a5d5c51b"/>
        </effectProxy>
        <effectProxy name="equalizer" library="proxy" uuid="c8e70ecd-48ca-456e-8a4f-0002a5d5c51b">
@@ -57,19 +73,19 @@
        </effectProxy>
        <effect name="volume" library="bundle" uuid="119341a0-8469-11df-81f9-0002a5d5c51b"/>
        <effectProxy name="reverb_env_aux" library="proxy" uuid="48404ac9-d202-4ccc-bf84-0002a5d5c51b">
-            <libsw library="reverb" uuid="4a387fc0-8ab3-11df-8bad-0002a5d5c51b"/>
+            <libsw library="qcreverb" uuid="a8c1e5f3-293d-43cd-95ec-d5e26c02e217"/>
            <libhw library="offload_bundle" uuid="79a18026-18fd-4185-8233-0002a5d5c51b"/>
        </effectProxy>
        <effectProxy name="reverb_env_ins" library="proxy" uuid="b707403a-a1c1-4291-9573-0002a5d5c51b">
-            <libsw library="reverb" uuid="c7a511a0-a3bb-11df-860e-0002a5d5c51b"/>
+            <libsw library="qcreverb" uuid="791fff8b-8129-4655-83a4-59bc61034c3a"/>
            <libhw library="offload_bundle" uuid="eb64ea04-973b-43d2-8f5e-0002a5d5c51b"/>
        </effectProxy>
        <effectProxy name="reverb_pre_aux" library="proxy" uuid="1b78f587-6d1c-422e-8b84-0002a5d5c51b">
-            <libsw library="reverb" uuid="f29a1400-a3bb-11df-8ddc-0002a5d5c51b"/>
+            <libsw library="qcreverb" uuid="53ef1db5-c0c0-445b-b060-e34d20ebb70a"/>
            <libhw library="offload_bundle" uuid="6987be09-b142-4b41-9056-0002a5d5c51b"/>
        </effectProxy>
        <effectProxy name="reverb_pre_ins" library="proxy" uuid="f3e178d2-ebcb-408e-8357-0002a5d5c51b">
-            <libsw library="reverb" uuid="172cdf00-a3bc-11df-a72f-0002a5d5c51b"/>
+            <libsw library="qcreverb" uuid="b08a0e38-22a5-11e2-b87b-f23c91aec05e"/>
            <libhw library="offload_bundle" uuid="aa2bebf6-47cf-4613-9bca-0002a5d5c51b"/>
        </effectProxy>
        <effectProxy name="visualizer" library="proxy" uuid="1d0a1a53-7d5d-48f2-8e71-27fbd10d842c">
@@ -89,23 +105,29 @@
        <effect name="notification_helper" library="volume_listener" uuid="0b776dde-0590-11e5-81ba-0025b32654a0"/>
        <effect name="audiosphere" library="audiosphere" uuid="184e62ab-2d19-4364-9d1b-c0a40733866c"/>
        <effect name="shoebox" library="shoebox" uuid="1eab784c-1a36-4b2a-b7fc-e34c44cab89e"/>
+        <!--DOLBY DAP-->
+        <effect name="dap" library="dap" uuid="9d4921da-8225-4f29-aefa-39537a04bcaa"/>
+        <effect name="dlb_music_listener" library="dvl" uuid="40f66c8b-5aa5-4345-8919-53ec431aaa98"/>
+        <effect name="dlb_ring_listener" library="dvl" uuid="21d14087-558a-4f21-94a9-5002dce64bce"/>
+        <effect name="dlb_alarm_listener" library="dvl" uuid="6aff229c-30c6-4cc8-9957-dbfe5c1bd7f6"/>
+        <effect name="dlb_system_listener" library="dvl" uuid="874db4d8-051d-4b7b-bd95-a3bebc837e9e"/>
+        <effect name="dlb_notification_listener" library="dvl" uuid="1f0091e3-6ad8-40fe-9b09-5948f9a26e7e"/>
+        <effect name="dlb_voice_call_listener" library="dvl" uuid="58d13383-b41d-05df-d94e-bb23db293260"/>
+        <!--DOLBY END-->
+        <!--DOLBY GAME-->
+        <effect name="gamedap" library="gamedap" uuid="3783c334-d3a0-4d13-874f-0032e5fb80e2"/>
+        <!--DOLBY END-->
+        <!--DOLBY VQE-->
+        <effect name="vqe" library="vqe" uuid="64a0f614-7fa4-48b8-b081-d59dc954616f"/>
+        <!--DOLBY END-->
+        <!--Spatial Audio-->
+        <effect name="spatializer" library="spatializer" uuid="cc4677de-ff72-11eb-9a03-0242ac130003"/>
+	<!--Spatial Audio-->
    </effects>
    <postprocess>
-        <stream type="music">
-            <apply effect="music_helper"/>
-        </stream>
-        <stream type="ring">
-            <apply effect="ring_helper"/>
-        </stream>
-        <stream type="alarm">
-            <apply effect="alarm_helper"/>
-        </stream>
        <stream type="voice_call">
            <apply effect="voice_helper"/>
        </stream>
-        <stream type="notification">
-            <apply effect="notification_helper"/>
-        </stream>
    </postprocess>
    <preprocess>
        <stream type="voice_communication">
--- a/audio/audio_policy_configuration.xml
+++ b/audio/audio_policy_configuration.xml
@@ -113,6 +113,12 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                </mixPort>
                <mixPort name="hifi_playback" role="source" />
+                <!--Spatial Audio-->
+                <mixPort name="immersive_out" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
+                    <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                <!--Spatial Audio-->
+                </mixPort>
                <mixPort name="compress_passthrough" role="source"
                        flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING">
                </mixPort>
@@ -343,11 +349,11 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                <route type="mix" sink="Earpiece"
                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out"/>
                <route type="mix" sink="Speaker"
-                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out"/>
+                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,immersive_out"/>
                <route type="mix" sink="Wired Headset"
-                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,dsd_compress_passthrough"/>
+                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,dsd_compress_passthrough,immersive_out"/>
                <route type="mix" sink="Wired Headphones"
-                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,dsd_compress_passthrough"/>
+                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,dsd_compress_passthrough,immersive_out"/>
                <route type="mix" sink="Line"
                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out"/>
                <route type="mix" sink="HDMI"
@@ -361,9 +367,9 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                <route type="mix" sink="BT SCO Car Kit"
                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
                <route type="mix" sink="USB Device Out"
-                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,hifi_playback"/>
+                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,hifi_playback,immersive_out"/>
                <route type="mix" sink="USB Headset Out"
-                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,hifi_playback"/>
+                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,hifi_playback,immersive_out"/>
                <route type="mix" sink="Telephony Tx"
                       sources="voice_tx,incall_music_uplink"/>
                <route type="mix" sink="voice_rx"
--- a/configs/powerhint.json
+++ b/configs/powerhint.json
@@ -1,606 +0,0 @@
-{
-  "Nodes": [
-    {
-      "Name": "CPULittleClusterMaxFreq",
-      "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq",
-      "Values": [
-        "9999999",
-        "1612800"
-      ],
-      "DefaultIndex": 0,
-      "ResetOnInit": true
-    },
-    {
-      "Name": "CPULittleClusterMinFreq",
-      "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq",
-      "Values": [
-        "9999999",
-        "1708800",
-        "1305600",
-        "691200"
-      ],
-      "ResetOnInit": true
-    },
-    {
-      "Name": "CPULittleClusterUpRateLimit",
-      "Path": "/sys/devices/system/cpu/cpu0/cpufreq/schedutil/up_rate_limit_us",
-      "Values": [
-        "500",
-        "2000"
-      ],
-      "ResetOnInit": true
-    },
-    {
-      "Name": "CPULittleClusterDownRateLimit",
-      "Path": "/sys/devices/system/cpu/cpu0/cpufreq/schedutil/down_rate_limit_us",
-      "Values": [
-        "20000",
-        "2000"
-      ],
-      "ResetOnInit": true
-    },
-    {
-      "Name": "CPUBigClusterMaxFreq",
-      "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq",
-      "Values": [
-        "9999999",
-        "1324800"
-      ],
-      "DefaultIndex": 0,
-      "ResetOnInit": true
-    },
-    {
-      "Name": "CPUBigClusterMinFreq",
-      "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq",
-      "Values": [
-        "9999999",
-        "1324800",
-        "1075200",
-        "710400"
-      ],
-      "ResetOnInit": true
-    },
-    {
-      "Name": "CPUBigClusterUpRateLimit",
-      "Path": "/sys/devices/system/cpu/cpu4/cpufreq/schedutil/up_rate_limit_us",
-      "Values": [
-        "500",
-        "2000"
-      ],
-      "ResetOnInit": true
-    },
-    {
-      "Name": "CPUBigClusterDownRateLimit",
-      "Path": "/sys/devices/system/cpu/cpu4/cpufreq/schedutil/down_rate_limit_us",
-      "Values": [
-        "10000",
-        "2000"
-      ],
-      "ResetOnInit": true
-    },
-    {
-      "Name": "CPUBigPlusClusterMaxFreq",
-      "Path": "/sys/devices/system/cpu/cpu7/cpufreq/scaling_max_freq",
-      "Values": [
-        "9999999",
-        "1555200"
-      ],
-      "DefaultIndex": 0,
-      "ResetOnInit": true
-    },
-    {
-      "Name": "CPUBigPlusClusterMinFreq",
-      "Path": "/sys/devices/system/cpu/cpu7/cpufreq/scaling_min_freq",
-      "Values": [
-        "9999999",
-        "1075200",
-        "844800"
-      ],
-      "ResetOnInit": true
-    },
-    {
-      "Name": "CPUBigPlusClusterUpRateLimit",
-      "Path": "/sys/devices/system/cpu/cpu7/cpufreq/schedutil/up_rate_limit_us",
-      "Values": [
-        "500",
-        "2000"
-      ],
-      "ResetOnInit": true
-    },
-    {
-      "Name": "CPUBigPlusClusterDownRateLimit",
-      "Path": "/sys/devices/system/cpu/cpu7/cpufreq/schedutil/down_rate_limit_us",
-      "Values": [
-        "5000",
-        "2000"
-      ],
-      "ResetOnInit": true
-    },
-    {
-      "Name": "UclampTAMin",
-      "Path": "/dev/cpuctl/top-app/cpu.uclamp.min",
-      "Values": [
-        "0",
-        "25",
-        "50"
-      ],
-      "DefaultIndex": 0,
-      "ResetOnInit": true
-    },
-    {
-      "Name": "UclampTALatency",
-      "Path": "/dev/cpuctl/top-app/cpu.uclamp.latency_sensitive",
-      "Values": [
-        "1",
-        "0"
-      ],
-      "ResetOnInit": true
-    },
-    {
-      "Name": "UclampFgMin",
-      "Path": "/dev/cpuctl/foreground/cpu.uclamp.min",
-      "Values": [
-        "0",
-        "50"
-      ],
-      "DefaultIndex": 0,
-      "ResetOnInit": true
-    },
-    {
-      "Name": "SchedPreferSpread",
-      "Path": "/proc/sys/kernel/sched_prefer_spread",
-      "Values": [
-        "4",
-        "0"
-      ],
-      "ResetOnInit": true
-    },
-    {
-      "Name": "SchedBusyHystNs",
-      "Path": "/proc/sys/kernel/sched_busy_hyst_ns",
-      "Values": [
-        "99000000",
-        "3000000",
-        "0"
-      ],
-      "ResetOnInit": true
-    },
-    {
-      "Name": "SchedBusyHystEnableCPUs",
-      "Path": "/proc/sys/kernel/sched_busy_hysteresis_enable_cpus",
-      "Values": [
-        "255",
-        "15",
-        "0"
-      ],
-      "ResetOnInit": true
-    },
-    {
-      "Name": "SchedMinTaskUtilForBoost",
-      "Path": "/proc/sys/kernel/sched_min_task_util_for_boost",
-      "Values": [
-        "0",
-        "51"
-      ],
-      "ResetOnInit": true
-    },
-    {
-      "Name": "SchedMinTaskUtilForColoc",
-      "Path": "/proc/sys/kernel/sched_min_task_util_for_colocation",
-      "Values": [
-        "0",
-        "35"
-      ],
-      "ResetOnInit": true
-    },
-    {
-      "Name": "GPUMaxFreq",
-      "Path": "/sys/class/kgsl/kgsl-3d0/devfreq/max_freq",
-      "Values": [
-        "840000000",
-        "540000000",
-        "443000000"
-      ],
-      "DefaultIndex": 0,
-      "ResetOnInit": true
-    },
-    {
-      "Name": "GPUMinFreq",
-      "Path": "/sys/class/kgsl/kgsl-3d0/devfreq/min_freq",
-      "Values": [
-        "540000000",
-        "379000000",
-        "315000000"
-      ],
-      "ResetOnInit": true
-    },
-    {
-      "Name": "GPUForceRailOn",
-      "Path": "/sys/class/kgsl/kgsl-3d0/force_rail_on",
-      "Values": [
-        "1",
-        "0"
-      ],
-      "ResetOnInit": true
-    },
-    {
-      "Name": "GPUForceClkOn",
-      "Path": "/sys/class/kgsl/kgsl-3d0/force_clk_on",
-      "Values": [
-        "1",
-        "0"
-      ],
-      "ResetOnInit": true
-    },
-    {
-      "Name": "GPUIdleTimer",
-      "Path": "/sys/class/kgsl/kgsl-3d0/idle_timer",
-      "Values": [
-        "10000",
-        "58"
-      ],
-      "ResetOnInit": true
-    },
-    {
-      "Name": "CPUBWHystTriggerCount",
-      "Path": "/sys/class/devfreq/soc:qcom,cpu-cpu-llcc-bw/bw_hwmon/hyst_trigger_count",
-      "Values": [
-        "0",
-        "3"
-      ],
-      "ResetOnInit": true
-    },
-    {
-      "Name": "CPUBWHistMemory",
-      "Path": "/sys/class/devfreq/soc:qcom,cpu-cpu-llcc-bw/bw_hwmon/hist_memory",
-      "Values": [
-        "0",
-        "20"
-      ],
-      "ResetOnInit": true
-    },
-    {
-      "Name": "CPUBWHystLength",
-      "Path": "/sys/class/devfreq/soc:qcom,cpu-cpu-llcc-bw/bw_hwmon/hyst_length",
-      "Values": [
-        "0",
-        "10"
-      ],
-      "ResetOnInit": true
-    },
-    {
-      "Name": "CPUBWMinFreq",
-      "Path": "/sys/class/devfreq/soc:qcom,cpu-cpu-llcc-bw/min_freq",
-      "Values": [
-        "12298",
-        "9155",
-        "4577"
-      ],
-      "ResetOnInit": true
-    },
-    {
-      "Name": "LLCCBWMinFreq",
-      "Path": "/sys/class/devfreq/soc:qcom,cpu-llcc-ddr-bw/min_freq",
-      "Values": [
-        "6515",
-        "3879",
-        "762"
-      ],
-      "ResetOnInit": true
-    },
-    {
-      "Name": "PowerHALMainState",
-      "Path": "vendor.powerhal.state",
-      "Values": [
-        "SUSTAINED_PERFORMANCE",
-        ""
-      ],
-      "Type": "Property"
-    },
-    {
-      "Name": "PowerHALRenderingState",
-      "Path": "vendor.powerhal.rendering",
-      "Values": [
-        "EXPENSIVE_RENDERING",
-        ""
-      ],
-      "Type": "Property"
-    }
-  ],
-  "Actions": [
-    {
-      "PowerHint": "SUSTAINED_PERFORMANCE",
-      "Node": "PowerHALMainState",
-      "Duration": 0,
-      "Value": "SUSTAINED_PERFORMANCE"
-    },
-    {
-      "PowerHint": "SUSTAINED_PERFORMANCE",
-      "Node": "CPUBigClusterMaxFreq",
-      "Duration": 0,
-      "Value": "1324800"
-    },
-    {
-      "PowerHint": "SUSTAINED_PERFORMANCE",
-      "Node": "CPUBigPlusClusterMaxFreq",
-      "Duration": 0,
-      "Value": "1555200"
-    },
-    {
-      "PowerHint": "SUSTAINED_PERFORMANCE",
-      "Node": "CPULittleClusterMaxFreq",
-      "Duration": 0,
-      "Value": "1612800"
-    },
-    {
-      "PowerHint": "SUSTAINED_PERFORMANCE",
-      "Node": "GPUMaxFreq",
-      "Duration": 0,
-      "Value": "540000000"
-    },
-    {
-      "PowerHint": "INTERACTION",
-      "Node": "CPUBigClusterMinFreq",
-      "Duration": 0,
-      "Value": "1324800"
-    },
-    {
-      "PowerHint": "INTERACTION",
-      "Node": "CPULittleClusterMinFreq",
-      "Duration": 0,
-      "Value": "1708800"
-    },
-    {
-      "PowerHint": "INTERACTION",
-      "Node": "UclampTAMin",
-      "Duration": 0,
-      "Value": "25"
-    },
-    {
-      "PowerHint": "INTERACTION",
-      "Node": "UclampTALatency",
-      "Duration": 0,
-      "Value": "1"
-    },
-    {
-      "PowerHint": "INTERACTION",
-      "Node": "SchedPreferSpread",
-      "Duration": 0,
-      "Value": "4"
-    },
-    {
-      "PowerHint": "INTERACTION",
-      "Node": "SchedBusyHystNs",
-      "Duration": 0,
-      "Value": "99000000"
-    },
-    {
-      "PowerHint": "INTERACTION",
-      "Node": "SchedBusyHystEnableCPUs",
-      "Duration": 0,
-      "Value": "255"
-    },
-    {
-      "PowerHint": "INTERACTION",
-      "Node": "SchedMinTaskUtilForBoost",
-      "Duration": 0,
-      "Value": "0"
-    },
-    {
-      "PowerHint": "INTERACTION",
-      "Node": "SchedMinTaskUtilForColoc",
-      "Duration": 0,
-      "Value": "0"
-    },
-    {
-      "PowerHint": "INTERACTION",
-      "Node": "CPUBWHystTriggerCount",
-      "Duration": 0,
-      "Value": "0"
-    },
-    {
-      "PowerHint": "INTERACTION",
-      "Node": "CPUBWHystLength",
-      "Duration": 0,
-      "Value": "0"
-    },
-    {
-      "PowerHint": "INTERACTION",
-      "Node": "CPUBWHistMemory",
-      "Duration": 0,
-      "Value": "0"
-    },
-    {
-      "PowerHint": "INTERACTION",
-      "Node": "CPUBWMinFreq",
-      "Duration": 0,
-      "Value": "9155"
-    },
-    {
-      "PowerHint": "INTERACTION",
-      "Node": "LLCCBWMinFreq",
-      "Duration": 0,
-      "Value": "3879"
-    },
-    {
-      "PowerHint": "INTERACTIVE",
-      "Node": "CPULittleClusterUpRateLimit",
-      "Duration": 0,
-      "Value": "500"
-    },
-    {
-      "PowerHint": "INTERACTIVE",
-      "Node": "CPULittleClusterDownRateLimit",
-      "Duration": 0,
-      "Value": "20000"
-    },
-    {
-      "PowerHint": "INTERACTIVE",
-      "Node": "CPUBigClusterUpRateLimit",
-      "Duration": 0,
-      "Value": "500"
-    },
-    {
-      "PowerHint": "INTERACTIVE",
-      "Node": "CPUBigClusterDownRateLimit",
-      "Duration": 0,
-      "Value": "10000"
-    },
-    {
-      "PowerHint": "INTERACTIVE",
-      "Node": "CPUBigPlusClusterUpRateLimit",
-      "Duration": 0,
-      "Value": "500"
-    },
-    {
-      "PowerHint": "INTERACTIVE",
-      "Node": "CPUBigPlusClusterDownRateLimit",
-      "Duration": 0,
-      "Value": "5000"
-    },
-    {
-      "PowerHint": "INTERACTIVE",
-      "Node": "SchedBusyHystNs",
-      "Duration": 0,
-      "Value": "3000000"
-    },
-    {
-      "PowerHint": "INTERACTIVE",
-      "Node": "SchedBusyHystEnableCPUs",
-      "Duration": 0,
-      "Value": "15"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "CPUBigClusterMinFreq",
-      "Duration": 3000,
-      "Value": "9999999"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "CPULittleClusterMinFreq",
-      "Duration": 3000,
-      "Value": "9999999"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "UclampFgMin",
-      "Duration": 3000,
-      "Value": "50"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "CPUBWHystTriggerCount",
-      "Duration": 3000,
-      "Value": "0"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "CPUBWHystLength",
-      "Duration": 3000,
-      "Value": "0"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "CPUBWHistMemory",
-      "Duration": 3000,
-      "Value": "0"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "CPUBWMinFreq",
-      "Duration": 3000,
-      "Value": "12298"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "GPUForceClkOn",
-      "Duration": 3000,
-      "Value": "1"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "GPUForceRailOn",
-      "Duration": 3000,
-      "Value": "1"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "GPUIdleTimer",
-      "Duration": 3000,
-      "Value": "10000"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "LLCCBWMinFreq",
-      "Duration": 3000,
-      "Value": "6515"
-    },
-    {
-      "PowerHint": "EXPENSIVE_RENDERING",
-      "Node": "PowerHALRenderingState",
-      "Duration": 0,
-      "Value": "EXPENSIVE_RENDERING"
-    },
-    {
-      "PowerHint": "EXPENSIVE_RENDERING",
-      "Node": "GPUMinFreq",
-      "Duration": 0,
-      "Value": "540000000"
-    },
-    {
-      "PowerHint": "Flipendo",
-      "Node": "CPULittleClusterMaxFreq",
-      "Duration": 0,
-      "Value": "1612800"
-    },
-    {
-      "PowerHint": "Flipendo",
-      "Node": "CPUBigClusterMaxFreq",
-      "Duration": 0,
-      "Value": "1324800"
-    },
-    {
-      "PowerHint": "Flipendo",
-      "Node": "CPUBigPlusClusterMaxFreq",
-      "Duration": 0,
-      "Value": "1555200"
-    },
-    {
-      "PowerHint": "GAME",
-      "Node": "CPUBigClusterMinFreq",
-      "Duration": 0,
-      "Value": "1075200"
-    },
-    {
-      "PowerHint": "GAME",
-      "Node": "CPULittleClusterMinFreq",
-      "Duration": 0,
-       "Value": "9999999"
-    },
-    {
-      "PowerHint": "GAME",
-      "Node": "GPUMinFreq",
-      "Duration": 0,
-      "Value": "379000000"
-    },
-    {
-      "PowerHint": "GAME",
-      "Node": "CPULittleClusterDownRateLimit",
-      "Duration": 0,
-      "Value": "2000"
-    },
-    {
-      "PowerHint": "GAME",
-      "Node": "CPUBigClusterDownRateLimit",
-      "Duration": 0,
-      "Value": "2000"
-    },
-    {
-      "PowerHint": "GAME",
-      "Node": "CPUBigPlusClusterDownRateLimit",
-      "Duration": 0,
-      "Value": "2000"
-    }
-  ]
-}
--- a/configs/public.libraries.txt
+++ b/configs/public.libraries.txt
@@ -1,3 +1,4 @@
+libqti-perfd-client.so
 libadsprpc.so
 libcdsprpc.so
 libsdsprpc.so
--- a/device.mk
+++ b/device.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2024 The LineageOS Project
+# Copyright (C) 2023 The LineageOS Project
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -7,6 +7,9 @@
 # NFC
 TARGET_NFC_SUPPORTED_SKUS := redwood

+# Run the script before copying files
+$(shell bash vendor/xiaomi/redwood-miuicamera/vendorsetup.sh)
+
 # Inherit from those products. Most specific first.
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 TARGET_SUPPORTS_OMX_SERVICE := false
@@ -71,6 +74,8 @@ PRODUCT_COPY_FILES += \
    frameworks/native/data/etc/android.hardware.audio.pro.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.pro.xml \
    frameworks/native/data/etc/android.software.midi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.midi.xml

+$(call soong_config_set_bool,android_hardware_audio,skip_speaker_layout_channel_mask_field,true)
+
 # A/B
 AB_OTA_POSTINSTALL_CONFIG += \
    RUN_POSTINSTALL_system=true \
@@ -145,6 +150,10 @@ PRODUCT_COPY_FILES += \
    frameworks/native/data/etc/android.hardware.camera.full.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.full.xml \
    frameworks/native/data/etc/android.hardware.camera.raw.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.raw.xml

+$(call soong_config_set_bool,camera,override_format_from_reserved,true)
+$(call soong_config_set,camera,package_name,com.android.camera)
+$(call soong_config_set,libcameraservice,ext_lib,libcameraservice_extension.xiaomi_redwood)
+
 # Codec2
 PRODUCT_PACKAGES += \
    libcodec2_vndk.vendor \
@@ -192,6 +201,9 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
    dalvik.vm.image-dex2oat-cpu-set=0,1,2,3,4,5,6,7 \
    dalvik.vm.image-dex2oat-threads=8

+# Dolby
+$(call inherit-product, hardware/dolby/dolby.mk)
+
 # DRM
 PRODUCT_PACKAGES += \
    android.hardware.drm@1.3.vendor \
@@ -300,7 +312,7 @@ PRODUCT_PACKAGES += \

 # IR
 PRODUCT_PACKAGES += \
-    android.hardware.ir-service.xiaomi
+    android.hardware.ir-service.lineage

 PRODUCT_COPY_FILES += \
    frameworks/native/data/etc/android.hardware.consumerir.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.consumerir.xml
@@ -308,6 +320,9 @@ PRODUCT_COPY_FILES += \
 # Kernel
 PRODUCT_ENABLE_UFFD_GC := true
 PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false
+LOCAL_KERNEL := device/xiaomi/redwood-kernel/Image
+PRODUCT_COPY_FILES += \
+	$(LOCAL_KERNEL):kernel

 # Keymaster
 PRODUCT_PACKAGES += \
@@ -317,6 +332,11 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
    vendor.lineage.health-service.default

+$(call soong_config_set,lineage_health,charging_control_charging_path,/sys/class/qcom-battery/input_suspend)
+$(call soong_config_set_bool,lineage_health,charging_control_supports_bypass,false)
+$(call soong_config_set,lineage_health,charging_control_charging_disabled,1)
+$(call soong_config_set,lineage_health,charging_control_charging_enabled,0)
+
 # Media
 PRODUCT_COPY_FILES += \
    $(LOCAL_PATH)/media/init.qti.media.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qti.media.sh \
@@ -327,6 +347,8 @@ PRODUCT_COPY_FILES += \
    $(LOCAL_PATH)/media/yupik/media_codecs_yupik_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_yupik_v1.xml \
    $(LOCAL_PATH)/media/yupik/media_profiles_yupik_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_yupik_v1.xml

+$(call soong_config_set_bool,stagefright,target_disable_thumbnail_block_model,true)
+
 # Mlipay
 PRODUCT_PACKAGES += \
    vendor.xiaomi.hardware.mlipay@1.0.vendor \
@@ -414,15 +436,20 @@ PRODUCT_USE_DYNAMIC_PARTITIONS := true

 # Power
 PRODUCT_PACKAGES += \
-    android.hardware.power-service.lineage-libperfmgr \
-    libqti-perfd-client
+    android.hardware.power-service-qti \
+    android.hardware.power@1.2.vendor \
+    vendor.qti.hardware.perf@2.2.vendor

 PRODUCT_PACKAGES += \
    libssl.vendor

 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/task_profiles.json:$(TARGET_COPY_OUT_VENDOR)/etc/task_profiles.json \
-    $(LOCAL_PATH)/configs/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json
+    $(LOCAL_PATH)/configs/task_profiles.json:$(TARGET_COPY_OUT_VENDOR)/etc/task_profiles.json
+
+PRODUCT_COPY_FILES += \
+    vendor/qcom/opensource/power/config/lahaina/powerhint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.xml
+
+$(call soong_config_set,qtipower,mode_ext_lib,//$(LOCAL_PATH):libpowermode-ext-redwood)

 # QTI
 PRODUCT_PACKAGES += \
@@ -460,6 +487,10 @@ PRODUCT_PACKAGES += \
    vendor.qti.hardware.display.mapper@1.1.vendor \
    vendor.qti.hardware.memtrack-service

+# Shim
+PRODUCT_PACKAGES += \
+	libmisightjson_shim
+
 PRODUCT_COPY_FILES += \
    frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.accelerometer.xml \
    frameworks/native/data/etc/android.hardware.sensor.barometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.barometer.xml \
@@ -478,10 +509,6 @@ PRODUCT_COPY_FILES += \
 # Soong namespaces
 PRODUCT_SOONG_NAMESPACES += \
    $(LOCAL_PATH) \
-    hardware/google/interfaces \
-    hardware/google/pixel \
-    hardware/lineage/interfaces/power-libperfmgr \
-    hardware/qcom-caf/common/libqti-perfd-client \
    hardware/xiaomi

 # Telephony
@@ -495,6 +522,9 @@ PRODUCT_PACKAGES += \
    telephony-ext \
    xiaomi-telephony-stub

+PRODUCT_PACKAGES += \
+    qcrilNrDb_vendor
+
 PRODUCT_BOOT_JARS += \
    telephony-ext \
    xiaomi-telephony-stub
--- a/evolution.dependencies
+++ b/evolution.dependencies
@@ -0,0 +1,31 @@
+[
+  {
+    "remote"     : "github-non-los",
+    "repository" : "thepriyanshujangid/device_xiaomi_redwood-kernel",
+    "target_path": "device/xiaomi/redwood-kernel",
+    "branch"     : "Scarlet"
+  },
+  {
+    "repository" : "vendor_xiaomi_redwood",
+    "target_path": "vendor/xiaomi/redwood",
+    "branch"     : "bka"
+  },
+  {
+    "remote"     : "github-non-los",
+    "repository" : "LineageOS/android_hardware_xiaomi",
+    "target_path": "hardware/xiaomi",
+    "branch"     : "lineage-23.0"
+  },
+  {
+    "remote"     : "github-non-los",
+    "repository" : "thepriyanshujangid/hardware_dolby",
+    "target_path": "hardware/dolby",
+    "branch"     : "sony_moto-ui"
+  },
+  {
+    "remote"     : "github-non-los",
+    "repository" : "thepriyanshujangid/vendor_xiaomi_redwood-miuicamera",
+    "target_path": "vendor/xiaomi/redwood-miuicamera",
+    "branch"     : "sixteen"
+  }
+]
--- a/extract-files.py
+++ b/extract-files.py
@@ -19,7 +19,6 @@ from extract_utils.main import (

 namespace_imports = [
    'device/xiaomi/redwood',
-    'hardware/qcom-caf/common/libqti-perfd-client',
    'hardware/qcom-caf/sm8350',
    'hardware/qcom-caf/wlan',
    'hardware/xiaomi',
@@ -78,8 +77,18 @@ blob_fixups: blob_fixups_user_type = {
         .clear_symbol_version('remote_handle_close')
         .clear_symbol_version('remote_handle_invoke')
         .clear_symbol_version('remote_handle_open'),
+     'vendor/lib64/libmisight.so': blob_fixup()
+        .add_needed('libjsoncpp_shim.so')
+        .add_needed('libmisightjson_shim.so'),
     'vendor/lib64/libsensor_cal_v2.so': blob_fixup()
         .add_needed('libjsoncpp_shim.so'),
+    ('vendor/lib/hw/audio.primary.lahaina.so', 'vendor/lib/libaudioroute_ext.so'): blob_fixup()
+        .replace_needed('libaudioroute.so', 'libaudioroute-v34.so'),
+    'vendor/lib64/libmialgoengine.so' : blob_fixup()
+        .remove_needed('android.hardware.graphics.allocator@3.0.so')
+        .remove_needed('vendor.qti.hardware.display.allocator@3.0.so'),
+    ('vendor/lib64/libdpps.so', 'vendor/lib64/libsnapdragoncolor-manager.so'): blob_fixup()
+        .replace_needed('libtinyxml2.so', 'libtinyxml2-v34.so'),
 }  # fmt: skip

 module = ExtractUtilsModule(
--- a/gps/CleanSpec.mk
+++ b/gps/CleanSpec.mk
@@ -1,50 +0,0 @@
-# Copyright (C) 2007 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# If you don't need to do a full clean build but would like to touch
-# a file or delete some intermediate files, add a clean step to the end
-# of the list.  These steps will only be run once, if they haven't been
-# run before.
-#
-# E.g.:
-#     $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
-#     $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
-#
-# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
-# files that are missing or have been moved.
-#
-# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
-# Use $(OUT_DIR) to refer to the "out" directory.
-#
-# If you need to re-do something that's already mentioned, just copy
-# the command and add it to the bottom of the list.  E.g., if a change
-# that you made last week required touching a file and a change you
-# made today requires touching the same file, just copy the old
-# touch step and add it to the end of the list.
-#
-# ************************************************
-# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
-# ************************************************
-
-# For example:
-#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
-#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
-#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
-#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
-
-# ************************************************
-# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
-# ************************************************
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libloc_api*)
--- a/gps/utils/LocUnorderedSetMap.h
+++ b/gps/utils/LocUnorderedSetMap.h
@@ -141,8 +141,11 @@ public:
                             unordered_set<KEY>* goneKeys, unordered_set<VAL>* goneVals) {
        for (auto key : keys) {
            auto iter = mMap.find(key);
-            if (iter != mMap.end() && trimOrRemove(iter, rVals, goneVals) && nullptr != goneKeys) {
-                goneKeys->insert(iter->first);
+            if (iter != mMap.end()) {
+                KEY goneKey = iter->first;
+                if (trimOrRemove(iter, rVals, goneVals) && nullptr != goneKeys) {
+                    goneKeys->insert(goneKey);
+                }
            }
        }
    }
--- a/hidl/manifest_lahaina.xml
+++ b/hidl/manifest_lahaina.xml
@@ -377,6 +377,16 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
            <instance>default</instance>
        </interface>
    </hal>
+    <!-- Perf HAL service -->
+    <hal format="hidl">
+        <name>vendor.qti.hardware.perf</name>
+        <transport>hwbinder</transport>
+        <version>2.2</version>
+        <interface>
+            <name>IPerf</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
    <!-- bluetooth -->
    <hal format="hidl">
        <name>android.hardware.bluetooth</name>
--- a/hidl/manifest_xiaomi.xml
+++ b/hidl/manifest_xiaomi.xml
@@ -8,4 +8,9 @@
            <instance>default</instance>
        </interface>
    </hal>
+    <hal>
+        <name>vendor.xiaomi.hardware.displayfeature</name>
+        <transport>hwbinder</transport>
+        <fqname>@1.0::IDisplayFeature/default</fqname>
+    </hal>
 </manifest>
--- a/hidl/vendor_framework_compatibility_matrix.xml
+++ b/hidl/vendor_framework_compatibility_matrix.xml
@@ -46,6 +46,14 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         <instance>objectTracker</instance>
       </interface>
   </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.qti.hardware.perf</name>
+         <version>2.0-2</version>
+         <interface>
+            <name>IPerf</name>
+            <instance>default</instance>
+         </interface>
+    </hal>
    <hal format="hidl" optional="true">
        <name>vendor.display.color</name>
        <version>1.0-6</version>
@@ -543,6 +551,24 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
            <instance>default</instance>
        </interface>
    </hal>
+    <!-- Memory PASR HAL -->
+    <hal format="hidl" optional="true">
+        <name>vendor.qti.memory.pasrmanager</name>
+        <transport>hwbinder</transport>
+        <version>1.0-1</version>
+        <interface>
+            <name>IPasrManager</name>
+            <instance>pasrhal</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.qti.power.pasrmanager</name>
+        <version>1.0</version>
+        <interface>
+            <name>IPasrManager</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
   <hal format="hidl" optional="true">
       <name>android.hardware.radio.config</name>
       <version>1.0-1</version>
--- a/hidl/xiaomi_framework_compatibility_matrix.xml
+++ b/hidl/xiaomi_framework_compatibility_matrix.xml
@@ -52,4 +52,12 @@
            <instance>default</instance>
        </interface>
    </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.xiaomi.hardware.displayfeature</name>
+        <version>1.0</version>
+        <interface>
+            <name>IDisplayFeature</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
 </compatibility-matrix>
--- a/lineage_redwood.mk
+++ b/lineage_redwood.mk
@@ -26,11 +26,13 @@ PRODUCT_SYSTEM_NAME := redwood_global
 PRODUCT_SYSTEM_DEVICE := redwood

 PRODUCT_BUILD_PROP_OVERRIDES += \
-    BuildDesc="redwood_global-user 14 UKQ1.240624.001 OS2.0.7.0.UMSMIXM release-keys" \
-    BuildFingerprint=POCO/redwood_global/redwood:14/UKQ1.240624.001/OS2.0.7.0.UMSMIXM:user/release-keys \
+    BuildDesc="redwood_global-user 14 UKQ1.240624.001 OS2.0.16.0.UMSMIXM release-keys" \
+    BuildFingerprint=POCO/redwood_global/redwood:14/UKQ1.240624.001/OS2.0.16.0.UMSMIXM:user/release-keys \
    DeviceName=$(PRODUCT_SYSTEM_DEVICE) \
    DeviceProduct=$(PRODUCT_SYSTEM_NAME)

-# Exclude apps
-TARGET_DISABLE_MATLOG := true
-TARGET_EXCLUDES_AUDIOFX := true
+# Evolution specific Flags 
+EVO_BUILD_TYPE := Official
+TARGET_BOOT_ANIMATION_RES := 1080
+WITH_GMS := true
+TARGET_DISABLE_EPPE := true
--- a/media/yupik/media_codecs_yupik_v1.xml
+++ b/media/yupik/media_codecs_yupik_v1.xml
@@ -75,6 +75,7 @@
 -->

 <MediaCodecs>
+    <Include href="media_codecs_dolby_audio.xml" />
    <Settings>
        <Domain name="telephony" enabled="true" />
        <Setting name="max-video-encoder-input-buffers" value="11" />
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -578,10 +578,12 @@

    <!-- Indicate available ColorDisplayManager.COLOR_MODE_xxx. -->
    <integer-array name="config_availableColorModes">
-        <item>0</item> <!-- COLOR_MODE_NATURAL   -->
-        <item>1</item> <!-- COLOR_MODE_BOOSTED   -->
-        <item>2</item> <!-- COLOR_MODE_SATURATED -->
-        <item>3</item> <!-- COLOR_MODE_AUTOMATIC -->
+        <item>258</item> <!-- vivid -->
+        <item>256</item> <!-- saturated -->
+        <item>257</item> <!-- standard -->
+        <item>269</item> <!-- original -->
+        <item>268</item> <!-- p3 -->
+        <item>267</item> <!-- srgb -->
    </integer-array>

    <!-- Color mode to use when accessibility transforms are enabled. This color mode must be
@@ -589,30 +591,6 @@
         regularly selected color mode will be used if this value is negative. -->
    <integer name="config_accessibilityColorMode">2</integer>

-    <!-- The following two arrays specify which color space to use for display composition when a
-         certain color mode is active.
-         Composition color spaces are defined in android.view.Display.COLOR_MODE_xxx, and color
-         modes are defined in ColorDisplayManager.COLOR_MODE_xxx and
-         ColorDisplayManager.VENDOR_COLOR_MODE_xxx.
-         The color space COLOR_MODE_DEFAULT (0) lets the system select the most appropriate
-         composition color space for currently displayed content. Other values (e.g.,
-         COLOR_MODE_SRGB) override system selection; these other color spaces must be supported by
-         the device for for display composition.
-         If a color mode does not have a corresponding color space specified in this array, the
-         currently set composition color space will not be modified.-->
-    <integer-array name="config_displayCompositionColorModes">
-        <item>0</item> <!-- COLOR_MODE_NATURAL   -->
-        <item>1</item> <!-- COLOR_MODE_BOOSTED   -->
-        <item>2</item> <!-- COLOR_MODE_SATURATED -->
-        <item>3</item> <!-- COLOR_MODE_AUTOMATIC -->
-    </integer-array>
-    <integer-array name="config_displayCompositionColorSpaces">
-        <item>0</item> <!-- COLOR_MODE_DEFAULT    -->
-        <item>0</item> <!-- COLOR_MODE_DEFAULT    -->
-        <item>0</item> <!-- COLOR_MODE_DEFAULT    -->
-        <item>9</item> <!-- COLOR_MODE_DISPLAY_P3 -->
-    </integer-array>
-
    <!-- Whether or not wcg mode should be enabled on this device -->
    <bool name="config_enableWcgMode">true</bool>

@@ -632,4 +610,10 @@

 <!-- Whether the device supports Smart Pixels -->
    <bool name="config_supportSmartPixels">true</bool>
+
+    <!-- The list of components which should be automatically disabled for a specific package. -->
+    <string-array name="config_disabledComponents" translatable="false">
+        <item>com.google.android.gms/com.google.android.gms.nearby.messages.service.NearbyMessagesService</item>
+        <item>com.google.android.gms/com.google.android.gms.nearby.discovery.service.DiscoveryService</item>
+    </string-array>
 </resources>
--- a/overlay/packages/apps/Settings/res/values/config.xml
+++ b/overlay/packages/apps/Settings/res/values/config.xml
@@ -54,4 +54,28 @@
    <string name="config_batteryDesignCapacity">/sys/class/power_supply/battery/charge_full_design</string>
    <string name="config_batteryChargeCycles">/sys/class/power_supply/battery/cycle_count</string>
    <bool name="config_supportBatteryHealth">true</bool>
+
+    <!-- Display settings screen, Color mode options. Must be the same length and order as
+         config_color_mode_options_values below. Only the values that also appear in
+         frameworks/base/core/res/res/values/config.xml's config_availableColorModes are shown. -->
+    <string-array name="config_color_mode_options_strings" translatable="false">
+        <item>Vivid</item>
+        <item>Saturated</item>
+        <item>Standard</item>
+        <item>Original</item>
+        <item>P3</item>
+        <item>sRGB</item>
+    </string-array>
+
+    <!-- Display settings screen, Color mode options. Must be the same length and order as
+         config_color_mode_options_strings above. Only the values that also appear in
+         frameworks/base/core/res/res/values/config.xml's config_availableColorModes are shown. -->
+    <integer-array name="config_color_mode_options_values" translatable="false">
+        <item>258</item>
+        <item>256</item>
+        <item>257</item>
+        <item>269</item>
+        <item>268</item>
+        <item>267</item>
+    </integer-array>
 </resources>
--- a/overlay/packages/apps/Settings/res/values/evolution_strings.xml
+++ b/overlay/packages/apps/Settings/res/values/evolution_strings.xml
@@ -0,0 +1,6 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- ROM maintainer name -->
+    <string name="build_maintainer_summary">𝙿𝚁𝙸𝚈𝙰𝙽𝚂𝙷𝚄</string>
+    <string name="build_maintainer_donate_url" translatable="false">https://paypal.me/thepriyanshujangid</string>
+
+</resources>
--- a/power/Android.bp
+++ b/power/Android.bp
@@ -1,11 +1,13 @@
 cc_library_static {
-    name: "libperfmgr-ext-xiaomi",
+    name: "libpowermode-ext-redwood",
+    defaults: [
+        "android.hardware.power-ndk_shared",
+    ],
    vendor: true,
    srcs: [
        "power-mode.cpp",
    ],
    shared_libs: [
-        "android.hardware.power-V6-ndk",
        "libbase",
    ],
 }
--- a/power/power-mode.cpp
+++ b/power/power-mode.cpp
@@ -19,11 +19,10 @@
 #define TOUCH_IOC_SETMODE TOUCH_MAGIC + SET_CUR_VALUE

 namespace aidl {
-namespace google {
+namespace android {
 namespace hardware {
 namespace power {
 namespace impl {
-namespace pixel {

 using ::aidl::android::hardware::power::Mode;

@@ -54,6 +53,5 @@ bool setDeviceSpecificMode(Mode type, bool enabled) {
 }  // namespace impl
 }  // namespace power
 }  // namespace hardware
-}  // namespace google
+}  // namespace android
 }  // namespace aidl
-}  // namespace pixel
--- a/product.prop
+++ b/product.prop
@@ -1,8 +1,5 @@
+# eBPF
+ro.bpf.kver_override=5.10.239
+
 # FUSE passthrough
 persist.sys.fuse.passthrough.enable=true
-
-# FUN time
-persist.sys.usb.config=mtp,adb
-ro.adb.secure=0
-ro.debuggable=1
-ro.secure=0
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,4 +1,4 @@
-# All unpinned blobs below are extracted from redwood_global-user-14-UKQ1.240624.001-OS2.0.7.0.UMSMIXM-release-keys
+# All unpinned blobs below are extracted from redwood_global-user-14-UKQ1.240624.001-OS2.0.16.0.UMSMIXM-release-keys

 # ACDB
 vendor/etc/acdbdata/Forte/Forte_Bluetooth_cal.acdb
@@ -95,7 +95,13 @@ vendor/firmware/aw882xx_acf.bin
 system_ext/etc/permissions/audiosphere.xml
 system_ext/framework/audiosphere.jar
 vendor/lib/soundfx/libasphere.so
+vendor/lib/soundfx/libqcbassboost.so
+vendor/lib/soundfx/libqcreverb.so
+vendor/lib/soundfx/libqcvirt.so
 vendor/lib/soundfx/libshoebox.so
+vendor/lib64/soundfx/libqcbassboost.so
+vendor/lib64/soundfx/libqcreverb.so
+vendor/lib64/soundfx/libqcvirt.so

 # Audio Hardware
 vendor/lib/hw/audio.primary.lahaina.so
@@ -625,44 +631,55 @@ vendor/etc/mdss_dsi_m20_42_0d_0b_dsc_vid_mi.xml
 vendor/etc/qdcm_calib_data_xiaomi_36_02_0a_video_mode_dsc_dsi_panel.xml
 vendor/etc/qdcm_calib_data_xiaomi_42_0d_0b_video_mode_dsc_dsi_panel.xml

-# Display - from AOSPA
+# Display feature
+vendor/bin/displayfeature
+vendor/bin/hw/vendor.xiaomi.hardware.displayfeature@1.0-service
+vendor/etc/init/vendor.xiaomi.hardware.displayfeature@1.0-service.rc
+vendor/lib64/hw/displayfeature.default.so
+vendor/lib64/hw/vendor.xiaomi.hardware.displayfeature@1.0-impl.so
+vendor/lib64/libclient2slpi.notifier.so
+vendor/lib64/libdisplayfeature.so
+vendor/lib64/libdisplayfeatureservice.so
+vendor/lib64/libmi-stc-HW-modulate.so
+
+# Display - from sunstone V816.0.8.0.UMQMIXM
 vendor/etc/display/DPU660.xml|b26dd73e361546d89bf3d7082a471703dc6ac2cb
 vendor/etc/display/DPU670.xml|e5131a60ceff29ca5eb561eec7eddadef1d0486f
 vendor/etc/display/DPU720.xml|4e54e8712d65773eb87867bf64a4cb98ea9bb8c3
 vendor/etc/display/DPU7__.xml|c056f3cb9fa123ca3de5b2a9775c184dddf25b9d
 vendor/lib64/libdisplayqos.so|aa222f4c1a2d2fb60944c44f8a82621d6bc75184
-vendor/lib64/libdisplayskuutils.so|37e4d543c696a5c9f0c1b44fd7299a0bc7dba5e8
-vendor/lib64/libdpps.so|9caf32a0d3636af579ea6e1a6c5638a16ed19444
-vendor/lib64/libqrtrclient.so|2474a708487c269c04afffbf755fff1686c6011c
+vendor/lib64/libdisplayskuutils.so|d467f3bcaeafa6ed9de62afe2c00a3be46f4bb0f
+vendor/lib64/libdpps.so|b7d8458a66fd8510a7a490c1eebd3bac3fb159ec
+vendor/lib64/libqrtrclient.so|51c55fea28fa475ae9b2c64592f32802e6ba6c25
 vendor/lib64/libqseed3.so|d62c37baf259250cadfcff8734e82054ed87bb96
 vendor/lib64/librcmask.so|8feb479fe590b6aec282ce3342574d9113f80516
-vendor/lib64/libsdm-color.so|a83576915a146492d430711e273b9af9a95d4fed
+vendor/lib64/libsdm-color.so|1c416b205c996575d26a41c5d7a9d07728f9134a
 vendor/lib64/libsdm-colormgr-algo.so|5416a3b9b0735099c9b86f451f41386711787ea4
 vendor/lib64/libsdm-diag.so|393c9ad3e3ad3210515900627f65bf6e3633226e
 vendor/lib64/libsdm-disp-vndapis.so|dc3ff8c971bbcb0d1b9e5079324d1d1d05a1fd39
-vendor/lib64/libsdmextension.so|4c32026ff8cb1270081881d4def7a2ad05ad0b80
+vendor/lib64/libsdmextension.so|161a19a7e915174ff31a2ed05acbf0fc98368bb8
 vendor/lib64/libtinyxml2_1.so|11ceb3f1e7650c41621d47e5ec5567c8f466086e

-# Display HDR - from AOSPA
+# Display HDR - from sunstone V816.0.8.0.UMQMIXM
 vendor/lib64/libhdr_tm.so|7954c5cd5c0b23fe8d0609361c22d24c59f1448b

-# Display postprocessing - from AOSPA
-vendor/bin/hw/vendor.display.color@1.0-service|347fda7fe824e405829e1772739e999937421a58
-vendor/bin/ppd|4fcb818e39c813570fdbfaa9726274986e190e04
-vendor/bin/qdcmss|2dd2d71247c85a1bb6b3168d53cd844cb387f75c
-vendor/etc/init/qdcmss.rc|53d78d686678c4f923a9ec4ace7d4d3575b13788
-vendor/etc/init/vendor.display.color@1.0-service.rc|5ad673f879b3685a0e79b5633437e5499cb94f48
-vendor/lib64/libdisp-aba.so|3ff1c1d30d96c3ce3608378b2afcc75b892845cb
-vendor/lib64/libqdcm-mode-parser.so|207143ab4dda0886bde2a0333d7a1bcd7af6f8e1
-vendor/lib64/libsnapdragoncolor-manager.so|e7f55a1ba843bb570afa6bbf16bb61dc01ec74ea
-vendor/lib64/libsnapdragoncolor-qdcm.so|673c41753603bacb197674df567723dfd928384e
-vendor/lib64/vendor.display.color@1.0.so|e4d0789135f4443f1250ad71f6834ba76aabfda3
-vendor/lib64/vendor.display.color@1.1.so|d3fa33b1ab48ab19c007b3375a6394e39dcafe2a
-vendor/lib64/vendor.display.color@1.2.so|9434641533178e5dc241d9f8acd46d1c994baab1
-vendor/lib64/vendor.display.color@1.3.so|17aef0a47a32a3ab9964fcdb298f17953c9d5ddf
-vendor/lib64/vendor.display.color@1.4.so|f3b9e213aea44092e3c461ad88565ad31a767a53
-vendor/lib64/vendor.display.color@1.5.so|89346bfcc7c25f41e20456691b7e9e55c4248988
-vendor/lib64/vendor.display.postproc@1.0.so|7c0cab3cead6f2d2f45539be5b480f3057d8f62e
+# Display postprocessing
+vendor/bin/hw/vendor.display.color@1.0-service
+vendor/bin/ppd
+vendor/bin/qdcmss
+vendor/etc/init/qdcmss.rc
+vendor/etc/init/vendor.display.color@1.0-service.rc
+vendor/lib64/libdisp-aba.so
+vendor/lib64/libqdcm-mode-parser.so
+vendor/lib64/libsnapdragoncolor-manager.so
+vendor/lib64/libsnapdragoncolor-qdcm.so
+vendor/lib64/vendor.display.color@1.0.so
+vendor/lib64/vendor.display.color@1.1.so
+vendor/lib64/vendor.display.color@1.2.so
+vendor/lib64/vendor.display.color@1.3.so
+vendor/lib64/vendor.display.color@1.4.so
+vendor/lib64/vendor.display.color@1.5.so
+vendor/lib64/vendor.display.postproc@1.0.so

 # DPM
 system/framework/tcmclient.jar
@@ -772,37 +789,37 @@ vendor/lib64/vendor.qti.gnss@4.0-service.so
 vendor/lib64/vendor.qti.gnss@4.0.so
 vendor/lib64/vendor.qti.hardware.qccsyshal@1.0.so

-# Graphics (Adreno) - from AOSPA
-vendor/lib/egl/eglSubDriverAndroid.so|c4133b15d0a36f0775418724e09ce76681baa16d
-vendor/lib/egl/libEGL_adreno.so;SYMLINK=vendor/lib/libEGL_adreno.so|0b6e09ba4dd6aaf221444fcc9adc40d2e597364a
-vendor/lib/egl/libGLESv1_CM_adreno.so|5ab7196d4c8ae861ff484cb6b1f4b5ac3c9738b4
-vendor/lib/egl/libGLESv2_adreno.so;SYMLINK=vendor/lib/libGLESv2_adreno.so|f911273ad25fe2d0ee5a1336fcb603a04a06e1a1
-vendor/lib/egl/libq3dtools_adreno.so;SYMLINK=vendor/lib/libq3dtools_adreno.so|994551fb9b829caf80bb7a8f84b4b89cb3104ed9
-vendor/lib/egl/libq3dtools_esx.so|d6a9c80dab61e9bddf120b01753166c3ef5d23d7
-vendor/lib/hw/vulkan.adreno.so|267e7821c594c0db7dde56b7ef53ceb5980716e1
-vendor/lib/libC2D2.so|1c89e545a5dabc94d27db32031594a792d91d6fd
-vendor/lib/libCB.so|22585f517683171c74dbc58e561611c796f061b3
-vendor/lib/libOpenCL.so|d5642e23207996dbbc13273927127ecf04fced53
-vendor/lib/libadreno_utils.so|668fb9acb7ecab7452bfc665250f851a25b6521d
-vendor/lib/libc2d30_bltlib.so|b98194a7b600b8a23d5e21edf14f3ee0b82f77d5
-vendor/lib/libgsl.so|bf7ceef8536752db323775d5a6a093b3f209e8f2
-vendor/lib/libllvm-glnext.so|60c4a1792b96932ca027060a939a7ef155e52e01
-vendor/lib/libllvm-qcom.so|01afd4f1a88d6fcd4e2123aa2e13add8ad4339fc
-vendor/lib64/egl/eglSubDriverAndroid.so|2692fd8aac6a9fd49faace2213b2631f7595afad
-vendor/lib64/egl/libEGL_adreno.so;SYMLINK=vendor/lib64/libEGL_adreno.so|74766c6648c64e6af2944fe1a983f1e70f548cbe
-vendor/lib64/egl/libGLESv1_CM_adreno.so|b9e14710b9c2be024e1fdf77d60266423e484047
-vendor/lib64/egl/libGLESv2_adreno.so;SYMLINK=vendor/lib64/libGLESv2_adreno.so|a031aad0bcfd0b47d9ce0e2b2871df60a5af48b6
-vendor/lib64/egl/libq3dtools_adreno.so;SYMLINK=vendor/lib64/libq3dtools_adreno.so|172810bc218ab55fe95f628ab1c0d37833eb0021
-vendor/lib64/egl/libq3dtools_esx.so|5b1f30484211b84f802d3aaccddd728cd0dcbc70
-vendor/lib64/hw/vulkan.adreno.so|ce27b014f47e93fa55096f5d50d686fbe12c3e8f
-vendor/lib64/libC2D2.so|0b4aa67ef7e86df61a1bfd7dfd4680e0f0d7104c
-vendor/lib64/libCB.so|c458543bc706d0dcfac756a6e86e2654592f8b16
-vendor/lib64/libOpenCL.so|76d6d5f9e89d896665fdd06cbede3e21c92c8068
-vendor/lib64/libadreno_utils.so|240872ec23febc6ca7b254dbb38b7218b86f6dd5
-vendor/lib64/libc2d30_bltlib.so|e330210916d482cdbf6fe942145a664679fa9c88
-vendor/lib64/libgsl.so|8fd5b9c8e17c876544d416b694d7c2e8c96fe146
-vendor/lib64/libllvm-glnext.so|864e52831a8c18e10da5674288c371598f4d4173
-vendor/lib64/libllvm-qcom.so|f6af31fb74163e3341918c861bece94b8feecc08
+# Graphics
+vendor/lib/egl/eglSubDriverAndroid.so
+vendor/lib/egl/libEGL_adreno.so;SYMLINK=vendor/lib/libEGL_adreno.so
+vendor/lib/egl/libGLESv1_CM_adreno.so
+vendor/lib/egl/libGLESv2_adreno.so;SYMLINK=vendor/lib/libGLESv2_adreno.so
+vendor/lib/egl/libq3dtools_adreno.so;SYMLINK=vendor/lib/libq3dtools_adreno.so
+vendor/lib/egl/libq3dtools_esx.so
+vendor/lib/hw/vulkan.adreno.so
+vendor/lib/libC2D2.so
+vendor/lib/libCB.so
+vendor/lib/libOpenCL.so
+vendor/lib/libadreno_utils.so
+vendor/lib/libc2d30_bltlib.so
+vendor/lib/libgsl.so
+vendor/lib/libllvm-glnext.so
+vendor/lib/libllvm-qcom.so
+vendor/lib64/egl/eglSubDriverAndroid.so
+vendor/lib64/egl/libEGL_adreno.so;SYMLINK=vendor/lib64/libEGL_adreno.so
+vendor/lib64/egl/libGLESv1_CM_adreno.so
+vendor/lib64/egl/libGLESv2_adreno.so;SYMLINK=vendor/lib64/libGLESv2_adreno.so
+vendor/lib64/egl/libq3dtools_adreno.so;SYMLINK=vendor/lib64/libq3dtools_adreno.so
+vendor/lib64/egl/libq3dtools_esx.so
+vendor/lib64/hw/vulkan.adreno.so
+vendor/lib64/libC2D2.so
+vendor/lib64/libCB.so
+vendor/lib64/libOpenCL.so
+vendor/lib64/libadreno_utils.so
+vendor/lib64/libc2d30_bltlib.so
+vendor/lib64/libgsl.so
+vendor/lib64/libllvm-glnext.so
+vendor/lib64/libllvm-qcom.so

 # Graphics firmware
 vendor/firmware/a660_gmu.bin
@@ -986,6 +1003,35 @@ vendor/etc/libnfc-nxp_RF.conf
 # NVRAM
 vendor/bin/nv_mac

+# Perf
+vendor/bin/hw/vendor.qti.hardware.perf@2.2-service
+vendor/etc/init/vendor.qti.hardware.perf@2.2-service.rc
+vendor/etc/perf/commonresourceconfigs.xml
+vendor/etc/perf/perfboostsconfig.xml
+vendor/etc/perf/perfconfigstore.xml
+vendor/etc/perf/targetconfig.xml
+vendor/etc/perf/targetresourceconfigs.xml
+vendor/lib/libperfconfig.so
+vendor/lib/libperfgluelayer.so
+vendor/lib/libperfioctl.so
+vendor/lib/libqti-perfd-client.so
+vendor/lib/libqti-perfd.so
+vendor/lib/libqti-util.so
+vendor/lib/libqti-utils.so
+vendor/lib/vendor.qti.memory.pasrmanager@1.0.so
+vendor/lib/vendor.qti.memory.pasrmanager@1.1.so
+vendor/lib64/liblearningmodule.so
+vendor/lib64/libmeters.so
+vendor/lib64/libperfconfig.so
+vendor/lib64/libperfgluelayer.so
+vendor/lib64/libperfioctl.so
+vendor/lib64/libqti-perfd-client.so
+vendor/lib64/libqti-perfd.so
+vendor/lib64/libqti-util.so
+vendor/lib64/libqti-utils.so
+vendor/lib64/vendor.qti.memory.pasrmanager@1.0.so
+vendor/lib64/vendor.qti.memory.pasrmanager@1.1.so
+
 # Peripheral manager
 vendor/bin/pm-proxy
 vendor/bin/pm-service
@@ -1078,23 +1124,22 @@ vendor/etc/init/shsusrd.rc
 vendor/etc/init/ssgtzd.rc
 vendor/etc/init/vendor.qti.rmt_storage.rc
 vendor/etc/init/vendor.qti.tftp.rc
-vendor/etc/qcril_database/qcrilNr.db
-vendor/etc/qcril_database/upgrade/config/10.0_config.sql
-vendor/etc/qcril_database/upgrade/config/6.0_config.sql
-vendor/etc/qcril_database/upgrade/config/7.0_config.sql
-vendor/etc/qcril_database/upgrade/config/8.0_config.sql
-vendor/etc/qcril_database/upgrade/config/9.0_config.sql
-vendor/etc/qcril_database/upgrade/other/0_initial_qcrilnr.sql
-vendor/etc/qcril_database/upgrade/other/10_version_update_ecc_table.sql
-vendor/etc/qcril_database/upgrade/other/1_version_intro_qcrilnr.sql
-vendor/etc/qcril_database/upgrade/other/2_version_add_wps_config_qcrilnr.sql
-vendor/etc/qcril_database/upgrade/other/3_version_update_wps_config_qcrilnr.sql
-vendor/etc/qcril_database/upgrade/other/4_version_update_ecc_table_qcrilnr.sql
-vendor/etc/qcril_database/upgrade/other/5_version_update_ecc_table_qcrilnr.sql
-vendor/etc/qcril_database/upgrade/other/6_version_change_property_table_qcrilnr.sql
-vendor/etc/qcril_database/upgrade/other/7_version_update_ecc_table_qcrilnr.sql
-vendor/etc/qcril_database/upgrade/other/8_version_update_ecc_table.sql
-vendor/etc/qcril_database/upgrade/other/9_version_update_ecc_table.sql
+vendor/etc/qcril_database/upgrade/config/10.0_config.sql;FILEGROUP=proprietary_rildb_config_sql_files
+vendor/etc/qcril_database/upgrade/config/6.0_config.sql;FILEGROUP=proprietary_rildb_config_sql_files
+vendor/etc/qcril_database/upgrade/config/7.0_config.sql;FILEGROUP=proprietary_rildb_config_sql_files
+vendor/etc/qcril_database/upgrade/config/8.0_config.sql;FILEGROUP=proprietary_rildb_config_sql_files
+vendor/etc/qcril_database/upgrade/config/9.0_config.sql;FILEGROUP=proprietary_rildb_config_sql_files
+vendor/etc/qcril_database/upgrade/other/0_initial_qcrilnr.sql;FILEGROUP=proprietary_rildb_other_sql_files
+vendor/etc/qcril_database/upgrade/other/10_version_update_ecc_table.sql;FILEGROUP=proprietary_rildb_other_sql_files
+vendor/etc/qcril_database/upgrade/other/1_version_intro_qcrilnr.sql;FILEGROUP=proprietary_rildb_other_sql_files
+vendor/etc/qcril_database/upgrade/other/2_version_add_wps_config_qcrilnr.sql;FILEGROUP=proprietary_rildb_other_sql_files
+vendor/etc/qcril_database/upgrade/other/3_version_update_wps_config_qcrilnr.sql;FILEGROUP=proprietary_rildb_other_sql_files
+vendor/etc/qcril_database/upgrade/other/4_version_update_ecc_table_qcrilnr.sql;FILEGROUP=proprietary_rildb_other_sql_files
+vendor/etc/qcril_database/upgrade/other/5_version_update_ecc_table_qcrilnr.sql;FILEGROUP=proprietary_rildb_other_sql_files
+vendor/etc/qcril_database/upgrade/other/6_version_change_property_table_qcrilnr.sql;FILEGROUP=proprietary_rildb_other_sql_files
+vendor/etc/qcril_database/upgrade/other/7_version_update_ecc_table_qcrilnr.sql;FILEGROUP=proprietary_rildb_other_sql_files
+vendor/etc/qcril_database/upgrade/other/8_version_update_ecc_table.sql;FILEGROUP=proprietary_rildb_other_sql_files
+vendor/etc/qcril_database/upgrade/other/9_version_update_ecc_table.sql;FILEGROUP=proprietary_rildb_other_sql_files
 vendor/etc/seccomp_policy/qcrilnr@2.0.policy
 vendor/etc/ssg/ta_config.json
 vendor/etc/ssg/tz_whitelist.json
@@ -1189,6 +1234,7 @@ 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/libmisight.so
 vendor/lib64/vendor.xiaomi.hardware.citsensorservice@1.0.so
 vendor/lib64/vendor.xiaomi.hardware.citsensorservice@1.1.so

--- a/qcril-database/Android.bp
+++ b/qcril-database/Android.bp
@@ -0,0 +1,37 @@
+//
+// SPDX-FileCopyrightText: The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+filegroup {
+    name: "rildb_config_sql_files",
+    srcs: [
+        "config/10.1_config.sql",
+    ],
+}
+
+genrule {
+    name: "qcril_config_database",
+    enabled: true,
+    srcs: [
+        "//vendor/xiaomi/redwood:proprietary_rildb_config_sql_files",
+        "//vendor/xiaomi/redwood:proprietary_rildb_other_sql_files",
+        ":rildb_config_sql_files",
+    ],
+    tools: [
+        "generate_qcril_db",
+    ],
+    cmd: "$(location generate_qcril_db) $(out) $(in)",
+    out: ["qcrilNr.db"],
+}
+
+prebuilt_etc {
+    name: "qcrilNrDb_vendor",
+    filename: "qcrilNr.db",
+    src: ":qcril_config_database",
+    relative_install_path: "qcril_database",
+    vendor: true,
+    required: [
+        "10.1_config.sql",
+    ],
+}
--- a/qcril-database/config/10.1_config.sql
+++ b/qcril-database/config/10.1_config.sql
@@ -0,0 +1,8 @@
+/*
+  SPDX-FileCopyrightText: The LineageOS Project
+  SPDX-License-Identifier: Apache-2.0
+*/
+
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT PRIMARY KEY NOT NULL, def_val TEXT, value TEXT);
+INSERT OR REPLACE INTO qcril_properties_table(property, def_val) VALUES('qcrildb_version',10.1);
+UPDATE qcril_properties_table SET def_val="false" WHERE property="persist.vendor.radio.redir_party_num";
--- a/qcril-database/config/Android.bp
+++ b/qcril-database/config/Android.bp
@@ -0,0 +1,11 @@
+//
+// SPDX-FileCopyrightText: The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+prebuilt_etc {
+    name: "10.1_config.sql",
+    src: "10.1_config.sql",
+    relative_install_path: "qcril_database/upgrade/config",
+    vendor: true,
+}
--- a/rootdir/bin/init.kernel.post_boot-yupik.sh
+++ b/rootdir/bin/init.kernel.post_boot-yupik.sh
@@ -34,8 +34,6 @@ function configure_zram_parameters() {
 	MemTotalStr=`cat /proc/meminfo | grep MemTotal`
 	MemTotal=${MemTotalStr:16:8}

-	low_ram=`getprop ro.config.low_ram`
-
 	# Zram disk - 75% for Go and < 2GB devices .
 	# For >2GB Non-Go devices, size = 50% of RAM size. Limit the size to 4GB.
 	# And enable lz4 zram compression for Go targets.
@@ -53,9 +51,7 @@ function configure_zram_parameters() {
 		let zRamSizeMB=4096
 	fi

-	if [ "$low_ram" == "true" ]; then
-		echo lz4 > /sys/block/zram0/comp_algorithm
-	fi
+	echo lz4kd > /sys/block/zram0/comp_algorithm

 	if [ -f /sys/block/zram0/disksize ]; then
 		if [ -f /sys/block/zram0/use_dedup ]; then
@@ -343,8 +339,8 @@ do
 	done
 done

-# set s2idle as default suspend mode
-echo s2idle > /sys/power/mem_sleep
+# set deep as default suspend mode
+echo deep > /sys/power/mem_sleep

 configure_memory_parameters

--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -191,6 +191,11 @@ on post-fs-data
    # Create /data/time folder for time-services
    mkdir /data/vendor/time/ 0700 system system

+    # Create PERFD deamon related dirs
+    mkdir /data/vendor/perfd 0770 root system
+    chmod 2770 /data/vendor/perfd
+    rm /data/vendor/perfd/default_values
+
    mkdir /data/vendor/secure_element 0777 system system

    # Mark the copy complete flag to not completed
@@ -221,6 +226,7 @@ on post-fs-data
    setprop vold.post_fs_data_done 1

 on property:sys.boot_completed=1
+    setprop vendor.post_boot.parsed 1
    # Enable UFS clock scaling back
    write /sys/bus/platform/devices/1d84000.ufshc/clkscale_enable 1
    # Enable UFS auto_hibern8 back
@@ -235,20 +241,6 @@ on property:sys.boot_completed=1
    # Reinit lmkd to reconfigure lmkd properties
    setprop lmkd.reinit 1

-    # Power hal
-    chown system system /sys/devices/system/cpu/cpu0/cpufreq/schedutil/up_rate_limit_us
-    chown system system /sys/devices/system/cpu/cpu0/cpufreq/schedutil/down_rate_limit_us
-    chown system system /sys/devices/system/cpu/cpu4/cpufreq/schedutil/up_rate_limit_us
-    chown system system /sys/devices/system/cpu/cpu4/cpufreq/schedutil/down_rate_limit_us
-    chown system system /sys/devices/system/cpu/cpu7/cpufreq/schedutil/up_rate_limit_us
-    chown system system /sys/devices/system/cpu/cpu7/cpufreq/schedutil/down_rate_limit_us
-    chmod 0664 /sys/devices/system/cpu/cpu0/cpufreq/schedutil/up_rate_limit_us
-    chmod 0664 /sys/devices/system/cpu/cpu0/cpufreq/schedutil/down_rate_limit_us
-    chmod 0664 /sys/devices/system/cpu/cpu4/cpufreq/schedutil/up_rate_limit_us
-    chmod 0664 /sys/devices/system/cpu/cpu4/cpufreq/schedutil/down_rate_limit_us
-    chmod 0664 /sys/devices/system/cpu/cpu7/cpufreq/schedutil/up_rate_limit_us
-    chmod 0664 /sys/devices/system/cpu/cpu7/cpufreq/schedutil/down_rate_limit_us
-
 service vendor.qrtr-ns /vendor/bin/qrtr-ns -f
    class core
    user vendor_qrtr
--- a/rootdir/etc/init.target.rc
+++ b/rootdir/etc/init.target.rc
@@ -143,10 +143,6 @@ on boot

    write /sys/block/sda/queue/wbt_lat_usec 75000

-on property:sys.boot_completed=1
-    # Enable PowerHAL hint processing
-    setprop vendor.powerhal.init 1
-
 on init && property:ro.boot.mode=charger
    mount_all /vendor/etc/charger_fstab.qcom --early
    write /sys/kernel/boot_adsp/boot 1
@@ -193,10 +189,6 @@ service vendor.nv_mac /vendor/bin/nv_mac
    group system inet net_admin wifi net_raw
    oneshot

-on property:sys.boot_completed=1
-    # STOP EATING MY BATTERY AFTER 100H OF UPTIME FUCK YOU
-    stop statsd
-
 service citsensor-hal-1-1 /vendor/bin/hw/vendor.xiaomi.hardware.citsensorservice@1.1-service
    class late_start
    user system
--- a/sepolicy/vendor/file.te
+++ b/sepolicy/vendor/file.te
@@ -1,2 +0,0 @@
-# Power HAL
-type vendor_sysfs_msm_subsys, fs_type, sysfs_type;
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -31,7 +31,6 @@

 # Power
 /dev/xiaomi-touch                                                  u:object_r:vendor_touchfeature_device:s0
-/vendor/bin/hw/android\.hardware\.power-service\.lineage-libperfmgr  u:object_r:hal_power_default_exec:s0

 # Powershare
 /vendor/bin/hw/vendor\.lineage\.powershare@1\.0-service\.xiaomi                           u:object_r:hal_lineage_powershare_default_exec:s0
--- a/sepolicy/vendor/genfs_contexts
+++ b/sepolicy/vendor/genfs_contexts
@@ -11,19 +11,9 @@ genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.q

 # Wakeup nodes
 genfscon sysfs /devices/platform/goodix_ts.0/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/soc/17300000.qcom,lpass/subsys6/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/soc/17300000.qcom,lpass/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/soc/188101c.qcom,spss/subsys5/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/soc/188101c.qcom,spss/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/soc/4080000.qcom,mss/subsys8/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/soc/5c00000.qcom,ssc/subsys7/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/soc/5c00000.qcom,ssc/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/soc/890000.qcom,qup_uart/wakeup u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/984000.i2c/i2c-0/0-0028/wakeup u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/a94000.spi/spi_master/spi0/spi0.0/wakeup u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/988000.spi/spi_master/spi0/spi0.0/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/soc/98900000.qcom,turing/subsys4/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/soc/98900000.qcom,turing/wakeup u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/990000.i2c/i2c-2/2-005a/wakeup u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/990000.i2c/i2c-2/2-0028/wakeup u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/a300000.qcom,turing/subsys7/wakeup u:object_r:sysfs_wakeup:s0
@@ -31,26 +21,10 @@ genfscon sysfs /devices/platform/soc/a84000.i2c/i2c-3/3-005a/wakeup u:object_r:s
 genfscon sysfs /devices/platform/soc/a84000.i2c/i2c-3/3-0028/wakeup u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/a8c000.spi/spi_master/spi1/spi1.0/wakeup u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/aab0000.qcom,venus/subsys0/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/soc/aab0000.qcom,venus/subsys9/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/soc/abb0000.qcom,evass/subsys1/wakeup u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/abb0000.qcom,evass/subsys2/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/soc/abb0000.qcom,evass/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/soc/b0000000.qcom,cnss-qca6490/subsys10/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/soc/b0000000.qcom,cnss-qca6490/subsys8/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-00/c440000.qcom,spmi:qcom,pmk8350@0:pon_pbs@800/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-03/c440000.qcom,spmi:qcom,pm8350b@3:qcom,amoled/wakeup u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/soc:fingerprint_goodix/wakeup/wakeup u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/soc:goodix_fp/wakeup u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/soc:md_testing_mode/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,ipa_fws/subsys0/wakeup u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/soc:qcom,ipa_fws/subsys3/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,kgsl-hyp/subsys3/wakeup u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/soc:qcom,kgsl-hyp/subsys4/wakeup u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/soc:qcom,trustedvm@d0800000/subsys1/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,trustedvm@d0800000/subsys2/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/soc/2c00000.qcom,kgsl-3d0 u:object_r:vendor_sysfs_msm_subsys:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu-cpu-llcc-bw u:object_r:vendor_sysfs_msm_subsys:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu-llcc-ddr-bw u:object_r:vendor_sysfs_msm_subsys:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,dsi-display u:object_r:vendor_sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,gpubw u:object_r:vendor_sysfs_msm_subsys:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,gpubw/devfreq u:object_r:vendor_sysfs_msm_subsys:s0
--- a/sepolicy/vendor/hal_ir_default.te
+++ b/sepolicy/vendor/hal_ir_default.te
@@ -1,3 +0,0 @@
-type lirc_device, dev_type;
-
-allow hal_ir_default lirc_device:chr_file rw_file_perms;
--- a/sepolicy/vendor/hal_power.te
+++ b/sepolicy/vendor/hal_power.te
@@ -1 +0,0 @@
-rw_dir_file(hal_power_default, proc)
--- a/sepolicy/vendor/hal_power_default.te
+++ b/sepolicy/vendor/hal_power_default.te
@@ -1,41 +1,3 @@
 type vendor_touchfeature_device, dev_type;

 allow hal_power_default vendor_touchfeature_device:chr_file rw_file_perms;
-
-allow hal_power_default vendor_sysfs_kgsl:lnk_file rw_file_perms;
-
-allow hal_power_default {
-  vendor_sysfs_devfreq
-  vendor_sysfs_msm_subsys
-}:dir search;
-
-allow hal_power_default {
-  input_device
-  vendor_latency_device
-}:chr_file rw_file_perms;
-
-allow hal_power_default {
-  cgroup
-  proc
-  sysfs_devices_system_cpu
-  vendor_sysfs_graphics
-  vendor_sysfs_devfreq
-  vendor_sysfs_kgsl
-  vendor_sysfs_scsi_host
-}:{
-  file
-  lnk_file
-} rw_file_perms;
-
-allow hal_power_default {
-  cgroup
-  input_device
-  vendor_sysfs_devfreq
-}:dir r_dir_perms;
-
-
-# Rule for hal_power_default to access graphics composer process
-unix_socket_connect(hal_power_default, vendor_pps, hal_graphics_composer_default);
-
-# To get/set powerhal state propert
-set_prop(hal_power_default, vendor_power_prop)
--- a/shim/Android.bp
+++ b/shim/Android.bp
@@ -0,0 +1,15 @@
+//
+// Copyright (C) 2022-2025 The LineageOS Project
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+cc_library {
+    name: "libmisightjson_shim",
+    srcs: [
+        "libmisightjson/json_value.cpp",
+    ],
+	shared_libs: ["libjsoncpp"],
+    compile_multilib: "both",
+    vendor: true,
+}
--- a/shim/libmisightjson/json_value.cpp
+++ b/shim/libmisightjson/json_value.cpp
@@ -0,0 +1,12 @@
+/*
+ * Copyright (C) 2024 The LineageOS Project
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <json/value.h>
+
+extern "C" Json::Value* _ZN4Json5ValueC1Ex(Json::Value* thisptr, Json::Value other) {
+    *thisptr = other;
+    return thisptr;
+}
--- a/system.prop
+++ b/system.prop
@@ -10,6 +10,10 @@ debug.hwui.skia_atrace_enabled=false
 # Display
 debug.cpurend.vsync=false

+# Deep Sleep
+pm.sleep_mode=1
+vendor.post_boot.parsed=1s
+
 # Graphics
 debug.sf.disable_backpressure=1
 debug.sf.enable_hwc_vds=0
--- a/vendor.prop
+++ b/vendor.prop
@@ -47,8 +47,6 @@ ro.vendor.audio.soundtrigger.xiaomievent=1
 ro.vendor.audio.soundtrigger=sva
 ro.vendor.audio.us.proximity=true
 vendor.audio.adm.buffering.ms=6
-vendor.audio.dolby.ds2.enabled=false
-vendor.audio.dolby.ds2.hardbypass=false
 vendor.audio.enable.mirrorlink=false
 vendor.audio.feature.a2dp_offload.enable=true
 vendor.audio.feature.afe_proxy.enable=true
@@ -78,7 +76,7 @@ vendor.audio.feature.hifi_audio.enable=false
 vendor.audio.feature.hwdep_cal.enable=false
 vendor.audio.feature.incall_music.enable=true
 vendor.audio.feature.keep_alive.enable=true
-vendor.audio.feature.kpi_optimize.enable=false
+vendor.audio.feature.kpi_optimize.enable=true
 vendor.audio.feature.maxx_audio.enable=false
 vendor.audio.feature.multi_voice_session.enable=true
 vendor.audio.feature.power_mode.enable=false
@@ -178,8 +176,6 @@ persist.vendor.dpmhalservice.enable=1
 vendor.gatekeeper.disable_spu=true

 # Graphics
-debug.egl.hw=0
-debug.mdpcomp.logs=0
 debug.sf.enable_advanced_sf_phase_offset=1
 debug.sf.enable_gl_backpressure=0
 debug.sf.enable_transaction_tracing=false
@@ -187,16 +183,15 @@ debug.sf.high_fps_early_gl_phase_offset_ns=-4000000
 debug.sf.high_fps_early_phase_offset_ns=-4000000
 debug.sf.high_fps_late_app_phase_offset_ns=1000000
 debug.sf.high_fps_late_sf_phase_offset_ns=-4000000
-debug.sf.hw=0
 debug.sf.auto_latch_unsignaled=0
 debug.sf.latch_unsignaled=1
 debug.sf.defer_refresh_rate_when_off=1
 debug.sf.treat_170m_as_sRGB=1
 debug.sf.set_idle_timer_ms=3000
 debug.sf.frame_rate_multiple_threshold=60
-persist.sys.sf.color_mode=9
+persist.sys.sf.color_mode=0
 persist.sys.sf.color_saturation=1.0
-persist.sys.sf.native_mode=2
+persist.sys.sf.native_mode=268
 debug.sf.predict_hwc_composition_strategy=0
 ro.config.avoid_gfx_accel=true
 ro.hardware.egl=adreno
@@ -269,7 +264,6 @@ persist.vendor.radio.hidl_dev_service=true
 persist.vendor.radio.manual_nw_rej_ct=1
 persist.vendor.radio.procedure_bytes=SKIP
 persist.vendor.radio.rat_on=combine
-persist.vendor.radio.redir_party_num=1
 persist.vendor.radio.sib16_support=1
 persist.vendor.qti.telephony.vt_cam_interface=2
 ro.telephony.block_binder_thread_on_incoming_calls=false
@@ -296,7 +290,6 @@ ro.incremental.enable=yes
 vendor.sys.thermal.data.path=/data/vendor/thermal/

 # USB
-persist.vendor.usb.config=mtp,adb
 vendor.usb.use_ffs_mtp=1

 # Wifi
Author	SHA1	Message	Date
thepriyanshujangid	a9d116858a	h	2026-01-17 20:07:48 +05:30
thepriyanshujangid	3a20ed8bfc	Revert "redwood: sepolicy: Remove commonized labels" This reverts commit `db563fedf4`.	2026-01-17 20:06:04 +05:30
basamaryan	7eff38599d	redwood: QPR2: Override kernel BPF version to 5.10.239 Change-Id: I3c581f3120b6258b3b45020c5ba12f6bf5b0ee27 Signed-off-by: Tashfin Shakeer Rhythm <tashfinshakeerrhythm@gmail.com>	2026-01-16 21:03:59 +05:30
Michael Bestas	f41cd3be45	redwood: QPR2: 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 Signed-off-by: Tashfin Shakeer Rhythm <tashfinshakeerrhythm@gmail.com>	2026-01-16 21:00:12 +05:30
Yumi Yukimura	99bcecc886	redwood: QPR1: Prepend soong ns to lib_driver_cmd_qcwcn Change-Id: I09bfb412e3554d349c4ad123c83d46a7933611d	2026-01-16 20:50:23 +05:30
0xCAFEBABE	a84f0d464c	redwood: QPR1: Update some soong config variables to bool type	2026-01-16 20:49:56 +05:30
Tashfin Shakeer Rhythm	878bbfb278	redwood: Drop display and graphics allocator v3 for mialgoengine Unneeded and it spams logcat with unnecessary dlopen failure even though the libs exist but the camera fails to read them. Signed-off-by: Tashfin Shakeer Rhythm <tashfinshakeerrhythm@gmail.com>	2026-01-10 14:25:14 +05:30
Silesh K Nair	77e6010c66	redwood: Import libmisight for citsensorservice error: vendor/xiaomi/redwood/Android.bp:11001:1: "vendor.xiaomi.hardware.citsensorservice@1.1-impl" depends on undefined module "libmisight". Also, E vndksupport: Could not load /vendor/lib64/hw/vendor.xiaomi.hardware.citsensorservice@1.1-impl.so from default namespace: dlopen failed: cannot locate symbol "_ZN4Json5ValueaSES0_" referenced by "/vendor/lib64/libmisight.so".... E vndksupport: Could not load /vendor/lib64/hw/vendor.xiaomi.hardware.citsensorservice@1.1-impl.so from default namespace: dlopen failed: cannot locate symbol "_ZN4Json5ValueC1Ex" referenced by "/vendor/lib64/libmisight.so".... Signed-off-by: thepriyanshujangid <priyanshujangid@yahoo.com>	2026-01-10 14:25:14 +05:30
LuK1337	24e7c24e75	redwood: Opt out of speaker_layout_channel_mask field Required for ABI compatibility with audio HAL compiled before 15 QPR2. Fixes: https://gitlab.com/LineageOS/issues/android/-/issues/9426 Change-Id: I0bf7eafbeb19957326de04ecf7b903580315dc59	2026-01-10 14:25:14 +05:30
Giovanni Ricca	db563fedf4	redwood: sepolicy: Remove commonized labels * Required after Id2111f398cd1c7a02fa0262676314188e08c79e7 Change-Id: I2ccd83de9b9474327da4ff118bae54d425e9adaf	2026-01-10 14:25:10 +05:30
LuK1337	5ceb94215a	redwood: Remove vendor/lineage device framework matrix inclusion See: I78da6340f38b93fdc4c3694cb8f431f387d16c0d Change-Id: I0b9f527de50ca02082be9b92375559f4893b2688	2026-01-10 07:24:19 +05:30
thepriyanshujangid	bf880cb9a0	redwood: Unset BUILD_BROKEN_DUP_RULES	2026-01-10 07:23:57 +05:30
thepriyanshujangid	69f674d170	redwood: Drop prebuilt vendor.xiaomi.hardware.displayfeature@1.0.so	2026-01-10 07:23:42 +05:30
thepriyanshujangid	12b5c96f04	Revert "redwood: Enable CameraX extensions support" This reverts commit `a9e496223c`.	2026-01-09 07:49:40 +05:30
thepriyanshujangid	fb905799de	Revert "redwood: Import Xiaomi Misys prebuilts" This reverts commit `0e3c134a6e`.	2026-01-09 07:49:40 +05:30
Giovanni Ricca	716e403e03	redwood: Update display stack from sunstone V816.0.8.0.UMQMIXM	2026-01-09 07:49:40 +05:30
priyanshu jangid	78b3680dd6	redwood: Unpinned adreno stack * Extracted from redwood OS2.0.13.0.UMSMIXM	2026-01-09 07:49:40 +05:30
thepriyanshujangid	ddc4fe054a	redwood: Update blobs to OS2.0.16.0.UMSMIXM	2026-01-09 07:49:30 +05:30
Sebastiano Barezzi	fb254fe48f	redwood: props: Remove debug.mdpcomp.logs Unused Change-Id: I20a6ab0d27c1a80fb0e0e14b742241ac87723c45	2026-01-08 17:33:59 +05:30
Georg Veichtlbauer	d858b7a67c	redwood: props: Remove obsolete SurfaceFlinger properties * debug.sf.hw & debug.egl.hw were removed. Change-Id: I8d38f3257b5f6b56c0f6b79cf4fb406a47d64af8	2026-01-08 17:33:59 +05:30
kyasu	34182d672d	redwood: Disable `thumbnail_block_model` of libstagefright Change-Id: I86f92335af282d3de508150bbbcb3026993ec48c	2026-01-08 17:33:59 +05:30
thepriyanshujangid	128a81b58a	redwood: Update blobs to OS2.0.11.0.UMSMIXM This reverts commit `c41d46a335`.	2026-01-08 17:33:59 +05:30
thepriyanshujangid	5ef90624df	redwood: Initialize for EvolutionX 11.X	2026-01-08 17:33:59 +05:30
thepriyanshujangid	1c0d6b289f	Revert "redwood: props: Set USB config to mtp,adb by default" This reverts commit `04cbda3b85`.	2026-01-08 17:33:59 +05:30
thepriyanshujangid	9bb72dfeca	Revert "redwood: props: set adb debugging props for now" This reverts commit `b98d48aea9`.	2026-01-08 17:33:59 +05:30
kyasu	d6c45aee0e	redwood: Migrate QTI power HAL to soong_config_set * Set libpowermode extension lib via soong config Change-Id: I02e69b57f11e3cc1eb61d02bba65e97b119c0bbe Signed-off-by: thepriyanshujangid <priyanshujangid@yahoo.com>	2026-01-08 17:33:59 +05:30
thepriyanshujangid	ca086bcafd	redwood: Update blobs to OS2.0.10.0.UMSMIXM	2026-01-08 17:33:59 +05:30
ccfries	c41d46a335	redwood: Set VENDOR_SECURITY_PATCH to PLATFORM Set the VENDOR_SECURITY_PATCH level to match the platform security patch level. These are functionally the same.	2025-10-12 18:31:54 +05:30
thepriyanshujangid	c9ca8daa9f	redwood: Update blobs to OS2.0.9.0.UMSMIXM	2025-10-12 18:31:54 +05:30
thepriyanshujangid	7319331888	redwood: Switch to QTI power hal Signed-off-by: thepriyanshujangid <priyanshujangid@yahoo.com>	2025-10-12 18:31:54 +05:30
kamikaonashi	52eeea9216	redwood: rootdir: dont stop statsd anymore on Android 16, this causes logspam of "W libc : Unable to set property "ctl.interface_start" to "aidl/stats": PROP_ERROR_HANDLE_CONTROL_MESSAGE (0x20)" did google fix the battery drain? Signed-off-by: thepriyanshujangid <priyanshujangid@yahoo.com>	2025-10-12 18:31:54 +05:30
Silesh K Nair	116f525dea	redwood: rootdir: Prefer deep over s2idle for yupik	2025-10-12 18:31:54 +05:30
Chenyang Zhong	32c9ac8cc2	redwood: rootdir: switch to lz4kd for zram Signed-off-by: Chenyang Zhong <zhongcy95@gmail.com>	2025-10-12 18:31:54 +05:30
Bin	6aca4bf782	redwood: Patch audio to load libaudioroute-v34.so	2025-10-12 18:31:54 +05:30
Michael Bestas	d87029677a	redwood: sepolicy: Remove duplicate labels Change-Id: I3575e6bad93b2f9d69f94033944c44b7f9fbc243	2025-10-12 18:31:54 +05:30
TheMysticle	a9e496223c	redwood: Enable CameraX extensions support - Set `ro.camerax.extensions.enabled=true` in both system.prop and odm.prop - Add `camerax-vendor-extensions.jar` to system - Grant required permission via `camerax-vendor-extensions.xml` Enables support for enhanced camera features via CameraX Extensions, improving compatibility with modern camera apps.	2025-10-12 18:31:54 +05:30
Silesh K Nair	0e3c134a6e	redwood: Import Xiaomi Misys prebuilts *moved to common from DT	2025-10-12 18:31:54 +05:30
Vaisakh Murali	44096b9749	redwood: Move over to AOSP way of shipping kernel Signed-off-by: thepriyanshujangid <priyanshujangid@yahoo.com>	2025-10-12 18:31:54 +05:30
Hridaya Prajapati	d77664e5f1	redwood: switch to common AIDL IR service Change-Id: I36c05aaa312969e479896c6e63a26a68cf897afa	2025-10-12 18:31:54 +05:30
thepriyanshujangid	c746a93a60	redwood: Switch to lineage kernel	2025-10-12 18:31:54 +05:30
Michael W	40cfd97fac	redwood: overlay: Disable NearbyMessagesService * This commit fixes slow Internet speed while using Bluetooth Change-Id: c1a85c4647b200cba4cad640bdc496419023cb04 Signed-off-by: romgharti <romgharti@gmail.com>	2025-10-12 18:31:54 +05:30
Arian	8cbbb16d8f	redwood: Generate qcrilNr.db during build Change-Id: I1f3425713b9b5b1cc7185bc94124b9f01efe3abb	2025-10-12 18:31:54 +05:30
lemezohaib	8908071947	redwood: Move libcameraservice extension lib to select() Signed-off-by: lemezohaib <zhbkhan644@gmail.com>	2025-10-12 18:31:54 +05:30
thepriyanshujangid	44e86e4dd0	redwood: Move camera package name to select()	2025-10-12 18:31:54 +05:30
Bruno Martins	fe4f4ac894	redwood: Move camera override format from reserved to select()	2025-10-12 18:31:54 +05:30
Bruno Martins	c8bfc7333b	redwood: Move libperfmgr mode extension lib to select() Change-Id: I39ac8867d98808832738f58eb6f50d456d6d34c4	2025-10-12 18:31:54 +05:30
Bruno Martins	8f80195da3	redwood: Move Lineage Health HAL to select() Change-Id: I2eff39e83b9673aa2989d05de65c646241ba61da	2025-10-12 18:31:54 +05:30
yingjiew	fe4ab8729a	redwood: gps: Avoid access of deprecated LocUnorderedSetMap entry When there is no client listens to some DataItemId, we will remove the map entry. Can't access the deleted entry's iterator anymore. Change-Id: Id64aadebf7362667fbcf0fd5191f888ed9241727 CRs-Fixed: 3886536 (cherry picked from commit 0049d459cc1772f328e29a4c6b6d129af132e7b8)	2025-10-12 18:31:54 +05:30
Michael Bestas	05de58c9d9	redwood: gps: Remove CleanSpec.mk Change-Id: Id5a91ac0dfc35cd4c84218f02e50c0905e04c43a Signed-off-by: Fiqri Ardyansyah <fiqri191002@gmail.com>	2025-10-12 18:31:54 +05:30
Adithya R	859fe54c85	redwood: Switch to vendor-defined color modes	2025-10-12 18:31:54 +05:30
New Author Name	adc338e4f8	redwood: audio: Use QCOM implementation for audio effects * AOSP effects doesn't give as thicc'n'sicc bass boost as the QC effects do.	2025-10-12 18:31:54 +05:30
New Author Name	1a48e751f0	redwood: Include Sony Dolby Atmos Co-Authored-By: HELLBOY017 <abhaygill017@gmail.com> Signed-off-by: swiitchOFF <120115258+swiitchOFF@users.noreply.github.com>	2025-10-12 18:31:52 +05:30