From 560830597f11f624ef49827989c94290a98b362c Mon Sep 17 00:00:00 2001
From: jonerlin <jonerlin@google.com>
Date: Thu, 15 Sep 2022 19:41:06 +0800
Subject: [PATCH] Bluetooth: remove unsupported feature IBluetoothCcc settings

Bug: 245445796
Test: Manual + atest vts_treble_vintf_vendor_test
Change-Id: If7b54dcf5f76cbae8662f7e5117fedbe41e26ea1
Merged-In: If7b54dcf5f76cbae8662f7e5117fedbe41e26ea1
---
 bluetooth/manifest_bluetooth.xml              |  9 ---------
 device-tangorpro.mk                           |  1 -
 device_framework_matrix_product.xml           | 11 -----------
 device_framework_matrix_product_tangorpro.xml |  8 --------
 manifest.xml                                  |  9 ---------
 5 files changed, 38 deletions(-)
 delete mode 100644 device_framework_matrix_product.xml

diff --git a/bluetooth/manifest_bluetooth.xml b/bluetooth/manifest_bluetooth.xml
index 2d055f4..2033d87 100644
--- a/bluetooth/manifest_bluetooth.xml
+++ b/bluetooth/manifest_bluetooth.xml
@@ -26,13 +26,4 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>hardware.google.bluetooth.ccc</name>
-        <transport>hwbinder</transport>
-        <version>1.1</version>
-        <interface>
-            <name>IBluetoothCcc</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
 </manifest>
diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index d283a87..50f3e7c 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -50,7 +50,6 @@ DISABLE_TELEPHONY_EUICC := true
 include device/google/tangorpro/audio/tangorpro/audio-tables.mk
 include device/google/gs201/device-shipping-common.mk
 
-DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/tangorpro/device_framework_matrix_product.xml
 # go/lyric-soong-variables
 $(call soong_config_set,lyric,camera_hardware,tangorpro)
 $(call soong_config_set,lyric,tuning_product,tangorpro)
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
deleted file mode 100644
index c0f208c..0000000
--- a/device_framework_matrix_product.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<compatibility-matrix version="1.0" type="framework" level="7">
-    <hal format="hidl">
-        <name>hardware.google.bluetooth.ccc</name>
-        <version>1.1</version>
-        <interface>
-            <name>IBluetoothCcc</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-</compatibility-matrix>
-
diff --git a/device_framework_matrix_product_tangorpro.xml b/device_framework_matrix_product_tangorpro.xml
index 3974e7e..8d3af1c 100644
--- a/device_framework_matrix_product_tangorpro.xml
+++ b/device_framework_matrix_product_tangorpro.xml
@@ -1,12 +1,4 @@
 <compatibility-matrix version="1.0" type="framework" level="7">
-    <hal format="hidl">
-        <name>hardware.google.bluetooth.ccc</name>
-        <version>1.1</version>
-        <interface>
-            <name>IBluetoothCcc</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <!-- AudioProxy -->
     <hal format="aidl" optional="true">
         <name>device.google.atv.audio_proxy</name>
diff --git a/manifest.xml b/manifest.xml
index 1f0aebe..31dc019 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -149,15 +149,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>hardware.google.bluetooth.ccc</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IBluetoothCcc</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
        <name>vendor.google.whitechapel.audio.audioext</name>
        <transport>hwbinder</transport>