From 53b6eec2beb9e9b6e65439abf0c795d8733ea2f9 Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Thu, 22 Sep 2022 00:40:01 +0100
Subject: [PATCH] sm6150-common: Drop component overrides

This is no longer needed as of Android 13.

Change-Id: I38435c47c8781678f82014decbbae40dcab0a07b
---
 configs/component-overrides.xml | 20 --------------------
 sm6150.mk                       |  3 ---
 2 files changed, 23 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 bb3419d..0000000
--- a/configs/component-overrides.xml
+++ /dev/null
@@ -1,20 +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=".sap.SapService" enabled="true" />
-    </component-override>
-</config>
\ No newline at end of file
diff --git a/sm6150.mk b/sm6150.mk
index 7d6c662..fd7cb2a 100644
--- a/sm6150.mk
+++ b/sm6150.mk
@@ -85,9 +85,6 @@ PRODUCT_PACKAGES += \
     vendor.qti.hardware.btconfigstore@1.0.vendor \
     vendor.qti.hardware.btconfigstore@2.0.vendor
 
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml
-
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.bluetooth_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth_le.xml \
     frameworks/native/data/etc/android.hardware.bluetooth.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth.xml