From 3b213341d05a5cc6d83e9c66711eae20210feb2a Mon Sep 17 00:00:00 2001
From: Poompatai Puntitpong <poompatai@google.com>
Date: Tue, 27 Sep 2022 05:17:11 +0000
Subject: [PATCH] [conflict] Remove android.hardware.bluetooth.audio HAL from
 manifest

This HAL has been replaced with AIDL, so it does not exist anymore,
causing VtsHalBluetoothAudioV2_0TargetTest and VtsHalBluetoothAudioV2_1TargetTest
to fail.

Original Change: https://googleplex-android-review.git.corp.google.com/c/device/google/gs101/+/20061228
Bug: 231275829
Test: presubmit
Test: VtsHalBluetoothAudioV2_0TargetTest VtsHalBluetoothAudioV2_1TargetTest

Change-Id: Ie091dfce3c63be4fd6d0ed5b6600587aa56862cd
---
 manifest_64.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/manifest_64.xml b/manifest_64.xml
index 47e953c5..1c816c7c 100644
--- a/manifest_64.xml
+++ b/manifest_64.xml
@@ -53,15 +53,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.bluetooth.audio</name>
-        <transport>hwbinder</transport>
-        <version>2.1</version>
-        <interface>
-            <name>IBluetoothAudioProvidersFactory</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.boot</name>
         <transport>hwbinder</transport>