From 40e6ca666b02c6ea37ad648f599bbf33108409ed Mon Sep 17 00:00:00 2001
From: "T.J. Mercier" <tjmercier@google.com>
Date: Thu, 8 Dec 2022 00:16:00 +0000
Subject: [PATCH] Revert "[AudioProxy] Enable AudioProxy"

This reverts commit f75c0dd43d58ae756f3dc4342e735b0c3ea820aa.

Reason for revert: DroidMonitor: Potential culprit for Bug 261776026 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: I7941dfe9235d843ac3a24034819ea6e0ffe00884
---
 device-tangorpro.mk                           |  9 ------
 device_framework_matrix_product_tangorpro.xml | 29 -------------------
 public.libraries-google-tangorpro.txt         |  1 -
 3 files changed, 39 deletions(-)
 delete mode 100644 device_framework_matrix_product_tangorpro.xml
 delete mode 100644 public.libraries-google-tangorpro.txt

diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index a2478e2..68398cc 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -220,12 +220,3 @@ PRODUCT_SYSTEM_PROPERTIES += ro.odm.cast.ssid_suffix=ynn
 PRODUCT_PROPERTY_OVERRIDES += \
     persist.vendor.camera.extended_launch_boost=1 \
     persist.vendor.camera.raise_buf_allocation_priority=1
-# AudioProxy
-PRODUCT_PACKAGES += \
-    libaudio_proxy.google \
-    device.google.atv.audio_proxy@7.1-service
-
-DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := device/google/tangorpro/device_framework_matrix_product_tangorpro.xml
-
-PRODUCT_COPY_FILES += \
-    device/google/tangorpro/public.libraries-google-tangorpro.txt:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/public.libraries-google.txt
diff --git a/device_framework_matrix_product_tangorpro.xml b/device_framework_matrix_product_tangorpro.xml
deleted file mode 100644
index 3974e7e..0000000
--- a/device_framework_matrix_product_tangorpro.xml
+++ /dev/null
@@ -1,29 +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>
-    <!-- AudioProxy -->
-    <hal format="aidl" optional="true">
-        <name>device.google.atv.audio_proxy</name>
-        <version>1</version>
-        <interface>
-            <name>IAudioProxy</name>
-            <instance>mediashell</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.audio</name>
-        <transport>hwbinder</transport>
-        <version>7.1</version>
-        <interface>
-            <name>IDevicesFactory</name>
-            <instance>mediashell</instance>
-        </interface>
-    </hal>
-</compatibility-matrix>
-
diff --git a/public.libraries-google-tangorpro.txt b/public.libraries-google-tangorpro.txt
deleted file mode 100644
index 2a2d2fe..0000000
--- a/public.libraries-google-tangorpro.txt
+++ /dev/null
@@ -1 +0,0 @@
-libaudio_proxy.google.so