From 1e8adf12c704b1ee849e917edb6a442c052f0efa Mon Sep 17 00:00:00 2001
From: Flex1911 <dedsa2002@gmail.com>
Date: Wed, 27 Feb 2019 18:25:25 +0100
Subject: [PATCH] vince: Add QC RIL service support

* Remove android.hardware.radio.deprecated from manifest
* Pin modified qcrild.rc
---
 BoardConfig.mk           |  2 ++
 device.mk                |  1 +
 manifest.xml             | 10 ----------
 proprietary-files-qc.txt |  5 +++++
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 75503da..e6f4c2f 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -210,6 +210,8 @@ TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/fstab.qcom
 
 # RIL
 TARGET_RIL_VARIANT := caf
+ENABLE_VENDOR_RIL_SERVICE := true
+TARGET_PROVIDES_QTI_TELEPHONY_JAR := true
 TARGET_USES_OLD_MNC_FORMAT := true
 
 # SELinux
diff --git a/device.mk b/device.mk
index 73d34cd..671ef50 100644
--- a/device.mk
+++ b/device.mk
@@ -352,6 +352,7 @@ PRODUCT_PACKAGES += \
 
 # RIL
 PRODUCT_PACKAGES += \
+    android.hardware.radio@1.2 \
     android.hardware.radio.config@1.0 \
     android.hardware.secure_element@1.0 \
     librmnetctl \
diff --git a/manifest.xml b/manifest.xml
index 84d04ce..bf8861e 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -214,16 +214,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.radio.deprecated</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IOemHook</name>
-            <instance>slot1</instance>
-            <instance>slot2</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.renderscript</name>
         <transport arch="32+64">passthrough</transport>
diff --git a/proprietary-files-qc.txt b/proprietary-files-qc.txt
index fecb051..01b7b3b 100644
--- a/proprietary-files-qc.txt
+++ b/proprietary-files-qc.txt
@@ -464,8 +464,10 @@ vendor/bin/netmgrd
 vendor/bin/qti
 vendor/bin/rmt_storage
 vendor/bin/tftp_server
+vendor/bin/hw/qcrild
 vendor/etc/data/dsi_config.xml
 vendor/etc/data/netmgr_config.xml
+vendor/etc/init/qcrild.rc|f9c32f5e7a8e7f4a0df1dcce174de169b8d7c060
 vendor/lib/libconfigdb.so
 vendor/lib/libmdmdetect.so
 vendor/lib/libnetmgr.so
@@ -497,15 +499,18 @@ vendor/lib64/libnetmgr_common.so
 vendor/lib64/libnlnetmgr.so
 vendor/lib64/liboemaids_vendor.so
 vendor/lib64/libqcmaputils.so
+vendor/lib64/libqcrilFramework.so
 vendor/lib64/libqrtr.so
 vendor/lib64/libqsocket.so
 vendor/lib64/libril-qc-ltedirectdisc.so
 vendor/lib64/libril-qc-qmi-1.so
+vendor/lib64/libril-qc-hal-qmi.so
 vendor/lib64/libril-qc-radioconfig.so
 vendor/lib64/libril-qcril-hook-oem.so
 vendor/lib64/librilqmiservices.so
 vendor/lib64/libsettings.so
 vendor/lib64/libsystem_health_mon.so
+vendor/lib64/qcrild_librilutils.so
 vendor/lib64/vendor.qti.hardware.radio.am@1.0.so
 vendor/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so
 vendor/lib64/vendor.qti.hardware.radio.ims@1.0.so