universal7580: remove unused macloader service

Change-Id: I6c30c777aa3e83f262ffd80bc48a7f678407c14a

diff --git a/device-common.mk b/device-common.mk
index 197f78e56036ec3aa2555da99bfb205038c95675..73fd8e8a333e5db6791d694d5a42028278db93e0 100644 (file)
--- a/device-common.mk
+++ b/device-common.mk
@@ -160,7 +160,6 @@ PRODUCT_PACKAGES += \
 
 # Wifi
 PRODUCT_PACKAGES += \
-    macloader \
     wifiloader \
     hostapd \
     wificond \

diff --git a/ramdisk/etc/init.samsungexynos7580.rc b/ramdisk/etc/init.samsungexynos7580.rc
index 44d9620086079181430264c1791b67eee68a6c76..b743cd36a68dd4bef3acbd10906b1979dd647d51 100644 (file)
--- a/ramdisk/etc/init.samsungexynos7580.rc
+++ b/ramdisk/etc/init.samsungexynos7580.rc
@@ -867,10 +867,6 @@ on property:ro.debuggable=1
     write /sys/module/kgdboc/parameters/kgdboc ttyFIQ1
     write /sys/module/fiq_debugger/parameters/kgdb_enable 1
 
-# rerun macloader to fix wifi after hotspot
-on property:wlan.driver.status=unloaded
-    start macloader
-
 # Kick watchdogd if debug_level is low
 on property:ro.debug_level=0x4f4c
     start watchdogd

diff --git a/ramdisk/etc/init.wifi.rc b/ramdisk/etc/init.wifi.rc
index 58f46f9469eca984a676c1210457c9bb8a61cec7..2d2899e97c71944fc21edfdf700d0327f57d17f6 100644 (file)
--- a/ramdisk/etc/init.wifi.rc
+++ b/ramdisk/etc/init.wifi.rc
@@ -53,17 +53,6 @@ service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
     disabled
     oneshot
 
-service macloader /vendor/bin/macloader
-    class main
-    user system
-    group wifi
-    oneshot
-
-on property:init.svc.macloader=stopped
-    chown system root /data/.cid.info
-    chmod 0664 /data/.cid.info
-    chown system root /data/.rev
-    chmod 0664 /data/.rev
 # end of WiFi MFG (TestMode)
 
 #service olsrd /system/bin/olsrd -f /etc/wifi/olsrd.conf

diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 05c7a35878ca229840be639be4106e0f2728436f..5dc0a96d554d2799b701d2ffac70ff262dd1335c 100644 (file)
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -160,8 +160,6 @@
 /system/bin/sensorhubservice u:object_r:sensorhubservice_exec:s0
 /system/bin/wifiloader       u:object_r:wifiloader_exec:s0
 
-/system/vendor/bin/macloader u:object_r:macloader_exec:s0
-
 /system/bin/cbd              u:object_r:cpboot-daemon_exec:s0
 /system/bin/gpsd             u:object_r:gpsd_exec:s0
 /system/bin/sswap            u:object_r:sswap_exec:s0

diff --git a/sepolicy/macloader.te b/sepolicy/macloader.te
deleted file mode 100644 (file)
index 161e793..0000000
--- a/sepolicy/macloader.te
+++ /dev/null
@@ -1,30 +0,0 @@
-#### macloader
-#
-type macloader, domain;
-type macloader_exec, exec_type, file_type;
-
-init_daemon_domain(macloader)
-
-allow macloader self:capability { chown dac_override fowner fsetid };
-allow macloader self:process execmem;
-
-# Write into /data
-allow macloader system_data_file:dir { add_name search write };
-allow macloader system_file:file execute_no_trans;
-
-# /data/.cid.info
-# Automatically label files created in /data/ as wifi_data_file
-file_type_auto_trans(macloader, system_data_file, wifi_data_file)
-
-allow macloader wifi_data_file:dir create_dir_perms;
-allow macloader wifi_data_file:file { create_file_perms getattr setattr };
-
-# /sys/module/dhd/parameters/nvram_path
-allow macloader sysfs:file rw_file_perms;
-
-# /efs
-allow macloader efs_file:dir r_dir_perms;
-
-# /efs/wifi/.mac.info
-allow macloader wifi_efs_file:dir r_dir_perms;
-allow macloader wifi_efs_file:file r_file_perms;