From 7b08fd04aac7e4ea085f886868ab9bc1030b06fd 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 related
 settings

Bug: 245445796
Test: Manually
Change-Id: If7b54dcf5f76cbae8662f7e5117fedbe41e26ea1
---
 bluetooth/manifest_bluetooth.xml | 27 ---------------------------
 manifest.xml                     |  9 +++++++++
 2 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/bluetooth/manifest_bluetooth.xml b/bluetooth/manifest_bluetooth.xml
index 71a8da2..1a53cbb 100644
--- a/bluetooth/manifest_bluetooth.xml
+++ b/bluetooth/manifest_bluetooth.xml
@@ -8,15 +8,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>hardware.google.bluetooth.bt_channel_avoidance</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IBTChannelAvoidance</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>hardware.google.bluetooth.sar</name>
         <transport>hwbinder</transport>
@@ -26,22 +17,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>
-    <hal format="hidl">
-        <name>hardware.google.bluetooth.ext</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IBluetoothExt</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
 </manifest>
diff --git a/manifest.xml b/manifest.xml
index 65f48c3..8ece978 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -122,6 +122,15 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>hardware.google.bluetooth.sar</name>
+        <transport>hwbinder</transport>
+        <version>1.1</version>
+        <interface>
+            <name>IBluetoothSar</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl">
        <name>vendor.google.whitechapel.audio.audioext</name>
        <transport>hwbinder</transport>