From d81e301cea69510da00cdedf98e5c8b6cb302cf8 Mon Sep 17 00:00:00 2001
From: Adithya R <gh0strider.2k18.reborn@gmail.com>
Date: Mon, 12 Apr 2021 16:41:29 +0530
Subject: [PATCH] sunfish: Switch to full IWLAN mode

[basamaryan: This is needed to fix RIL on Android U]

Signed-off-by: basamaryan <basam.aryan@gmail.com>
Change-Id: Ie3fa610f71077b4ee2af1b4d57bd0c30b34f30fa
---
 device.mk                           |  1 -
 device_framework_matrix_product.xml | 10 ++++++++++
 manifest.xml                        | 10 ++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/device.mk b/device.mk
index 34e60319..a0dfe738 100644
--- a/device.mk
+++ b/device.mk
@@ -348,7 +348,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
     persist.rcs.supported=1 \
     vendor.rild.libpath=/vendor/lib64/libril-qc-hal-qmi.so \
     ro.hardware.keystore_desede=true \
-    ro.telephony.iwlan_operation_mode=legacy \
     persist.vendor.radio.procedure_bytes=SKIP \
 
 # Enable reboot free DSDS
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 8daa0a45..7c63cc37 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -32,6 +32,16 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <!-- iwlan -->
+    <hal format="hidl">
+        <name>vendor.qti.hardware.data.iwlan</name>
+        <version>1.0</version>
+        <interface>
+            <name>IIWlan</name>
+            <instance>slot1</instance>
+            <instance>slot2</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>android.hardware.media.c2</name>
         <version>1.0</version>
diff --git a/manifest.xml b/manifest.xml
index 4f316698..c5de72ea 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -63,6 +63,16 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <instance>slot2</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>vendor.qti.hardware.data.iwlan</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IIWlan</name>
+            <instance>slot1</instance>
+            <instance>slot2</instance>
+        </interface>
+    </hal>
     <hal format="hidl">
         <name>vendor.qti.hardware.qteeconnector</name>
         <transport>hwbinder</transport>