From 894727003b8b991815719e53b89392f38e72da01 Mon Sep 17 00:00:00 2001
From: Jerry Pai <jerrypai@google.com>
Date: Tue, 21 Jan 2025 01:57:41 -0800
Subject: [PATCH] Revert^2 "Add Bluetooth extension HAL - CCO"

This reverts commit 3e78c36e5fc02c76ca0a59d17da7bdb6857ed005.

Reason for revert: build break
ERROR: files are incompatible: The following instances are in the device manifest but not specified in framework compatibility matrix:
    vendor.google.bluetooth_ext.IBluetoothCco/default (@1)

Bug: 361443653
Change-Id: I59f325ad1d8af5fca54cc9bb8a6208c5c8c20939
---
 bcmbt/compatibility_matrix.xml  | 4 ++++
 bcmbt/manifest_bluetooth.xml    | 1 +
 bcmbt/sepolicy/service_contexts | 1 +
 3 files changed, 6 insertions(+)

diff --git a/bcmbt/compatibility_matrix.xml b/bcmbt/compatibility_matrix.xml
index 65b0c6d..54eda4b 100644
--- a/bcmbt/compatibility_matrix.xml
+++ b/bcmbt/compatibility_matrix.xml
@@ -26,5 +26,9 @@
             <name>IBluetoothEwp</name>
             <instance>default</instance>
         </interface>
+        <interface>
+            <name>IBluetoothCco</name>
+            <instance>default</instance>
+        </interface>
     </hal>
 </compatibility-matrix>
diff --git a/bcmbt/manifest_bluetooth.xml b/bcmbt/manifest_bluetooth.xml
index a72f1c9..3dc3f88 100644
--- a/bcmbt/manifest_bluetooth.xml
+++ b/bcmbt/manifest_bluetooth.xml
@@ -23,5 +23,6 @@
         <fqname>IBluetoothExt/default</fqname>
         <fqname>IBluetoothFinder/default</fqname>
         <fqname>IBluetoothSar/default</fqname>
+        <fqname>IBluetoothCco/default</fqname>
     </hal>
 </manifest>
diff --git a/bcmbt/sepolicy/service_contexts b/bcmbt/sepolicy/service_contexts
index 4aecc90..e91eb1e 100644
--- a/bcmbt/sepolicy/service_contexts
+++ b/bcmbt/sepolicy/service_contexts
@@ -5,3 +5,4 @@ vendor.google.bluetooth_ext.IBluetoothCcc/default                            u:o
 vendor.google.bluetooth_ext.IBluetoothEwp/default                            u:object_r:hal_bluetooth_coexistence_service:s0
 vendor.google.bluetooth_ext.IBluetoothExt/default                            u:object_r:hal_bluetooth_coexistence_service:s0
 vendor.google.bluetooth_ext.IBluetoothFinder/default                         u:object_r:hal_bluetooth_coexistence_service:s0
+vendor.google.bluetooth_ext.IBluetoothCco/default                            u:object_r:hal_bluetooth_coexistence_service:s0