From bac88dd586f9d412467c3855a784942b87076fca Mon Sep 17 00:00:00 2001
From: Nolen Johnson <johnsonnolen@gmail.com>
Date: Tue, 18 Jun 2024 16:16:52 -0400
Subject: [PATCH] nx: Nuke wifi_reset from orbit

* New cypress-fmac works with sleep!

Change-Id: I62655f9b4f6ac2b1f5240f28305eb0578f934bfd
---
 BoardConfig.mk                    |  2 --
 device.mk                         |  1 -
 initfiles/Android.mk              |  9 ---------
 initfiles/wifi_reset.rc           |  8 --------
 initfiles/wifi_reset.sh           |  6 ------
 sepolicy/private/file_contexts    |  2 --
 sepolicy/private/system_server.te |  6 ------
 sepolicy/private/wifi_reset.te    | 18 ------------------
 8 files changed, 52 deletions(-)
 delete mode 100644 initfiles/wifi_reset.rc
 delete mode 100644 initfiles/wifi_reset.sh
 delete mode 100644 sepolicy/private/file_contexts
 delete mode 100644 sepolicy/private/system_server.te
 delete mode 100644 sepolicy/private/wifi_reset.te

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 3f27c72..92ddbf8 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -91,9 +91,7 @@ TARGET_RELEASETOOLS_EXTENSIONS := device/nintendo/nx/releasetools
 VENDOR_SECURITY_PATCH := 2022-04-05
 
 # SELinux
-SELINUX_IGNORE_NEVERALLOWS := true
 BOARD_VENDOR_SEPOLICY_DIRS += device/nintendo/nx/sepolicy/vendor
-SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/nintendo/nx/sepolicy/private
 
 # Treble
 BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
diff --git a/device.mk b/device.mk
index 2eaa841..8670d01 100644
--- a/device.mk
+++ b/device.mk
@@ -190,5 +190,4 @@ endif
 
 # WiFi
 PRODUCT_PACKAGES += \
-    wifi_reset \
     WifiOverlay
diff --git a/initfiles/Android.mk b/initfiles/Android.mk
index 3e9f4b9..0376bee 100644
--- a/initfiles/Android.mk
+++ b/initfiles/Android.mk
@@ -101,15 +101,6 @@ LOCAL_MODULE_CLASS  := EXECUTABLES
 LOCAL_VENDOR_MODULE := true
 include $(BUILD_PREBUILT)
 
-# Goes on system due to needing `settings` and `svc`
-include $(CLEAR_VARS)
-LOCAL_MODULE        := wifi_reset
-LOCAL_SRC_FILES     := wifi_reset.sh
-LOCAL_MODULE_SUFFIX := .sh
-LOCAL_INIT_RC       := wifi_reset.rc
-LOCAL_MODULE_CLASS  := EXECUTABLES
-include $(BUILD_PREBUILT)
-
 include $(CLEAR_VARS)
 LOCAL_MODULE               := nx_cec.rc
 LOCAL_MODULE_CLASS         := ETC
diff --git a/initfiles/wifi_reset.rc b/initfiles/wifi_reset.rc
deleted file mode 100644
index 31a89c6..0000000
--- a/initfiles/wifi_reset.rc
+++ /dev/null
@@ -1,8 +0,0 @@
-service wifi_reset /system/bin/wifi_reset.sh
-    user root
-    group root system
-    disabled
-    oneshot
-
-on property:wlan.driver.status=unloaded
-   start wifi_reset
diff --git a/initfiles/wifi_reset.sh b/initfiles/wifi_reset.sh
deleted file mode 100644
index f88f191..0000000
--- a/initfiles/wifi_reset.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/system/bin/sh
-
-user_state=$(/system/bin/settings get global wifi_on)
-if [ $user_state = "1" ]; then
-	svc wifi enable
-fi
diff --git a/sepolicy/private/file_contexts b/sepolicy/private/file_contexts
deleted file mode 100644
index 0b24844..0000000
--- a/sepolicy/private/file_contexts
+++ /dev/null
@@ -1,2 +0,0 @@
-# wifi_reset.sh
-/system/bin/wifi_reset.sh u:object_r:wifi_reset_exec:s0
diff --git a/sepolicy/private/system_server.te b/sepolicy/private/system_server.te
deleted file mode 100644
index 91278a6..0000000
--- a/sepolicy/private/system_server.te
+++ /dev/null
@@ -1,6 +0,0 @@
-# wifi_reset.sh
-allow system_server wifi_reset:fifo_file rw_file_perms;
-
-allow system_server wifi_reset:binder call;
-
-allow system_server wifi_reset:fd use;
diff --git a/sepolicy/private/wifi_reset.te b/sepolicy/private/wifi_reset.te
deleted file mode 100644
index d3574ab..0000000
--- a/sepolicy/private/wifi_reset.te
+++ /dev/null
@@ -1,18 +0,0 @@
-# /system/bin/wifi_reset.sh
-type wifi_reset, domain;
-type wifi_reset_exec, exec_type, file_type, system_file_type;
-
-init_daemon_domain(wifi_reset)
-binder_use(wifi_reset)
-
-allow wifi_reset settings_service:service_manager find;
-
-allow wifi_reset system_server:binder {call transfer};
-
-allow wifi_reset wifi_service:service_manager find;
-
-# neverallow - to read #!/system/bin/sh
-allow wifi_reset shell_exec:file rx_file_perms;
-
-# neverallow - read/open & execute_no_trans on /system/bin/settings
-allow wifi_reset system_file:file {r_file_perms execute execute_no_trans};