commit 7d0612644ee7661817fc7ca36e4cb1b82ab9e3ce
author Steven Moreland <smoreland@google.com> Fri Jul 28 22:05:32 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 28 22:05:32 2023 +0000
tree 8fd0dfcbcf318efaaba9229f7a9f908893ec4311
parent 72b47672b812022bcab91ddb5e96c90f08288c5c
parent f6a758220dcc8bc5885852f830d77c0f523d70f8

device FCM -= android.* am: f2a2675372 am: 2443a6a6b3 am: cbc6f50bb9 am: da5414d4bf am: f6a758220d

Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2654090

Change-Id: Ia6e629bf8fb365b61cbc3f95a63223fae550d7fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

vf/device_framework_matrix_product.R.5.xml

diff --git a/vf/device_framework_matrix_product.R.5.xml b/vf/device_framework_matrix_product.R.5.xml
index a00e40c..2984766 100644
--- a/vf/device_framework_matrix_product.R.5.xml
+++ b/vf/device_framework_matrix_product.R.5.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>

vf/device_framework_matrix_product.S.5.xml

diff --git a/vf/device_framework_matrix_product.S.5.xml b/vf/device_framework_matrix_product.S.5.xml
index 04114ed..22a1b7f 100644
--- a/vf/device_framework_matrix_product.S.5.xml
+++ b/vf/device_framework_matrix_product.S.5.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>