sm7125: Update RIL and QMI to S

*Explicitly build tether dependencies
*Keep R libril since the build system needs it

Change-Id: I0c2f2599e72287803f2d118e767ef226deb6d355

common.mk

@@ -396,7 +396,9 @@ PRODUCT_PACKAGES += \
 # Tether
 PRODUCT_PACKAGES += \
     ipacm \
-    IPACM_cfg.xml
+    IPACM_cfg.xml \
+    android.hardware.tetheroffload.config@1.0.vendor  \
+    android.hardware.tetheroffload.control@1.0.vendor
 
 # WiFi
 PRODUCT_PACKAGES += \

configs/framework_compatibility_matrix.xml

@@ -961,7 +961,7 @@
     </hal>
     <hal format="hidl" optional="true">
         <name>vendor.samsung.hardware.radio</name>
-        <version>2.1</version>
+        <version>2.2</version>
         <interface>
             <name>ISehRadio</name>
             <instance>slot1</instance>

configs/manifest.xml

@@ -465,25 +465,17 @@
         </interface>
         <fqname>@2.0::ISehMiscPower/default</fqname>
     </hal>
-    <hal format="hidl" override="true">
-        <name>vendor.samsung.hardware.radio</name>
-        <transport>hwbinder</transport>
-    </hal>
     <hal format="hidl">
         <name>vendor.samsung.hardware.radio</name>
         <transport>hwbinder</transport>
-        <version>2.1</version>
+        <version>2.2</version>
         <interface>
             <name>ISehRadio</name>
             <instance>slot1</instance>
             <instance>slot2</instance>
         </interface>
-        <fqname>@2.1::ISehRadio/slot1</fqname>
-        <fqname>@2.1::ISehRadio/slot2</fqname>
-    </hal>
-    <hal format="hidl" override="true">
-        <name>vendor.samsung.hardware.radio.bridge</name>
-        <transport>hwbinder</transport>
+        <fqname>@2.2::ISehRadio/slot1</fqname>
+        <fqname>@2.2::ISehRadio/slot2</fqname>
     </hal>
     <hal format="hidl">
         <name>vendor.samsung.hardware.radio.bridge</name>
@@ -497,10 +489,6 @@
         <fqname>@2.0::ISehBridge/slot1</fqname>
         <fqname>@2.0::ISehBridge/slot2</fqname>
     </hal>
-    <hal format="hidl" override="true">
-        <name>vendor.samsung.hardware.radio.channel</name>
-        <transport>hwbinder</transport>
-    </hal>
     <hal format="hidl">
         <name>vendor.samsung.hardware.radio.channel</name>
         <transport>hwbinder</transport>

proprietary-files.txt

@@ -918,6 +918,8 @@ vendor/lib64/libqcci_legacy.so
 vendor/lib64/libqdi.so
 vendor/lib64/libqdp.so
 vendor/lib64/libqsocket.so
+vendor/lib64/libqmiservices-sem-ext.so
+vendor/lib64/libqmiextservices.so
 vendor/etc/sec_config
 
 # QTI
@@ -929,7 +931,6 @@ vendor/etc/ssg/ta_config.json
 vendor/bin/hw/rild
 vendor/bin/secril_config_svc
 vendor/bin/adpl
-vendor/bin/ATFWD-daemon
 vendor/bin/netmgrd
 vendor/bin/ipacm-diag
 vendor/bin/tftp_server
@@ -939,7 +940,6 @@ vendor/etc/init/ipacm-diag.rc
 vendor/etc/init/vendor.qti.tftp.rc
 vendor/etc/init/netmgrd.rc
 vendor/etc/init/vendor.qti.rmt_storage.rc
-vendor/etc/seccomp_policy/atfwd@2.0.policy
 vendor/etc/data/dsi_config.xml
 vendor/etc/data/netmgr_config.xml
 vendor/etc/plmn_delta_usagsm.bin
@@ -954,17 +954,10 @@ vendor/etc/plmn_delta_hktw.bin
 vendor/etc/mtu-conf.xml
 vendor/etc/sec_config_oem
 vendor/etc/pdpcnt-conf.xml
-vendor/lib64/libsec-ril.so
-vendor/lib64/libsec-ril-dsds.so
-vendor/lib64/libsecril-client.so
--vendor/lib/libril.so
--vendor/lib64/libril.so
-vendor/lib/librilqmiservices-ext.so
-vendor/lib64/librilqmiservices-ext.so
+vendor/lib64/libril_sem.so
 vendor/lib/libconfigdb.so
 vendor/lib64/libconfigdb.so
 vendor/lib64/libengmode_client.so
-vendor/lib64/liblqe.so
 vendor/lib/libnetmgr.so
 vendor/lib/libnetmgr_common.so
 vendor/lib64/libnlnetmgr.so
@@ -979,18 +972,24 @@ vendor/lib64/libsystem_health_mon.so
 vendor/lib64/libvkmanager_vendor.so
 vendor/lib/libxml.so
 vendor/lib64/libxml.so
-vendor/lib/vendor.samsung.hardware.radio.bridge@2.0.so
 vendor/lib64/vendor.samsung.hardware.radio.bridge@2.0.so
-vendor/lib/vendor.samsung.hardware.radio@2.0.so
-vendor/lib/vendor.samsung.hardware.radio@2.1.so
-vendor/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so
+vendor/lib64/vendor.samsung.hardware.radio.bridge@2.1.so
 vendor/lib64/vendor.samsung.hardware.radio@2.0.so
 vendor/lib64/vendor.samsung.hardware.radio.channel@2.0.so
 vendor/lib64/vendor.samsung.hardware.radio@2.1.so
+vendor/lib64/vendor.samsung.hardware.radio@2.2.so
 vendor/lib/libdsi_netctrl.so
 vendor/lib64/libdsi_netctrl.so
 vendor/lib/libqcmaputils.so
 vendor/lib64/libqcmaputils.so
+vendor/lib64/liboffloadhal.so
+vendor/lib64/libipanat.so
+vendor/lib64/libnfnetlink.so
+vendor/lib64/libnetfilter_conntrack.so
+
+# A525FXXU4AUJ2 (R)
+-vendor/lib/libril.so|b7759521aeb60a07b929e4ff53ba25338c4cd087
+-vendor/lib64/libril.so|49d4eebf79faefd03b8378c3ed07cf44730a15ff
 
 # Sensors
 vendor/bin/factory.ssc

rootdir/etc/init.vendor.rilchip.rc

@@ -7,14 +7,14 @@
 service ril-daemon /vendor/bin/hw/rild
     class main
     user radio
-    group radio cache inet misc audio log oem_2901 system drmrpc vpn readproc wakelock
+    group radio cache inet misc audio log oem_2901 system drmrpc vpn readproc wakelock net_admin
     capabilities BLOCK_SUSPEND NET_ADMIN NET_RAW SYS_ADMIN CHOWN SYS_TIME
     socket sap_uim_socket1 stream 660 bluetooth bluetooth
 
 service ril-daemon1 /vendor/bin/hw/rild -c 2
     class main
     user radio
-    group radio cache inet misc audio log oem_2901 system drmrpc vpn readproc wakelock
+    group radio cache inet misc audio log oem_2901 system drmrpc vpn readproc wakelock net_admin
     capabilities BLOCK_SUSPEND NET_ADMIN NET_RAW SYS_ADMIN CHOWN SYS_TIME
 
 # QMUX must be in multiple groups to support external process connections

rootdir/etc/init.vendor.rilcommon.rc

@@ -9,7 +9,6 @@
 
 on post-fs-data
     mkdir /data/vendor/secradio 0770 radio radio
-    restorecon -R /data/vendor/secradio
 
 on property:ro.vendor.multisim.simslotcount=1
     stop ril-daemon1

vendor.prop

@@ -146,10 +146,10 @@ debug.stagefright.ccodec=1
 
 # RIL
 vendor.sec.rild.libpath=/vendor/lib64/libsec-ril.so
-vendor.sec.rild.libpath2=/vendor/lib64/libsec-ril-dsds.so
-persist.vendor.radio.atfwd.start=true
+ro.vendor.sec.radio.def_network=9
 persist.vendor.radio.enableadvancedscan=true
-ro.carrier=unknown
+ro.telephony.default_cdma_sub=0
+ro.vendor.use_data_netmgrd=false
 ro.radio.noril=no
 ro.vendor.epdg.support=true