From f2df33c8c6b123885973b4573cd87e7ec4625188 Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Thu, 15 Sep 2022 16:03:29 +0100
Subject: [PATCH] sdm710-common: Remove QTI BT stack bits

Change-Id: Ice6c2b0735aa7cb4b2e638a794c778883e706c97
---
 configs/component-overrides.xml | 19 -------------------
 proprietary-files.txt           |  2 --
 sdm710.mk                       |  4 ----
 vendor.prop                     |  6 ------
 4 files changed, 31 deletions(-)
 delete mode 100644 configs/component-overrides.xml

diff --git a/configs/component-overrides.xml b/configs/component-overrides.xml
deleted file mode 100644
index 4d058d3..0000000
--- a/configs/component-overrides.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 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.
--->
-<config>
-    <component-override package="com.android.bluetooth" >
-        <component class=".avrcpcontroller.AvrcpControllerService" enabled="true" />
-        <component class=".hid.HidDeviceService" enabled="true" />
-        <component class=".sap.SapService" enabled="true" />
-    </component-override>
-</config>
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 5fc8ee0..95c05fb 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -32,7 +32,6 @@ vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so|02123c4f94173f81d8830
 vendor/lib64/libbtnv.so|07e031527e60ce5e62a5017fd1d7ff83ef1aafcf
 
 # Bluetooth (A2DP)
-vendor/lib/hw/audio.bluetooth_qti.default.so
 vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so
 vendor/lib/hw/vendor.qti.hardware.bluetooth_sar@1.1-impl.so
 vendor/lib/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so
@@ -41,7 +40,6 @@ vendor/lib/btaudio_offload_if.so
 vendor/lib/libbluetooth_audio_session_qti.so
 vendor/lib/vendor.qti.hardware.bluetooth_sar@1.0.so
 vendor/lib/vendor.qti.hardware.bluetooth_sar@1.1.so
-vendor/lib64/hw/audio.bluetooth_qti.default.so
 vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so
 vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.1-impl.so
 vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so
diff --git a/sdm710.mk b/sdm710.mk
index 9ae583a..5ba3327 100644
--- a/sdm710.mk
+++ b/sdm710.mk
@@ -111,10 +111,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     android.hardware.ir@1.0-service.xiaomi
 
-# Component overrides
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml
-
 # Device-specific settings
 PRODUCT_PACKAGES += \
     XiaomiParts
diff --git a/vendor.prop b/vendor.prop
index cc39e13..596700f 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -119,13 +119,7 @@ persist.vendor.bt.aac_frm_ctl.enabled=true
 persist.vendor.btsatck.absvolfeature=true
 persist.vendor.btstack.a2dp_offload_cap=sbc-aptx-aptxtws-aptxhd-aac-ldac
 persist.vendor.btstack.enable.splita2dp=true
-persist.vendor.qcom.bluetooth.a2dp_offload_cap=sbc-aptx-aptxtws-aptxhd-aac-ldac
-persist.vendor.qcom.bluetooth.aac_frm_ctl.enabled=true
-persist.vendor.qcom.bluetooth.aac_vbr_ctl.enabled=false
-persist.vendor.qcom.bluetooth.enable.splita2dp=true
-persist.vendor.qcom.bluetooth.scram.enabled=true
 persist.vendor.qcom.bluetooth.soc=cherokee
-persist.vendor.qcom.bluetooth.twsp_state.enabled=false
 ro.bluetooth.a2dp_offload.supported=true
 ro.bluetooth.emb_wp_mode=true
 ro.bluetooth.wipower=true