From a84661c2d1ad7d2dde0198ff479125c113e06043 Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Fri, 21 Oct 2022 19:52:29 +0530
Subject: [PATCH] sdm660-common: Drop component overrides

This is no longer needed as of Android 13.

Change-Id: I38435c47c8781678f82014decbbae40dcab0a07b
---
 configs/component-overrides.xml | 22 ----------------------
 sdm660.mk                       |  4 ----
 2 files changed, 26 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 99c21151..00000000
--- a/configs/component-overrides.xml
+++ /dev/null
@@ -1,22 +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/sdm660.mk b/sdm660.mk
index ed6c69db..f7c91517 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -98,10 +98,6 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_PACKAGES += \
     libcnefeatureconfig
 
-# Component overrides
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml
-
 # Display
 PRODUCT_PACKAGES += \
     gralloc.sdm660 \