Revert "Revert " Revert "Support DSDS on B1C1"""
This reverts commit 0b75ebdb6b8c3d3adec00da5988009c4a74bf36c.
Reason for revert: <This is blocking VTS on QPR branch.
We also do not need to support dsds on Pixel3>
Bug: 140087281
Change-Id: I3db505b29849b7c5ee4b5a87bacb131bebbb5c70
diff --git a/device_framework_matrix.xml b/device_framework_matrix.xml
index 2771002..a41215a 100644
--- a/device_framework_matrix.xml
+++ b/device_framework_matrix.xml
@@ -99,7 +99,6 @@
<interface>
<name>IQcRilAudio</name>
<instance>slot1</instance>
- <instance>slot2</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
@@ -108,7 +107,6 @@
<interface>
<name>IImsRadio</name>
<instance>imsradio0</instance>
- <instance>imsradio1</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
@@ -125,7 +123,6 @@
<interface>
<name>IQtiOemHook</name>
<instance>oemhook0</instance>
- <instance>oemhook1</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
diff --git a/manifest.xml b/manifest.xml
index e093685..3adedcd 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -286,8 +286,6 @@
<transport>hwbinder</transport>
<fqname>@1.2::ISap/slot1</fqname>
<fqname>@1.3::IRadio/slot1</fqname>
- <fqname>@1.3::IRadio/slot2</fqname>
-
</hal>
<hal format="hidl">
<name>android.hardware.radio.config</name>
@@ -404,7 +402,6 @@
<interface>
<name>IImsRadio</name>
<instance>imsradio0</instance>
- <instance>imsradio1</instance>
</interface>
</hal>
<hal format="hidl">
@@ -423,7 +420,6 @@
<interface>
<name>IQtiOemHook</name>
<instance>oemhook0</instance>
- <instance>oemhook1</instance>
</interface>
</hal>
<hal format="hidl">
@@ -487,7 +483,6 @@
<interface>
<name>IQcRilAudio</name>
<instance>slot1</instance>
- <instance>slot2</instance>
</interface>
</hal>
<hal format="hidl">