msm8996-common: Fall back to ZUI IMS-QMI-RIL stack

 * From ZUI 4.0.247DEV
 * This fixes VoLTE not coming back after mobile data has been switched to 2nd SIM
   and back to VoLTE capable 1st SIM
 * Probably also fixes random IMS restarts as they can't be noticed in logs anymore
 * ZUI ims_rtp_daemon cannot link libmedia.so, probably because we have switched to full VNDK
   According to DD3Boh:
   lib-dplmedia.so is a dependency of lib-rtpcore.so which is a dependency of ims_rtp_daemon
   So add a blob_fixup to remove libmedia.so dependency from lib-dplmedia.so

Change-Id: I5402f0ef93d03661d611d6775b1b331cf35afc06

5 files changed, 118 insertions, 265 deletions

diff --git a/extract-files.sh b/extract-files.sh
index dd96c21..5f7c03f 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -106,6 +106,11 @@ function blob_fixup() {
     vendor/bin/mm-qcamera-daemon)
         sed -i "s|/data/vendor/camera/cam_socket%d|/data/vendor/qcam/camer_socket%d|g" "${2}"
         ;;
+
+	# Remove libmedia.so dependency from lib-dplmedia.so
+    vendor/lib64/lib-dplmedia.so)
+        patchelf --remove-needed libmedia.so "${2}"
+        ;;
     esac
 }
 
diff --git a/manifest.xml b/manifest.xml
index 464397c..2c3fe1f 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -61,16 +61,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.broadcastradio</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IBroadcastRadioFactory</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@1.0::IBroadcastRadioFactory/default</fqname>
-    </hal>
-    <hal format="hidl">
         <name>android.hardware.camera.provider</name>
         <transport>hwbinder</transport>
         <version>2.4</version>
@@ -236,20 +226,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <instance>slot1</instance>
             <instance>slot2</instance>
         </interface>
-        <fqname>@1.1::IRadio/slot1</fqname>
-        <fqname>@1.1::IRadio/slot2</fqname>
-        <fqname>@1.1::ISap/slot1</fqname>
-        <fqname>@1.1::ISap/slot2</fqname>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.radio.config</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IRadioConfig</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@1.0::IRadioConfig/default</fqname>
     </hal>
     <hal format="hidl">
         <name>android.hardware.radio.deprecated</name>
@@ -270,18 +246,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <instance>default</instance>
         </interface>
     </hal>
-   <hal format="hidl">
-       <name>android.hardware.secure_element</name>
-       <transport>hwbinder</transport>
-       <version>1.0</version>
-       <interface>
-           <name>ISecureElement</name>
-           <instance>SIM1</instance>
-           <instance>SIM2</instance>
-       </interface>
-       <fqname>@1.0::ISecureElement/SIM1</fqname>
-       <fqname>@1.0::ISecureElement/SIM2</fqname>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.sensors</name>
         <transport>hwbinder</transport>
@@ -380,27 +344,24 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <name>IdpmQmi</name>
             <instance>dpmQmiService</instance>
         </interface>
-        <fqname>@1.0::IdpmQmi/dpmQmiService</fqname>
     </hal>
     <hal format="hidl">
         <name>com.qualcomm.qti.imscmservice</name>
         <transport>hwbinder</transport>
-        <version>2.0</version>
+        <version>1.0</version>
         <interface>
             <name>IImsCmService</name>
             <instance>qti.ims.connectionmanagerservice</instance>
         </interface>
-        <fqname>@2.0::IImsCmService/qti.ims.connectionmanagerservice</fqname>
     </hal>
     <hal format="hidl">
         <name>com.qualcomm.qti.uceservice</name>
         <transport>hwbinder</transport>
-        <version>2.0</version>
+        <version>1.0</version>
         <interface>
             <name>IUceService</name>
             <instance>com.qualcomm.qti.uceservice</instance>
         </interface>
-        <fqname>@2.0::IUceService/com.qualcomm.qti.uceservice</fqname>
     </hal>
     <hal format="hidl">
         <name>com.qualcomm.qti.wifidisplayhal</name>
@@ -461,15 +422,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         </interface>
     </hal>
     <hal format="hidl">
-        <name>vendor.qti.data.factory</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IFactory</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
         <name>vendor.lineage.touch</name>
         <transport>hwbinder</transport>
         <version>1.0</version>
@@ -517,18 +469,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         </interface>
     </hal>
     <hal format="hidl">
-        <name>vendor.qti.hardware.data.connection</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IDataConnection</name>
-            <instance>slot1</instance>
-            <instance>slot2</instance>
-        </interface>
-        <fqname>@1.0::IDataConnection/slot1</fqname>
-        <fqname>@1.0::IDataConnection/slot2</fqname>
-    </hal>
-    <hal format="hidl">
         <name>vendor.qti.hardware.data.latency</name>
         <transport>hwbinder</transport>
         <version>1.0</version>
@@ -536,7 +476,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <name>ILinkLatency</name>
             <instance>default</instance>
         </interface>
-        <fqname>@1.0::ILinkLatency/default</fqname>
     </hal>
     <hal format="hidl">
         <name>vendor.qti.hardware.iop</name>
@@ -570,8 +509,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <instance>slot1</instance>
             <instance>slot2</instance>
         </interface>
-        <fqname>@1.0::IQcRilAudio/slot1</fqname>
-        <fqname>@1.0::IQcRilAudio/slot2</fqname>
     </hal>
     <hal format="hidl">
         <name>vendor.qti.hardware.radio.ims</name>
@@ -582,8 +519,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <instance>imsradio0</instance>
             <instance>imsradio1</instance>
         </interface>
-        <fqname>@1.0::IImsRadio/imsradio0</fqname>
-        <fqname>@1.0::IImsRadio/imsradio1</fqname>
     </hal>
     <hal format="hidl">
         <name>vendor.qti.hardware.radio.lpa</name>
@@ -594,8 +529,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <instance>UimLpa0</instance>
             <instance>UimLpa1</instance>
         </interface>
-        <fqname>@1.0::IUimLpa/UimLpa0</fqname>
-        <fqname>@1.0::IUimLpa/UimLpa1</fqname>
     </hal>
     <hal format="hidl">
         <name>vendor.qti.hardware.radio.qcrilhook</name>
@@ -606,8 +539,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <instance>oemhook0</instance>
             <instance>oemhook1</instance>
         </interface>
-        <fqname>@1.0::IQtiOemHook/oemhook0</fqname>
-        <fqname>@1.0::IQtiOemHook/oemhook1</fqname>
     </hal>
     <hal format="hidl">
         <name>vendor.qti.hardware.radio.qtiradio</name>
@@ -618,20 +549,16 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <instance>slot1</instance>
             <instance>slot2</instance>
         </interface>
-        <fqname>@1.0::IQtiRadio/slot1</fqname>
-        <fqname>@1.0::IQtiRadio/slot2</fqname>
     </hal>
     <hal format="hidl">
         <name>vendor.qti.hardware.radio.uim</name>
         <transport>hwbinder</transport>
-        <version>1.1</version>
+        <version>1.0</version>
         <interface>
             <name>IUim</name>
             <instance>Uim0</instance>
             <instance>Uim1</instance>
         </interface>
-        <fqname>@1.1::IUim/Uim0</fqname>
-        <fqname>@1.1::IUim/Uim1</fqname>
     </hal>
     <hal format="hidl">
         <name>vendor.qti.hardware.radio.uim_remote_client</name>
@@ -642,8 +569,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <instance>uimRemoteClient0</instance>
             <instance>uimRemoteClient1</instance>
         </interface>
-        <fqname>@1.0::IUimRemoteServiceClient/uimRemoteClient0</fqname>
-        <fqname>@1.0::IUimRemoteServiceClient/uimRemoteClient1</fqname>
     </hal>
     <hal format="hidl">
         <name>vendor.qti.hardware.radio.uim_remote_server</name>
@@ -654,27 +579,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <instance>uimRemoteServer0</instance>
             <instance>uimRemoteServer1</instance>
         </interface>
-        <fqname>@1.0::IUimRemoteServiceServer/uimRemoteServer0</fqname>
-        <fqname>@1.0::IUimRemoteServiceServer/uimRemoteServer1</fqname>
-    </hal>
-    <hal format="hidl">
-        <name>vendor.qti.esepowermanager</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IEsePowerManager</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>vendor.qti.ims.callinfo</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IService</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@1.0::IService/default</fqname>
     </hal>
     <hal format="hidl">
         <name>vendor.qti.hardware.tui_comm</name>
@@ -693,6 +597,5 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <name>IRTPService</name>
             <instance>imsrtpservice</instance>
         </interface>
-        <fqname>@1.0::IRTPService/imsrtpservice</fqname>
     </hal>
 </manifest>
diff --git a/msm8996.mk b/msm8996.mk
index 36f568b..ac4ea94 100755
--- a/msm8996.mk
+++ b/msm8996.mk
@@ -327,8 +327,8 @@ PRODUCT_PACKAGES += \
 
 # RIL
 PRODUCT_PACKAGES += \
+    android.hardware.radio@1.2 \
     android.hardware.radio.config@1.0 \
-    android.hardware.secure_element@1.0 \
     librmnetctl \
     libxml2
 
diff --git a/proprietary-files.txt b/proprietary-files.txt
index d5bb9e7..c643fdd 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -465,61 +465,42 @@ vendor/firmware/a530v2_seq.fw2
 vendor/firmware/a530v3_gpmu.fw2
 vendor/firmware/a530v3_seq.fw2
 
-# IMS - from daisy 9/PKQ1.180917.001/V10.0.7.0.PDLMIXM
-lib/com.qualcomm.qti.imscmservice@1.0.so|ab62ee48da3c7c63fb74c31288598b6cc896c43b
-lib/com.qualcomm.qti.imscmservice@2.0.so|37971c1d4bc7040931c2f1d6b848176521d68481
-lib/com.qualcomm.qti.imscmservice@2.1.so|3c45f0d796b41b4403f0bbd54a607b102bb51e6b
-lib/lib-imscamera.so|9b61c3552509213fed9d37a9404ddd379917931e
-lib/lib-imsvideocodec.so|7b3110ec8cd065e4c110946de8732c5dc407e983
-lib/lib-imsvtextutils.so|b0714e4fa4a9ce59ec4578c061c976d5a7d62261
-lib/lib-imsvtutils.so|8cdeb25b66258f6a8d6bd4116717119ade4fb369
-lib/libdiag_system.so|a15e5ae70d1a73501b05b3aefbbc662048e6fbd3
-lib/libimscamera_jni.so|ac950d21e66518a478537694c44e5da34e8e3d4a
-lib/libimsmedia_jni.so|9f11e8661dc39f64d51ec73ea1d94045f7e08f9e
-lib/libqmi_cci_system.so|8342dde7547ea23802f3c53adede6c26353c0e35
-lib/librcc.so|9ae1cccdc4697c76feb2d9a37eef1a3ef1f11949
-lib/vendor.qti.imsrtpservice@1.0.so|af72b35525652ac96f6985c9ee64cef393e31c9d
-lib64/com.qualcomm.qti.imscmservice@1.0.so|f74a427829e40a2fb9eb02ac749d022fed0f5112
-lib64/com.qualcomm.qti.imscmservice@2.0.so|6c861fe25f8237148ecb13152d3e9c6e21973f57
-lib64/com.qualcomm.qti.imscmservice@2.1.so|983ef2de4bc1d584315f77d5da529026479545d4
-lib64/lib-imscamera.so|5bd685b6933affa01a2919efbc31809dea84968d
-lib64/lib-imsvideocodec.so|a63a930ddecb5f02a3a4d6e3fd06fa262933b9a7
-lib64/lib-imsvt.so|7dfc533fc3c439a608b219838281d6c5f605ee22
-lib64/lib-imsvtextutils.so|dc3340321ee2543bb35248d0f9dac4718116a073
-lib64/lib-imsvtutils.so|13480b644ed5290f7ddc2f7c304c0e912f416098
-lib64/libdiag_system.so|d715979a771a964ef3d0f9fe1b297259e74e4f94
-lib64/libimscamera_jni.so|133fec4e7be337eb255eb226c4ff96ae53b94be7
-lib64/libimsmedia_jni.so|17a2cb31fb5960769b4c2c0636fffe721c4f2a74
-lib64/libqmi_cci_system.so|a77af4ad29f3cabb67afd49d64f57697a0f328db
-lib64/librcc.so|4d732d9211e3139ed17fae059edfcd71f0e13d7e
-lib64/vendor.qti.imsrtpservice@1.0.so|559a2dbf409d86746ed4303f2e0089256bb91a07
+# IMS
+-app/uceShimService/uceShimService.apk
+etc/permissions/com.qualcomm.qti.imscmservice.xml
+etc/permissions/qti-vzw-ims-internal.xml
+framework/com.qualcomm.qti.imscmservice@1.0-java.jar
+lib64/com.qualcomm.qti.imscmservice@1.0.so
+lib64/lib-imscamera.so
+lib64/lib-imsvideocodec.so
+lib64/lib-imsvt.so
+lib64/lib-imsvtextutils.so
+lib64/lib-imsvtutils.so
+lib64/libdiag_system.so
+lib64/libimscamera_jni.so
+lib64/libimsmedia_jni.so
+lib64/librcc.so
+lib64/vendor.qti.imsrtpservice@1.0.so
 -priv-app/ims/ims.apk|54464ad55ece9aa27bedca09f5af0ca49f17620b
-vendor/bin/ims_rtp_daemon|174be7387753db4b72fa4de305edaa80fe79b6a9
-vendor/bin/imsdatadaemon|56e1ab6f6f6679261bcd36dd218097632da866b6
-vendor/bin/imsqmidaemon|0e5cf08e7cbd4e34fb69e6644a8c7d5e6715c306
-vendor/bin/imsrcsd|a79f373ccb1af6ac4877801191a4b8fed1b2f488
-vendor/lib/com.qualcomm.qti.uceservice@2.0.so|10d7e3cd37abf2ea25478d77b6e9452b8eb474f5
-vendor/lib64/com.qualcomm.qti.imscmservice@1.0.so|f74a427829e40a2fb9eb02ac749d022fed0f5112
-vendor/lib64/com.qualcomm.qti.imscmservice@2.0.so|6c861fe25f8237148ecb13152d3e9c6e21973f57
-vendor/lib64/com.qualcomm.qti.imscmservice@2.1.so|983ef2de4bc1d584315f77d5da529026479545d4
-vendor/lib64/com.qualcomm.qti.uceservice@2.0.so|ee50bd8c89b1f8ed2a24286217724dc68e0af18b
-vendor/lib64/lib-dplmedia.so|43bde72ec009c854c755cdc5c95c087b0c04f975
-vendor/lib64/lib-imsSDP.so|ad40ae6910430898eb13f242ca3d383f43ff0b80
-vendor/lib64/lib-imscmservice.so|07c7f9e9b937e4a49a5615916688ea9e87bfd49b
-vendor/lib64/lib-imsdpl.so|7717f8855077a70f851af119246ce7e8ddd221a0
-vendor/lib64/lib-imsqimf.so|c6b42efbd7490b6a9fed0ea9a7a264806171d9eb
-vendor/lib64/lib-imsrcs-v2.so|7f8e06dc4ab2a9a4c50a193a61eb79b01073d17f
-vendor/lib64/lib-imsrcsbaseimpl.so|ca606349ae420b029b8473ce849a281260127f94
-vendor/lib64/lib-imsxml.so|3e8c76633788cf33353b41b5980e7c212ef02619
-vendor/lib64/lib-rtpcommon.so|3fe228256902ecec051597967a171a9f93cedf15
-vendor/lib64/lib-siputility.so|3f87f58f9ca52be34e7003eaef2a213c61268589
-vendor/lib64/lib-rtpcore.so|71ba1af058bad247a582c8f10424560f20d119da
-vendor/lib64/lib-rtpdaemoninterface.so|34a4e7ce92cfebf0c6e030408f0eb1341768ec6d
-vendor/lib64/lib-rtpsl.so|c8e74b54c0a88e8d14f9e48ac33dafb74da67df4
-vendor/lib64/lib-uceservice.so|31dae56817e9a47849cac15a8812b12ebec6bca9
-vendor/lib64/vendor.qti.ims.callinfo@1.0.so|9645007e2ee28fb7ff53bde78fa8bea299a220b6
-vendor/lib64/vendor.qti.imsrtpservice@1.0-service-Impl.so|f4eef520bbf98e6e1ac8697ef7eef0109487dba1
-vendor/lib64/vendor.qti.imsrtpservice@1.0.so|559a2dbf409d86746ed4303f2e0089256bb91a07
+vendor/bin/ims_rtp_daemon
+vendor/bin/imsdatadaemon
+vendor/bin/imsqmidaemon
+vendor/bin/imsrcsd
+vendor/framework/qti-vzw-ims-internal.jar
+vendor/lib64/com.qualcomm.qti.imscmservice@1.0_vendor.so
+vendor/lib64/lib-dplmedia.so
+vendor/lib64/lib-imsSDP.so
+vendor/lib64/lib-imscmservice.so
+vendor/lib64/lib-imsdpl.so
+vendor/lib64/lib-imsqimf.so
+vendor/lib64/lib-imsxml.so
+vendor/lib64/lib-rtpcommon.so
+vendor/lib64/lib-rtpcore.so
+vendor/lib64/lib-rtpdaemoninterface.so
+vendor/lib64/lib-rtpsl.so
+vendor/lib64/lib-uceservice.so
+vendor/lib64/vendor.qti.imsrtpservice@1.0-service-Impl.so
+vendor/lib64/vendor.qti.imsrtpservice@1.0_vendor.so
 
 # Keystore - from daisy 9/PKQ1.180917.001/V10.0.7.0.PDLMIXM
 vendor/lib64/hw/keystore.msm8953.so:vendor/lib64/hw/keystore.msm8996.so|455b7f9ec7b5c7acd6ada0789a529468e71f6f45
@@ -628,110 +609,84 @@ vendor/etc/init/vendor.qti.hardware.alarm@1.0-service.rc|c9877b6cae0353d5fdea5bc
 vendor/lib64/hw/vendor.qti.hardware.alarm@1.0-impl.so|df138b77fb116a1a786a70c9c76b69d61b5c04d2
 vendor/lib64/vendor.qti.hardware.alarm@1.0.so|6f28bd9425af72d48266ff88b728c61f827571a8
 
-# QMI - from daisy 9/PKQ1.180917.001/V10.0.7.0.PDLMIXM
+# QMI
 etc/permissions/qti_libpermissions.xml:vendor/etc/permissions/qti_libpermissions.xml|593bcb72cce68ceb0a70f50bcae7d460114e7c62
-etc/permissions/qti_permissions.xml:vendor/etc/permissions/qti_permissions.xml|e6ff4572352b1a4f91b6b9d7cbb1cad9924410a0
-vendor/bin/irsc_util|8d86dc66dc6aad54433b1fb0aff9d425ede8fac2
-vendor/lib64/libdiag.so|a56ec4234a6ab58a4e3ec0c752423dbe388cf561
-vendor/lib64/libdsi_netctrl.so|93ea75fa978f20eee762324e37ff1ac4007519f8
-vendor/lib64/libdsutils.so|fabd9f97921c6e0101685887e7d167e00d15691c
-vendor/lib64/libidl.so|3b1a7ca55ccfe06d12d62f2c214b5ac2ee0e69da
-vendor/lib64/libqcci_legacy.so|959f0c77ee55ef99547ffead009db005bceeaae8
-vendor/lib64/libqdi.so|a96b5179592834270c94c6c7cfa3a1fe9ff645e3
-vendor/lib64/libqdp.so|add730c708dd95186eb529496fa0aa224427177b
-vendor/lib64/libqmi_cci.so|a111f9901bc58aa7f037dd8976db2f64fefe3a32
-vendor/lib64/libqmi_client_helper.so|a6a625ce3ce2f38158a040583b9985a06b84905c
-vendor/lib64/libqmi_client_qmux.so|1a66d009a37928c6a126e9226079cd9fdfc13784
-vendor/lib64/libqmi_common_so.so|aa27730010968b2e05e3e46684cdf193738c2c8e
-vendor/lib64/libqmi_csi.so|60daf27b600facfc9cceb13255e5caba75362ad3
-vendor/lib64/libqmi_encdec.so|68fb631317150d66fd1a39c48f8ef9e0405bbdf2
-vendor/lib64/libqmi.so|548e73cd7e7b8b86b727891fd5c09958382c642c
-vendor/lib64/libqmiservices.so|7b2051dea42b5515b3ae4036c61d6ce118f69411
-vendor/lib/libdiag.so|bbbb20f172147d4591fbec2fd293e6a018d728ac
-vendor/lib/libdsi_netctrl.so|1216f8d3fab6b06a86b366b2ff71778e520602de
-vendor/lib/libdsutils.so|83e6a0a53f3fc644149e7ae31391b722dc18cea7
-vendor/lib/libidl.so|7c0593b7469bc3d58329b6c6d484d05ac4433494
-vendor/lib/libqcci_legacy.so|9cbc40f5c011cc7bb6ac29e97a1fd6122537d9b4
-vendor/lib/libqdi.so|4f945ab5d5ecb908fa7edc9d020c9564be56f491
-vendor/lib/libqdp.so|d9f1730f49af9cfe5adef085c5a4ba6abe58c660
-vendor/lib/libqmi_cci.so|2cb1dbc98e544c1aee501a2a6734e2e09c43b896
-vendor/lib/libqmi_client_helper.so|aeb4762b04054dfd6f78cbc597bc9a8f8273bcf8
-vendor/lib/libqmi_client_qmux.so|be7f4d1b45f05cc9c9fbd97994842c49f7f3580c
-vendor/lib/libqmi_common_so.so|42f1d4cd328b8138f4be92a7004898fd0e22c03c
-vendor/lib/libqmi_csi.so|bdfecfda2d6f9dc175cd49760bf7765937415da7
-vendor/lib/libqmi_encdec.so|ccb737221893472c6acb1fd45ceeb7d52393ec07
-vendor/lib/libqmi.so|87ab3bc1a839bee4e52939f3061b6425cc523fc1
-vendor/lib/libqmiservices.so|4c4404db349d6f55c6862e1e83ae6a49171db13c
-
-# RIL - from daisy 9/PKQ1.180917.001/V10.0.7.0.PDLMIXM
--app/QtiTelephonyService/QtiTelephonyService.apk|420b39e20a5166940c1e2e55e8d9c92ec910cebb
-etc/permissions/qcrilhook.xml:vendor/etc/permissions/qcrilhook.xml|9fc58a3d54d20ac1d53bab14608815121aefbce5
-etc/permissions/telephonyservice.xml:vendor/etc/permissions/telephonyservice.xml|b297c8a27443570377d78586b00198839ce326bb
+etc/permissions/qti_permissions.xml:vendor/etc/permissions/qti_permissions.xml
+vendor/bin/irsc_util
+vendor/lib64/libdiag.so
+vendor/lib64/libdsi_netctrl.so
+vendor/lib64/libdsutils.so
+vendor/lib64/libidl.so
+vendor/lib64/libqcci_legacy.so
+vendor/lib64/libqdi.so
+vendor/lib64/libqdp.so
+vendor/lib64/libqmi_cci.so
+vendor/lib64/libqmi_client_helper.so
+vendor/lib64/libqmi_client_qmux.so
+vendor/lib64/libqmi_common_so.so
+vendor/lib64/libqmi_csi.so
+vendor/lib64/libqmi_encdec.so
+vendor/lib64/libqmi.so
+vendor/lib64/libqmiservices.so
+vendor/lib64/libsmemlog.so
+vendor/lib/libdiag.so
+vendor/lib/libdsi_netctrl.so
+vendor/lib/libdsutils.so
+vendor/lib/libidl.so
+vendor/lib/libqcci_legacy.so
+vendor/lib/libqdi.so
+vendor/lib/libqdp.so
+vendor/lib/libqmi_cci.so
+vendor/lib/libqmi_client_helper.so
+vendor/lib/libqmi_client_qmux.so
+vendor/lib/libqmi_common_so.so
+vendor/lib/libqmi_csi.so
+vendor/lib/libqmi_encdec.so
+vendor/lib/libqmi.so
+vendor/lib/libqmiservices.so
+vendor/lib/libsmemlog.so
+
+# RIL
+-app/QtiTelephonyService/QtiTelephonyService.apk
+etc/permissions/qcrilhook.xml
+etc/permissions/telephonyservice.xml
 framework/QtiTelephonyServicelibrary.jar|1df2f89ffb3aedc36e1c2ca7cafbf73a6a06b3fb
-framework/qcrilhook.jar|784df5e6aa9df0127700b9a6f1083440ebfac057
+framework/qcrilhook.jar
 framework/qti-telephony-common.jar|b1953a3599255f08f1785c677d22810f65e0167b
--priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk|d1d3adfe6eff32a3013e146317324029181e3c4a
-vendor/bin/ATFWD-daemon|fe4aac322811c2e025126cded50dd3f12e14e34c
-vendor/bin/netmgrd|3925e0023817782852b6a036164616a2d5dd0d4a
-vendor/bin/port-bridge|21e6e72ae496b26e89c7b471746b42dc055c7000
-vendor/bin/qti|db3cdf088d1e81f79cf9739817ae4adff4309f86
+-priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
+vendor/bin/ATFWD-daemon
+vendor/bin/netmgrd
+vendor/bin/qti
 vendor/bin/rmt_storage|346ef281e829109ba11af912509309e520351ef9
 vendor/bin/tftp_server|05a9c0e0e691e534e703bded4a99083d25a26ebb
-vendor/etc/data/dsi_config.xml|f4861831fcb21d43e2a9ca12519155ebb8ac1407
-vendor/etc/data/netmgr_config.xml|97066d76dbfd358895c9d2c02723230cae6cfb1e
-vendor/lib64/libconfigdb.so|9fed7e2a3249dad9e7532f18ae7dcd3aaa084865
-vendor/lib64/liblqe.so|874fd7b6a238ef50651f710b99dd6c7b227b0ccf
-vendor/lib64/libmdmdetect.so|c97e0cf13056062d7b30e06181d240fb07c18f48
-vendor/lib64/libnetmgr.so|110b0a0416bfe61831fc7de5212bb37717d74cdd
-vendor/lib64/libnetmgr_common.so|6b30180ede3715dea9e69b871969e7263eb11036
-vendor/lib64/libnlnetmgr.so|6ad911ebb9ffa785fbb2c071486a0166efcd4775
-vendor/lib64/liboemaids_vendor.so|a6f1aa8c68d9efe22f054aa68609af5b218154c9
-vendor/lib64/libqcmaputils.so|e4453e94441e33396721a36e728d27561c9a4f9a
+vendor/etc/data/dsi_config.xml
+vendor/etc/data/netmgr_config.xml
+vendor/lib64/libconfigdb.so
+vendor/lib64/liblqe.so
+vendor/lib64/libmdmdetect.so
+vendor/lib64/libnetmgr.so
+vendor/lib64/libqcmaputils.so
 vendor/lib64/libqrtr.so|83676274fde1056a0507b4100a3a5423f5af5021
 vendor/lib64/libqsocket.so|3799e723be152c31c270f93a64e2865c0d9e86c4
-vendor/lib64/libril-qc-ltedirectdisc.so|e94a20ceef14e1896e66ede766a731338594cae3
-vendor/lib64/libril-qc-qmi-1.so|0a1826b9ae85e17afe3f06e2aabd79c462b8c098
-vendor/lib64/libril-qc-radioconfig.so|1c1567561ac8a080cc4b5fb1644148fb8ed84dec
-vendor/lib64/libril-qcril-hook-oem.so|159f6addcb48e2e02ddba6278e05bc5a312d8136
-vendor/lib64/librilqmiservices.so|016b9067304df4707006a635ca471c23bcd6bebf
-vendor/lib64/libsettings.so|e974e5c777a0d2d303a907797c4c33b5f8ca388b
-vendor/lib64/libsystem_health_mon.so|a8a8e75cd251f4f8d8d054d75cea1238e654f7d0
-vendor/lib64/libxml.so|dba175d291e1adc004bf1463db091cde95a0d92d
-vendor/lib64/vendor.qti.hardware.radio.am@1.0.so|fab631cbf46f610a0e1c04bfb5a388084894e11b
-vendor/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so|826e3a2983f208d083ec210ab1817e6f50476c01
-vendor/lib64/vendor.qti.hardware.radio.ims@1.0.so|730248701dc229c3abe23e071f4ddbbe6443ced2
-vendor/lib64/vendor.qti.hardware.radio.ims@1.1.so|07fe986b6a4cee6f5e9fe0be9f94577753ae14f8
-vendor/lib64/vendor.qti.hardware.radio.ims@1.2.so|c714e323b6ce1e3f090c509be540a3380e85163b
-vendor/lib64/vendor.qti.hardware.radio.ims@1.3.so|365ecc76eda4e2bf524903c6893fac60a8cd3fb8
-vendor/lib64/vendor.qti.hardware.radio.ims@1.4.so|6cb16ad40692b452fa7d681456c0f92dad2795dc
-vendor/lib64/vendor.qti.hardware.radio.lpa@1.0.so|4ae15c8c02a0d201ccb6311c8cdb745f53a9f538
-vendor/lib64/vendor.qti.hardware.radio.qcrilhook@1.0.so|48abd3630ab28be1bef7f9995aa9ce403bfee836
-vendor/lib64/vendor.qti.hardware.radio.qtiradio@1.0.so|7f01d9cbed4a701b5fff5b0b2f7dc44eba0696a2
-vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.0.so|c262d97c9a3d08a7befda9355a7037a3868e6bf5
-vendor/lib64/vendor.qti.hardware.radio.uim@1.0.so|1d53f109141b00d84aa69f90ebfe1dd87913e783
-vendor/lib64/vendor.qti.hardware.radio.uim@1.1.so|81296c2077590e6f16ac8fc0c8e9e6eb0f5661bb
-vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.0.so|571a25c2049c68fb8b3201ae2bdfbe02618ac785
-vendor/lib64/vendor.qti.hardware.radio.uim_remote_server@1.0.so|5b9a5cbd38884b854bb98d8aaf6337405ff115d1
-vendor/lib/libconfigdb.so|059e4cc345fcae1267fb34acf99ff44a8f399754
-vendor/lib/libmdmdetect.so|1433bc62549fcd9c3d14796487e9ad2f59b08da4
-vendor/lib/libnetmgr.so|418f1758999510c7d5efee128e7eeb8262f0f763
-vendor/lib/libnetmgr_common.so|2d690e1cd8a7a77e0412f0c2c75bd7266da81e0e
-vendor/lib/libnlnetmgr.so|348c8e22bf05deab3302a3e7966e70493c154d20
-vendor/lib/libqcmaputils.so|e5224fadabec3cf6db2f373f0d35b3070162adcf
-vendor/lib/libqrtr.so|238905ba5034d6c73c6077c164650a2dda09ab70
-vendor/lib/libqsocket.so|144d81b9087d9e4390f8e1952ffd29ab335925a3
-vendor/lib/libxml.so|9a23d0f93b7ba00f88f3b8c708494fbc030c88a5
-vendor/lib/vendor.qti.hardware.radio.am@1.0.so|e8ce25d22b20908a5fd21055a61d27a924c1f5d7
-vendor/lib/vendor.qti.hardware.radio.atcmdfwd@1.0.so|2f28d79303064bd52b62d471d33a4a96728eaa58
-vendor/lib/vendor.qti.hardware.radio.lpa@1.0.so|d9fd9153058236a103cd93bd6ebbbefa4ed8a6fa
-vendor/lib/vendor.qti.hardware.radio.qcrilhook@1.0.so|9ffc071add85e0066b8135058357aafdbdd14658
-vendor/lib/vendor.qti.hardware.radio.qtiradio@1.0.so|f3bded13d39c8d38a07186df340ed183ea491d21
-vendor/lib/vendor.qti.hardware.radio.qtiradio@2.0.so|f2721fbdd5683ae8ed4ca58a3ba3fd5f9afec25d
-vendor/lib/vendor.qti.hardware.radio.uim@1.0.so|59ed21578e8f7ba6517d180730f6131e13faa408
-vendor/lib/vendor.qti.hardware.radio.uim@1.1.so|0c1db42b94c7db0f4884be9de979d99be9780067
-vendor/lib/vendor.qti.hardware.radio.uim_remote_client@1.0.so|de21d49f6b4385969c059d84865106f4dd5b0586
-vendor/lib/vendor.qti.hardware.radio.uim_remote_server@1.0.so|cb7d2afacc43bddfdb00a7fe29861e52c1d346fe
-vendor/radio/qcril_database/qcril.db|f25a9215fcc2445e73d1aa0b7ef9bdbd97e33f56
+vendor/lib64/libril-qc-ltedirectdisc.so
+vendor/lib64/libril-qc-qmi-1.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/libxml.so
+vendor/lib64/vendor.qti.hardware.radio.am@1.0_vendor.so
+vendor/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0_vendor.so
+vendor/lib64/vendor.qti.hardware.radio.ims@1.0_vendor.so
+vendor/lib64/vendor.qti.hardware.radio.lpa@1.0_vendor.so
+vendor/lib64/vendor.qti.hardware.radio.qcrilhook@1.0_vendor.so
+vendor/lib64/vendor.qti.hardware.radio.qtiradio@1.0_vendor.so
+vendor/lib64/vendor.qti.hardware.radio.uim@1.0_vendor.so
+vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.0_vendor.so
+vendor/lib64/vendor.qti.hardware.radio.uim_remote_server@1.0_vendor.so
+vendor/lib/libmdmdetect.so
+vendor/radio/qcril_database/qcril.db
 
 # Sensors
 vendor/bin/sensors.qcom:vendor/bin/sensors.qti
diff --git a/vendor_prop.mk b/vendor_prop.mk
index 2e2e89d..03b43b6 100644
--- a/vendor_prop.mk
+++ b/vendor_prop.mk
@@ -118,15 +118,11 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PROPERTY_OVERRIDES += \
     DEVICE_PROVISIONED=1 \
     rild.libpath=/vendor/lib64/libril-qc-qmi-1.so \
-    vendor.rild.libpath=/vendor/lib64/libril-qc-qmi-1.so \
     ril.subscription.types=NV,RUIM \
-    ro.telephony.default_network=10,10 \
+    ro.telephony.default_network=10 \
     telephony.lteOnCdmaDevice=1 \
     android.telephony.apn-restore=24000 \
-    persist.qti.telephony.vt_cam_interface=2 \
-    persist.radio.VT_CAM_INTERFACE=2 \
-    persist.vendor.qti.telephony.vt_cam_interface=2 \
-    persist.vendor.radio.VT_CAM_INTERFACE=2 \
+    persist.vendor.qti.telephony.vt_cam_interface=1 \
     persist.radio.sw_mbn_update=1 \
     persist.radio.sw_mbn_volte=1 \
     persist.radio.sw_mbn_openmkt=1 \
@@ -152,13 +148,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
     persist.radio.apm_sim_not_pwdn=1 \
     persist.vendor.radio.sib16_support=1 \
     persist.vendor.radio.custom_ecc=1 \
-    persist.vendor.radio.rat_on=combine \
-    persist.volte_enabled_by_hw=1 \
-    persist.vendor.radio.data_ltd_sys_ind=1 \
-    persist.radio.VT_ENABLE=1 \
-    persist.radio.ROTATION_ENABLE=1 \
-    persist.dbg.vt_avail_ovr=1 \
-    persist.vendor.radio.apm_sim_not_pwdn=1
+    persist.vendor.radio.rat_on=combine
 
 # RmNet Data
 PRODUCT_PROPERTY_OVERRIDES += \