diff --git a/proprietary/vendor/bin/adpl b/proprietary/vendor/bin/adpl
index aa4707e..cc4492f 100755
Binary files a/proprietary/vendor/bin/adpl and b/proprietary/vendor/bin/adpl differ
diff --git a/proprietary/vendor/bin/init.qti.media.sh b/proprietary/vendor/bin/init.qti.media.sh
deleted file mode 100755
index 231a82e..0000000
--- a/proprietary/vendor/bin/init.qti.media.sh
+++ /dev/null
@@ -1,132 +0,0 @@
-#! /vendor/bin/sh
-#==============================================================================
-# init.qti.media.sh
-#
-# Copyright (c) 2020-2023, Qualcomm Technologies, Inc.
-# All Rights Reserved.
-# Confidential and Proprietary - Qualcomm Technologies, Inc.
-#
-# Copyright (c) 2020, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#===============================================================================
-
-if [ -f /sys/devices/soc0/soc_id ]; then
- soc_hwid=`cat /sys/devices/soc0/soc_id` 2> /dev/null
-else
- soc_hwid=`cat /sys/devices/system/soc/soc0/id` 2> /dev/null
-fi
-
-target_qssi=`getprop vendor.media.target.qssi`
-target=`getprop ro.board.platform`
-build_codename=`getprop vendor.media.system.build_codename`
-product=`getprop ro.build.product`
-
-case "$target" in
- "lahaina")
- case "$soc_hwid" in
- 475|515)
- setprop vendor.media.target_variant "_yupik_v0"
- if [ $build_codename -le "13" ]; then
- setprop vendor.netflix.bsp_rev "Q7325-SPY-33758-1"
- fi
- sku_ver=`cat /sys/devices/platform/soc/aa00000.qcom,vidc/sku_version` 2> /dev/null
- if [ $sku_ver -eq 1 ]; then
- setprop vendor.media.target_variant "_yupik_v1"
- fi
- ;;
- 450)
- setprop vendor.media.target_variant "_shima_v3"
- if [ $build_codename -le "13" ]; then
- setprop vendor.netflix.bsp_rev "Q875-32774-1"
- fi
- sku_ver=`cat /sys/devices/platform/soc/aa00000.qcom,vidc/sku_version` 2> /dev/null
- if [ $sku_ver -eq 1 ]; then
- setprop vendor.media.target_variant "_shima_v1"
- elif [ $sku_ver -eq 2 ]; then
- setprop vendor.media.target_variant "_shima_v2"
- fi
- ;;
- 497|498|575|576)
- setprop vendor.media.target_variant "_yupik_iot"
- ;;
- *)
- if [ $target_qssi == "true" ]; then
- setprop vendor.media.target_variant "_lahaina_vendor"
- else
- setprop vendor.media.target_variant "_lahaina"
- fi
- if [ $build_codename -le "13" ]; then
- setprop vendor.netflix.bsp_rev "Q875-32408-1"
- fi
- ;;
- esac
- ;;
- "holi")
- case "$soc_hwid" in
- 507|565|628)
- setprop vendor.media.target_variant "_blair"
- if [ $build_codename -le "14" ]; then
- setprop vendor.netflix.bsp_rev "Q4350-32962-1"
- fi
- ;;
- 578)
- setprop vendor.media.target_variant "_blair_lite"
- if [ $build_codename -le "14" ]; then
- setprop vendor.netflix.bsp_rev "Q4350-32962-1"
- fi
- ;;
- 454|472)
- setprop vendor.media.target_variant "_holi"
- if [ $build_codename -le "14" ]; then
- setprop vendor.netflix.bsp_rev "Q4350-32962-1"
- fi
- ;;
- esac
- ;;
- "msmnile")
- setprop vendor.media.target_variant "_msmnile"
- if [ $product == "msmnile_gvmq" ] || [ $product == "msmnile_gvmgh" ]; then
- case "$soc_hwid" in
- 460)
- setprop vendor.media.target_variant "_direwolf"
- ;;
- 377)
- setprop vendor.media.target_variant "_sm6150"
- ;;
- 362|405)
- setprop vendor.media.target_variant "_msmnile"
- ;;
- esac
- fi
- ;;
- "sm6150")
- setprop vendor.media.target_variant "_sm6150"
- ;;
- "direwolf")
- setprop vendor.media.target_variant "_direwolf"
- ;;
-esac
diff --git a/proprietary/vendor/etc/init/init.qti.media.rc b/proprietary/vendor/etc/init/init.qti.media.rc
deleted file mode 100644
index b55189d..0000000
--- a/proprietary/vendor/etc/init/init.qti.media.rc
+++ /dev/null
@@ -1,53 +0,0 @@
-#==============================================================================
-# init.qti.media.rc
-#
-# Copyright (c) 2020 Qualcomm Technologies, Inc.
-# All Rights Reserved.
-# Confidential and Proprietary - Qualcomm Technologies, Inc.
-#
-# Copyright (c) 2020, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#===============================================================================
-service qti-media /vendor/bin/init.qti.media.sh
- class main
- user media
- group media
- disabled
- oneshot
- seclabel u:r:vendor_qti_media:s0
-
-on post-fs
- setprop vendor.media.target.qssi ${vendor.sys.media.target.qssi}
- setprop vendor.media.system.build_codename ${ro.build.version.release_or_codename}
- start qti-media
-
-on post-fs-data
- setprop ro.media.xml_variant.codecs ${vendor.media.target_variant}
- setprop ro.media.xml_variant.codecs_performance ${vendor.media.target_variant}
-
-on property:vendor.netflix.bsp_rev=*
- setprop ro.netflix.bsp_rev ${vendor.netflix.bsp_rev}
diff --git a/proprietary/vendor/etc/init/vendor.qti.hardware.charger_monitor@1.0-service.rc b/proprietary/vendor/etc/init/vendor.qti.hardware.charger_monitor@1.0-service.rc
index ad490d3..ea53277 100644
--- a/proprietary/vendor/etc/init/vendor.qti.hardware.charger_monitor@1.0-service.rc
+++ b/proprietary/vendor/etc/init/vendor.qti.hardware.charger_monitor@1.0-service.rc
@@ -22,7 +22,7 @@ on boot
enable vendor.qti-chg-policy-sh
start vendor.qti-chg-policy-sh
-on property:init.svc.vendor.charger=running
+on charger
chown radio wakelock /sys/power/wake_lock
chmod 0660 /sys/power/wake_lock
chown radio wakelock /sys/power/wake_unlock
diff --git a/proprietary/vendor/etc/vintf/manifest/vendor.dolby.media.c2@1.0-service.xml b/proprietary/vendor/etc/vintf/manifest/vendor.dolby.media.c2@1.0-service.xml
index 8507e91..8647e74 100644
--- a/proprietary/vendor/etc/vintf/manifest/vendor.dolby.media.c2@1.0-service.xml
+++ b/proprietary/vendor/etc/vintf/manifest/vendor.dolby.media.c2@1.0-service.xml
@@ -20,6 +20,5 @@
default
software
- @1.0::IComponentStore/default9
diff --git a/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so b/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so
index 5551dd5..1b4e6d1 100644
Binary files a/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so and b/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so differ
diff --git a/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so b/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so
index 3f9ae68..7617396 100644
Binary files a/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so and b/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so differ
diff --git a/proprietary/vendor/lib/libbluetooth_audio_session_qti.so b/proprietary/vendor/lib/libbluetooth_audio_session_qti.so
index 2eaa3ef..1db0548 100644
Binary files a/proprietary/vendor/lib/libbluetooth_audio_session_qti.so and b/proprietary/vendor/lib/libbluetooth_audio_session_qti.so differ
diff --git a/proprietary/vendor/lib/libbluetooth_audio_session_qti_2_1.so b/proprietary/vendor/lib/libbluetooth_audio_session_qti_2_1.so
index 5b3b138..16b6f2f 100644
Binary files a/proprietary/vendor/lib/libbluetooth_audio_session_qti_2_1.so and b/proprietary/vendor/lib/libbluetooth_audio_session_qti_2_1.so differ
diff --git a/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so
index 77bffa1..41ac939 100644
Binary files a/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so and b/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so differ
diff --git a/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so
index 2389315..9a3e07a 100644
Binary files a/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so and b/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so differ
diff --git a/proprietary/vendor/lib64/libbluetooth_audio_session_qti.so b/proprietary/vendor/lib64/libbluetooth_audio_session_qti.so
index 26e30b8..6764f8e 100644
Binary files a/proprietary/vendor/lib64/libbluetooth_audio_session_qti.so and b/proprietary/vendor/lib64/libbluetooth_audio_session_qti.so differ
diff --git a/proprietary/vendor/lib64/libbluetooth_audio_session_qti_2_1.so b/proprietary/vendor/lib64/libbluetooth_audio_session_qti_2_1.so
index a052ec0..d24d73e 100644
Binary files a/proprietary/vendor/lib64/libbluetooth_audio_session_qti_2_1.so and b/proprietary/vendor/lib64/libbluetooth_audio_session_qti_2_1.so differ
diff --git a/proprietary/vendor/lib64/libqcrilNr.so b/proprietary/vendor/lib64/libqcrilNr.so
index 6bbcfc3..7abbff2 100644
Binary files a/proprietary/vendor/lib64/libqcrilNr.so and b/proprietary/vendor/lib64/libqcrilNr.so differ
diff --git a/proprietary/vendor/lib64/libqcrilNrFramework.so b/proprietary/vendor/lib64/libqcrilNrFramework.so
index f4f6a3b..39ea477 100644
Binary files a/proprietary/vendor/lib64/libqcrilNrFramework.so and b/proprietary/vendor/lib64/libqcrilNrFramework.so differ
diff --git a/proprietary/vendor/lib64/libqcrilNrQtiBus.so b/proprietary/vendor/lib64/libqcrilNrQtiBus.so
index 8f48ba8..d190685 100644
Binary files a/proprietary/vendor/lib64/libqcrilNrQtiBus.so and b/proprietary/vendor/lib64/libqcrilNrQtiBus.so differ
diff --git a/proprietary/vendor/lib64/libqcrilNrQtiMutex.so b/proprietary/vendor/lib64/libqcrilNrQtiMutex.so
index 8a9916e..aa48fb2 100644
Binary files a/proprietary/vendor/lib64/libqcrilNrQtiMutex.so and b/proprietary/vendor/lib64/libqcrilNrQtiMutex.so differ
diff --git a/proprietary/vendor/lib64/libril-db.so b/proprietary/vendor/lib64/libril-db.so
index ac8066b..2bf3bea 100644
Binary files a/proprietary/vendor/lib64/libril-db.so and b/proprietary/vendor/lib64/libril-db.so differ
diff --git a/proprietary/vendor/lib64/qtiril-utils.so b/proprietary/vendor/lib64/qtiril-utils.so
index 604bdbf..e5fa320 100644
Binary files a/proprietary/vendor/lib64/qtiril-utils.so and b/proprietary/vendor/lib64/qtiril-utils.so differ
diff --git a/proprietary/vendor/lib64/qtiwakelock.so b/proprietary/vendor/lib64/qtiwakelock.so
index 83a8fc3..a738052 100644
Binary files a/proprietary/vendor/lib64/qtiwakelock.so and b/proprietary/vendor/lib64/qtiwakelock.so differ
diff --git a/sm6375-common-vendor.mk b/sm6375-common-vendor.mk
index 3ada26a..45d3c8d 100644
--- a/sm6375-common-vendor.mk
+++ b/sm6375-common-vendor.mk
@@ -127,7 +127,6 @@ PRODUCT_COPY_FILES += \
vendor/motorola/sm6375-common/proprietary/vendor/bin/ims_rtp_daemon:$(TARGET_COPY_OUT_VENDOR)/bin/ims_rtp_daemon \
vendor/motorola/sm6375-common/proprietary/vendor/bin/imsdaemon:$(TARGET_COPY_OUT_VENDOR)/bin/imsdaemon \
vendor/motorola/sm6375-common/proprietary/vendor/bin/init.qcom.sensors.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qcom.sensors.sh \
- vendor/motorola/sm6375-common/proprietary/vendor/bin/init.qti.media.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qti.media.sh \
vendor/motorola/sm6375-common/proprietary/vendor/bin/irsc_util:$(TARGET_COPY_OUT_VENDOR)/bin/irsc_util \
vendor/motorola/sm6375-common/proprietary/vendor/bin/ks:$(TARGET_COPY_OUT_VENDOR)/bin/ks \
vendor/motorola/sm6375-common/proprietary/vendor/bin/loadalgo:$(TARGET_COPY_OUT_VENDOR)/bin/loadalgo \
@@ -223,7 +222,6 @@ PRODUCT_COPY_FILES += \
vendor/motorola/sm6375-common/proprietary/vendor/etc/init/ims_rtp_daemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/ims_rtp_daemon.rc \
vendor/motorola/sm6375-common/proprietary/vendor/etc/init/imsdaemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/imsdaemon.rc \
vendor/motorola/sm6375-common/proprietary/vendor/etc/init/init-qcril-data.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init-qcril-data.rc \
- vendor/motorola/sm6375-common/proprietary/vendor/etc/init/init.qti.media.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.qti.media.rc \
vendor/motorola/sm6375-common/proprietary/vendor/etc/init/init.time_daemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.time_daemon.rc \
vendor/motorola/sm6375-common/proprietary/vendor/etc/init/init.vendor.sensors.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.vendor.sensors.rc \
vendor/motorola/sm6375-common/proprietary/vendor/etc/init/init_thermal-engine.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init_thermal-engine.rc \