Revert "sabrina: Override systemcontrol to allow NET_ADMIN"

This reverts commit a627b61631364e94a5af7d6087128120e95aaaca.

Reason for revert: Doesn't work.

Change-Id: Ia272f8644f31dfab2f5d3ee320e936d0ca6f3689

diff --git a/device.mk b/device.mk
index 43fc6aa6e4ed2e3c470abdc112c92a02baba3527..fbe0623ede13bd589b39a21a83a4dd0f8d05d054 100644 (file)
--- a/device.mk
+++ b/device.mk
@@ -16,8 +16,7 @@ include kernel/amlogic/kernel-modules/dhd-driver/firmware/bluetooth/bluetooth.mk
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/init-files/init.amlogic.sku.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.sku.rc \
     $(LOCAL_PATH)/init-files/init.amlogic.wifi_buildin.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi_buildin.rc \
-    $(LOCAL_PATH)/init-files/init.recovery.sabrina.rc:recovery/root/init.recovery.sabrina.rc \
-    $(LOCAL_PATH)/init-files/systemcontrol_sabrina.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/systemcontrol_sabrina.rc
+    $(LOCAL_PATH)/init-files/init.recovery.sabrina.rc:recovery/root/init.recovery.sabrina.rc
 
 ## Keylayout (IR)
 PRODUCT_COPY_FILES += \

diff --git a/init-files/systemcontrol_sabrina.rc b/init-files/systemcontrol_sabrina.rc
deleted file mode 100644 (file)
index 5f709d3..0000000
--- a/init-files/systemcontrol_sabrina.rc
+++ /dev/null
@@ -1,7 +0,0 @@
-service system_control /vendor/bin/systemcontrol
-    override
-    user root
-    group system root media audio
-    interface vendor.amlogic.hardware.systemcontrol@1.0::ISystemControl default
-    interface vendor.amlogic.hardware.systemcontrol@1.1::ISystemControl default
-    capabilities NET_ADMIN