Update TA configuration

Change-Id: I74cc7c5e1737877996e4f6cec48af47cab175687

4 files changed, 3 insertions, 15 deletions

diff --git a/proprietary-files.txt b/proprietary-files.txt
index d6ba972..81c8463 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -367,7 +367,6 @@ lib/sysmon/sysmon_xo_therm.so
 
 # TA
 bin/taimport
-bin/ta_param_loader
 bin/ta_qmi_service
 lib/libMiscTaAccessor.so
 lib/libmiscta.so
diff --git a/rootdir/init.qcom.rc b/rootdir/init.qcom.rc
index 8d07300..b265ef6 100644
--- a/rootdir/init.qcom.rc
+++ b/rootdir/init.qcom.rc
@@ -97,8 +97,6 @@ on fs
     chmod 0555 /lta-label
 
     chmod 0755 /data/etc
-    class_start sony_ta
-    exec /sbin/wait4tad_static
     exec /system/bin/taimport
 
     restorecon_recursive /data/etc
@@ -109,9 +107,6 @@ on early-boot
 
     write /sys/kernel/boot_adsp/boot 1
 
-    start ta_qmi_service
-    start sct_service
-
     # Run pre_hw_config.sh before entering charge only mode.
     exec /system/bin/sh /system/etc/pre_hw_config.sh
 
@@ -405,12 +400,7 @@ service tad_static /sbin/tad_static /dev/block/mmcblk0 1,16
     user root
     group root
     socket tad stream 0660 system system
-    class sony_ta
-
-service updatemiscta /system/bin/updatemiscta
-    class main
-    user root
-    oneshot
+    class core
 
 service netmgrd /system/bin/netmgrd
     class main
@@ -574,12 +564,12 @@ service illumination /system/bin/illumination_service
 # Secure Config Transfer service
 service sct_service /system/bin/sct_service
     user root
-    disabled
+    class main
 
 # Trim Area QMI service
 service ta_qmi_service /system/bin/ta_qmi_service
     user root
-    disabled
+    class main
 
 # Start system_monitor
 service system_monitor /system/bin/system_monitor
diff --git a/rootdir/sbin/wait4tad_static b/rootdir/sbin/wait4tad_static
deleted file mode 100644
index 945a325..0000000
--- a/rootdir/sbin/wait4tad_static
+++ /dev/null
diff --git a/shinano.mk b/shinano.mk
index 119ed1b..7a2b240 100644
--- a/shinano.mk
+++ b/shinano.mk
@@ -53,7 +53,6 @@ PRODUCT_PACKAGES += \
 # Sbin
 PRODUCT_COPY_FILES += \
     $(COMMON_PATH)/rootdir/charger:root/charger \
-    $(COMMON_PATH)/rootdir/sbin/wait4tad_static:root/sbin/wait4tad_static \
     $(COMMON_PATH)/rootdir/sbin/tad_static:root/sbin/tad_static
 
 # ANT+