commit 8b43078bb976cfc993f1fd8eb91eb7f25c36c65c
author Xin Li <delphij@google.com> Wed Sep 27 16:04:49 2023 -0700
committer Xin Li <delphij@google.com> Wed Sep 27 16:04:49 2023 -0700
tree b5487cdf0a40a61d0edd6a92f500cc815f578f6c
parent 3e9a7f52425a9a1b137ce2b0c9233a5923f071bf
parent 15b5b8a439f88dbd01636100399f7493494b0f95

Merge UP1A.231005.007

Bug: 291102124
Merged-In: I02c6f67e9f820e6b895f7bdc9bc483ca43e267d7
Change-Id: I5c8ce170065ef8b12c98b259adcb9dd6f1e0cc92

device_framework_matrix_product.xml

diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index d98ef31..2401dd7 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -42,31 +42,6 @@
         </interface>
     </hal>
     <hal format="hidl" optional="false">
-        <name>android.hardware.media.c2</name>
-        <version>1.0</version>
-        <interface>
-            <name>IComponentStore</name>
-            <instance>default</instance>
-            <instance>software</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="false">
-        <name>android.hardware.radio</name>
-        <version>1.2</version>
-        <interface>
-            <name>ISap</name>
-            <instance>slot2</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="false">
-        <name>android.hardware.radio.config</name>
-        <version>1.1</version>
-        <interface>
-            <name>IRadioConfig</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="false">
         <name>vendor.display.color</name>
         <version>1.0-5</version>
         <interface>