diff --git a/device/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml b/device/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml
index 780589b5e754835b65e5010a5b520e34e97650d7..fc1fee247bced035dfcf1847bb5c261c4c5b283a 100644
--- a/device/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml
+++ b/device/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml
@@ -106,6 +106,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
<boolean name="allow_one_way_accept_video_call" value="true"/>
<!-- Config for multi anchor conference support -->
<boolean name="carrier_supports_multianchor_conference" value="false"/>
+ <!-- Config for Call Composer Feature support -->
+ <boolean name="carrier_call_composer_supported_bool" value="false"/>
</carrier_config>
<carrier_config mcc="001" mnc="01">
@@ -1776,6 +1778,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
<boolean name="carrier_wfc_ims_available_bool" value="true" />
<boolean name="allow_emergency_video_calls_bool" value="true" />
<boolean name="carrier_volte_tty_supported_bool" value="true" />
+ <boolean name="carrier_call_composer_supported_bool" value="true"/>
</carrier_config>
<carrier_config mcc="310" mnc="030">
@@ -1936,6 +1939,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
<boolean name="carrier_rtt_downgrade_supported" value="true"/>
<boolean name="carrier_wfc_supports_wifi_only_bool" value="true"/>
<boolean name="allow_one_way_accept_video_call" value="false"/>
+ <boolean name="carrier_call_composer_supported_bool" value="true"/>
</carrier_config>
<carrier_config mcc="310" mnc="160">
@@ -1956,6 +1960,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
<boolean name="carrier_rtt_downgrade_supported" value="true"/>
<boolean name="carrier_wfc_supports_wifi_only_bool" value="true"/>
<boolean name="allow_one_way_accept_video_call" value="false"/>
+ <boolean name="carrier_call_composer_supported_bool" value="true"/>
</carrier_config>
<carrier_config mcc="310" mnc="220">
@@ -1995,6 +2000,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
<boolean name="carrier_rtt_downgrade_supported" value="true"/>
<boolean name="carrier_wfc_supports_wifi_only_bool" value="true"/>
<boolean name="allow_one_way_accept_video_call" value="false"/>
+ <boolean name="carrier_call_composer_supported_bool" value="true"/>
</carrier_config>
<carrier_config mcc="310" mnc="490">
@@ -2058,6 +2064,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
<boolean name="carrier_rtt_upgrade_supported" value="false"/>
<boolean name="support_downgrade_vt_to_audio_bool" value="true" />
<boolean name="support_emergency_sms_over_ims_bool" value="true" />
+ <boolean name="carrier_call_composer_supported_bool" value="true"/>
</carrier_config>
<carrier_config mcc="312" mnc="530">
diff --git a/qti_whitelist.xml b/qti_whitelist.xml
index 0d1acdb8efeaf598b7fd23aeaad18242811e6456..3bed39678fdccb65a80477009ddb37fe839b2e28 100755
--- a/qti_whitelist.xml
+++ b/qti_whitelist.xml
@@ -114,4 +114,5 @@
<hidden-api-whitelisted-app package="com.qualcomm.wfd.service" />
<hidden-api-whitelisted-app package="com.qualcomm.qti.server.wigigapp" />
<hidden-api-whitelisted-app package="com.qti.service.colorservice" />
+ <allow-implicit-broadcast action="org.codeaurora.intent.action.CALL_COMPOSER_INFO" />
</config>
diff --git a/rootdir/etc/init.qcom.post_boot.sh b/rootdir/etc/init.qcom.post_boot.sh
index 8aeca36a50e6d616daea6ac1ce95141aa023e29b..d3867b59aedfafd8b8983ec34dcb190bff21fbb3 100644
--- a/rootdir/etc/init.qcom.post_boot.sh
+++ b/rootdir/etc/init.qcom.post_boot.sh
@@ -3895,7 +3895,7 @@ case "$target" in
fi
case "$soc_id" in
- "417" | "420" | "444" | "445" )
+ "417" | "420" | "444" | "445" | "469" | "470" )
# Core control is temporarily disabled till bring up
echo 0 > /sys/devices/system/cpu/cpu0/core_ctl/enable
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 88cadb58c0f6c4062e5eb8d31d09103dbb5868de..060bd88ee62f48f03dea0d5e5aea3446a9f1a835 100755
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -504,9 +504,6 @@ on property:vendor.bluetooth.dun.status=running
on property:vendor.bluetooth.dun.status=stopped
stop vendor.bt-dun
-on property:ro.bluetooth.ftm_enabled=true
- start ftmd
-
on property:vendor.bluetooth.startbtlogger=true
start vendor.bt_logger
@@ -559,13 +556,6 @@ service vendor.bt_logger /system/bin/bt_logger
disabled
oneshot
-service ftmd /system/bin/logwrapper /system/bin/ftmdaemon
- class late_start
- user root
- group bluetooth net_bt_admin misc diag net_bt
- disabled
- oneshot
-
service qmiproxy /system/bin/qmiproxy
class main
user radio
diff --git a/rootdir/etc/init.qti.debug-bengal.sh b/rootdir/etc/init.qti.debug-bengal.sh
index 97957ed38c6706b7359bab450c046d5bde539068..b8258c91a095b3c12971b343c8f5a8c5707568cf 100644
--- a/rootdir/etc/init.qti.debug-bengal.sh
+++ b/rootdir/etc/init.qti.debug-bengal.sh
@@ -81,6 +81,12 @@ enable_bengal_tracing_events()
echo 1 > /sys/kernel/debug/tracing/events/psi/psi_event/enable
echo 1 > /sys/kernel/debug/tracing/events/psi/psi_window_vmstat/enable
+ #enable preemption and irq off traces 500 ms for preemption and 100 ms for irq off
+ echo 500000000 > /proc/sys/kernel/preemptoff_tracing_threshold_ns
+ echo 1 > /sys/kernel/debug/tracing/events/sched/sched_preempt_disable/enable
+ echo 100000000 > /proc/sys/kernel/irqsoff_tracing_threshold_ns
+ echo 1 > /sys/kernel/debug/tracing/events/preemptirq/irqs_disable/enable
+
#iommu events
echo 1 > /sys/kernel/debug/tracing/events/iommu/map/enable
echo 1 > /sys/kernel/debug/tracing/events/iommu/map_sg/enable
diff --git a/rootdir/etc/init.qti.debug-scuba.sh b/rootdir/etc/init.qti.debug-scuba.sh
index 92e56443cb930f442f6aea39e8db6d5ef76e8888..bc086709241dfbe1ef34ecae57c529655dcd5cc1 100644
--- a/rootdir/etc/init.qti.debug-scuba.sh
+++ b/rootdir/etc/init.qti.debug-scuba.sh
@@ -86,6 +86,15 @@ enable_scuba_tracing_events()
echo 1 > /sys/kernel/debug/tracing/events/iommu/map_sg/enable
echo 1 > /sys/kernel/debug/tracing/events/iommu/unmap/enable
+ #Preempt trace events
+ echo 'nsec' > /proc/sys/kernel/preemptoff_tracing_threshold_ns
+ echo 500000000 > /proc/sys/kernel/preemptoff_tracing_threshold_ns
+ echo 1 > /sys/kernel/debug/tracing/events/sched/sched_preempt_disable/enable
+ #irqsoff trace events
+ echo 'nsec' > /proc/sys/kernel/irqsoff_tracing_threshold_ns
+ echo 100000000 > /proc/sys/kernel/irqsoff_tracing_threshold_ns
+ echo 1 > /sys/kernel/debug/tracing/events/preemptirq/irqs_disable/enable
+
echo 1 > /sys/kernel/debug/tracing/tracing_on
}