A6020: drop VoLTE for now

Change-Id: Ibb759bf3a9def8cc03f833ad629fd03ff252c44c

10 files changed, 1 insertions, 203 deletions

diff --git a/android_filesystem_config.h b/android_filesystem_config.h
index 6df1d2b..e589e06 100644
--- a/android_filesystem_config.h
+++ b/android_filesystem_config.h
@@ -31,7 +31,4 @@
 
 #define NO_ANDROID_FILESYSTEM_CONFIG_DEVICE_DIRS
  const struct fs_path_config android_device_files[] = {
-      // { 00755, AID_UID,     AID_GID,     (1ULL << CAPABILITY), "PATH_TO_BINARY" },
-      { 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" },
-};
\ No newline at end of file
+};
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index a802257..1b0946b 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -280,14 +280,6 @@
          format is UMTS|LTE|... -->
     <string translatable="false" name="config_radio_access_family">GSM | WCDMA | LTE | CDMA | EVDO</string>
 
-    <!-- Flag specifying whether VoLTE is available on device -->
-    <bool name="config_device_volte_available">true</bool>
-
-    <!-- Flag specifying whether VoLTE should be available for carrier: independent of
-         carrier provisioning. If false: hard disabled. If true: then depends on carrier
-         provisioning, availability etc -->
-    <bool name="config_carrier_volte_available">true</bool>
-
     <!-- Flag specifying whether VT is available on device -->
     <bool name="config_device_vt_available">true</bool>
 
diff --git a/product/ramdisk.mk b/product/ramdisk.mk
index b7778ea..a42bef6 100644
--- a/product/ramdisk.mk
+++ b/product/ramdisk.mk
@@ -6,10 +6,8 @@ PRODUCT_PACKAGES += \
     init.power.sh \
     init.qcom.rc \
     init.qcom.sh \
-    init.qcom-ims.rc \
     init.qcom.mem.sh \
     init.qcom.ril.sh \
-    init.qti.ims.sh \
     ueventd.qcom.rc
 
 PRODUCT_PACKAGES += \
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 83c6810..7f821c8 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -5,8 +5,6 @@
 # Apks
 app/TimeService/TimeService.apk
 priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
-vendor/app/ims/ims.apk
-vendor/app/imssettings/imssettings.apk
 
 # Audio Calibration Files
 etc/acdbdata/MTP/msm8939-tapan-snd-card/MTP_WCD9306_Bluetooth_cal.acdb
@@ -42,10 +40,6 @@ etc/acdbdata/QRD/QRD_Speaker_cal.acdb
 bin/adsprpcd
 bin/btnvtool
 bin/hci_qcomm_init
-bin/ims_rtp_daemon
-bin/imscmservice
-bin/imsdatadaemon
-bin/imsqmidaemon
 bin/irsc_util
 bin/mm-qcamera-daemon
 bin/msm_irqbalance
@@ -62,7 +56,6 @@ bin/vm_bms
 etc/data/dsi_config.xml
 etc/data/netmgr_config.xml
 etc/data/qmi_config.xml
-etc/permissions/imscm.xml
 etc/permissions/qcnvitems.xml
 etc/permissions/qcrilhook.xml
 etc/permissions/qti_permissions.xml
@@ -108,7 +101,6 @@ vendor/firmware/a420_pfp.fw
 vendor/firmware/a420_pm4.fw
 
 # Framework
-framework/imscmlibrary.jar
 framework/qcnvitems.jar
 framework/qcrilhook.jar
 
@@ -461,25 +453,3 @@ vendor/lib64/libwvm.so
 vendor/lib64/libxml.so
 vendor/lib64/mediadrm/libdrmclearkeyplugin.so
 
-# Vendor Libs - IMS
-vendor/lib64/lib-dplmedia.so
-vendor/lib64/lib-ims-rcscmjni.so
-vendor/lib64/lib-imscamera.so
-vendor/lib64/lib-imsdpl.so
-vendor/lib64/lib-imsqimf.so
-vendor/lib64/lib-imsrcs.so
-vendor/lib64/lib-imsrcscm.so
-vendor/lib64/lib-imsrcscmclient.so
-vendor/lib64/lib-imsrcscmservice.so
-vendor/lib64/lib-imss.so
-vendor/lib64/lib-imsSDP.so
-vendor/lib64/lib-imsvt.so
-vendor/lib64/lib-imsxml.so
-vendor/lib64/lib-rcsimssjni.so
-vendor/lib64/lib-rcsjni.so
-vendor/lib64/lib-rtpcommon.so
-vendor/lib64/lib-rtpcore.so
-vendor/lib64/lib-rtpdaemoninterface.so
-vendor/lib64/lib-rtpsl.so
-vendor/lib64/libimscamera_jni.so
-vendor/lib64/libimsmedia_jni.so
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 6410e6e..77b01bb 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -43,14 +43,6 @@ LOCAL_SRC_FILES    := etc/init.qcom.mem.sh
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE       := init.qti.ims.sh
-LOCAL_MODULE_TAGS  := optional eng
-LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := etc/init.qti.ims.sh
-LOCAL_MODULE_PATH  := $(TARGET_ROOT_OUT)
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
 LOCAL_MODULE       := fstab.qcom
 LOCAL_MODULE_TAGS  := optional eng
 LOCAL_MODULE_CLASS := ETC
@@ -81,11 +73,3 @@ LOCAL_MODULE_CLASS := ETC
 LOCAL_SRC_FILES    := etc/init.qcom.rc
 LOCAL_MODULE_PATH  := $(TARGET_ROOT_OUT)
 include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE       := init.qcom-ims.rc
-LOCAL_MODULE_TAGS  := optional eng
-LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := etc/init.qcom-ims.rc
-LOCAL_MODULE_PATH  := $(TARGET_ROOT_OUT)
-include $(BUILD_PREBUILT)
diff --git a/rootdir/etc/init.qcom-ims.rc b/rootdir/etc/init.qcom-ims.rc
deleted file mode 100644
index 18c6c79..0000000
--- a/rootdir/etc/init.qcom-ims.rc
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright (c) 2009-2012, 2014, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of The Linux Foundation nor
-#       the names of its contributors may be used to endorse or promote
-#       products derived from this software without specific prior written
-#       permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NON-INFRINGEMENT ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-on init
-
-service imsqmidaemon /system/bin/imsqmidaemon
-    class main
-    user system
-    socket ims_qmid stream 0660 system radio
-    group radio net_raw log qcom_diag
-    writepid /dev/cpuset/system-background/tasks
-
-service imsdatadaemon /system/bin/imsdatadaemon
-    class main
-    user system
-    socket ims_datad stream 0660 system radio
-    group system wifi radio inet net_raw log qcom_diag net_admin
-    writepid /dev/cpuset/system-background/tasks
-    disabled
-
-on property:sys.ims.QMI_DAEMON_STATUS=1
-    start imsdatadaemon
-
-service ims_rtp_daemon /system/bin/ims_rtp_daemon
-   class main
-   user system
-   socket ims_rtpd stream 0660 system radio
-   group radio net_raw diag qcom_diag log
-   disabled
-
-service imscmservice /system/bin/imscmservice
-   class main
-   user system
-   group radio net_raw diag qcom_diag log
-   writepid /dev/cpuset/system-background/tasks
-   disabled
-
-on property:sys.ims.DATA_DAEMON_STATUS=1
-    start ims_rtp_daemon
-    start imscmservice
-
-service ims_trigger /init.qti.ims.sh
-    class main
-    user root
-    oneshot
\ No newline at end of file
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 3f4adc6..333b5e5 100755
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -26,7 +26,6 @@
 #
 
 import init.qcom.usb.rc
-import init.qcom-ims.rc
 import init.target.rc
 
 on early-init
diff --git a/rootdir/etc/init.qti.ims.sh b/rootdir/etc/init.qti.ims.sh
deleted file mode 100644
index 5a8f791..0000000
--- a/rootdir/etc/init.qti.ims.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/system/bin/sh
-# Copyright (c) 2015, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-#       copyright notice, this list of conditions and the following
-#       disclaimer in the documentation and/or other materials provided
-#       with the distribution.
-#     * Neither the name of The Linux Foundation nor the names of its
-#       contributors may be used to endorse or promote products derived
-#       from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-#
-
-dir0=/data
-trigger_file=$dir0/ims_disabled
-ims_disabled=`getprop persist.ims.disabled`
-target=`getprop ro.build.product`
-
-#if [ ! -e $trigger_file ]; then
-#   for future use in doing conditional debugging
-#else
-#
-#fi
-
-echo "$ims_disabled"
-echo "$target"
-
-if [ "$ims_disabled" = "0" ]; then
-    echo "ims will be enabled"
-    setprop service.qti.ims.enabled 1
-    exit
-fi
-
-if [ "$ims_disabled" = "1" ] || [ "$target" = "msm8909_512" ]; then
-    echo "ims is disabled"
-    setprop service.qti.ims.enabled 0
-else
-    echo "ims is enabled"
-    setprop service.qti.ims.enabled 1
-fi
-
diff --git a/sepolicy/ims.te b/sepolicy/ims.te
deleted file mode 100644
index a7a9228..0000000
--- a/sepolicy/ims.te
+++ /dev/null
@@ -1 +0,0 @@
-allow ims self:capability { net_admin net_raw };
diff --git a/system.prop b/system.prop
index 496e094..531e821 100644
--- a/system.prop
+++ b/system.prop
@@ -66,20 +66,6 @@ persist.data.qmi.adb_logmask=0
 ro.qualcomm.cabl=0
 
 # Radio Configuration 
-# IMS
-net.lte.volte_call_capable=true
-persist.ims.enableADBLogs=1
-persist.ims.enableDebugLogs=1
-persist.radio.calls.on.ims=true
-persist.radio.csvt.enabled=false
-persist.radio.jbims=1
-persist.radio.ROTATION_ENABLE=1
-persist.radio.VT_ENABLE=1
-persist.radio.VT_HYBRID_ENABLE=1
-persist.radio.VT_USE_MDM_TIME=0
-persist.volte_enabled_by_hw=1
-persist.dbg.volte_avail_ovr=1
-
 # RIL
 DEVICE_PROVISIONED=1
 persist.data.netmgrd.qos.enable=true