From 798ff412f328727580afe5439a7c0843e7670234 Mon Sep 17 00:00:00 2001
From: Devi Sandeep Endluri V V <dendluri@codeaurora.org>
Date: Wed, 31 May 2017 11:34:37 +0530
Subject: [IMS]: Start ims daemons from vendor

    - imsdatadaemon, imsqmidaemon, ims_rtp_daemon
      and imscmservice  have to be started from vendor partition.

    CRs-fixed: 2053865
    Change-Id: Ifd195376b4d0f11e8f276833c55ac02c93988cb7
---
 android_filesystem_config.h |  6 ++++--
 init.target.rc              |  9 ++++-----
 vintf.xml                   | 20 ++++++++++----------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/android_filesystem_config.h b/android_filesystem_config.h
index 0785d55..f3b04d5 100755
--- a/android_filesystem_config.h
+++ b/android_filesystem_config.h
@@ -36,8 +36,10 @@ static const struct fs_path_config android_device_files[] = {
        { 00755, AID_SYSTEM,         AID_SYSTEM,         (1ULL << CAP_NET_BIND_SERVICE), "system/bin/pm-service" },
        { 00755, AID_SYSTEM,         AID_SYSTEM,         (1ULL << CAP_NET_BIND_SERVICE), "system/vendor/bin/pm-service" },
        { 00755, AID_SYSTEM,         AID_SYSTEM,         (1ULL << CAP_NET_BIND_SERVICE), "vendor/bin/pm-service" },
-       { 00755, AID_SYSTEM,         AID_SYSTEM,         (1ULL << CAP_NET_BIND_SERVICE), "system/bin/imsdatadaemon" },
-       { 00755, AID_SYSTEM,         AID_RADIO,          (1ULL << CAP_NET_BIND_SERVICE), "system/bin/ims_rtp_daemon" },
+       { 00755, AID_SYSTEM,         AID_SYSTEM,         (1ULL << CAP_NET_BIND_SERVICE), "system/vendor/bin/imsdatadaemon" },
+       { 00755, AID_SYSTEM,         AID_RADIO,          (1ULL << CAP_NET_BIND_SERVICE), "system/vendor/bin/ims_rtp_daemon" },
+       { 00755, AID_SYSTEM,         AID_SYSTEM,         (1ULL << CAP_NET_BIND_SERVICE), "vendor/bin/imsdatadaemon" },
+       { 00755, AID_SYSTEM,         AID_RADIO,          (1ULL << CAP_NET_BIND_SERVICE), "vendor/bin/ims_rtp_daemon" },
 #ifdef NO_ANDROID_FILESYSTEM_CONFIG_DEVICE_DIRS
        { 00000, AID_ROOT,      AID_ROOT,      0, "system/etc/fs_config_dirs" },
 #endif
diff --git a/init.target.rc b/init.target.rc
index 874aa26..1dd036c 100755
--- a/init.target.rc
+++ b/init.target.rc
@@ -269,13 +269,13 @@ service audiod /system/bin/audiod
 #    chown system drmrpc /sys/devices/f9966000.i2c/i2c-1/1-0020/secure_touch
 #
 #
-service imsqmidaemon /system/bin/imsqmidaemon
+service imsqmidaemon /system/vendor/bin/imsqmidaemon
     class main
     user system
     socket ims_qmid stream 0660 system radio
     group radio log diag
 
-service imsdatadaemon /system/bin/imsdatadaemon
+service imsdatadaemon /system/vendor/bin/imsdatadaemon
     class main
     user system
     socket ims_datad stream 0660 system radio
@@ -353,14 +353,13 @@ service pd_mapper /system/vendor/bin/pd-mapper
 on property:sys.ims.QMI_DAEMON_STATUS=1
     start imsdatadaemon
 
-service ims_rtp_daemon /system/bin/ims_rtp_daemon
+service ims_rtp_daemon /system/vendor/bin/ims_rtp_daemon
    class main
    user system
-   socket ims_rtpd stream 0660 system radio
    group radio diag inet log
    disabled
 
-service imscmservice /system/bin/imscmservice
+service imscmservice /system/vendor/bin/imscmservice
    class main
    user system
    group radio diag inet log
diff --git a/vintf.xml b/vintf.xml
index 13389ac..ba10e01 100644
--- a/vintf.xml
+++ b/vintf.xml
@@ -255,14 +255,14 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         </interface>
     </hal>
     <!-- IMS RTP Service -->
-    <hal format="hidl">
-        <name>com.qualcomm.qti.imsrtpservice</name>
-        <transport>hwbinder</transport>
-        <impl level="generic"></impl>
-        <version>1.0</version>
-        <interface>
-            <name>IRTPService</name>
-            <instance>rtpservice0</instance>
-        </interface>
-    </hal>
+    <hal format="hidl">
+        <name>com.qualcomm.qti.imsrtpservice</name>
+        <transport>hwbinder</transport>
+        <impl level="generic"></impl>
+        <version>1.0</version>
+        <interface>
+            <name>IRTPService</name>
+            <instance>imsrtpservice</instance>
+        </interface>
+    </hal>
 </manifest>
-- 
cgit v1.2.3