From 7d99cb87ea21af55d699a319462f9999f960f302 Mon Sep 17 00:00:00 2001 From: Priyanka Advani Date: Fri, 17 May 2024 20:35:34 +0000 Subject: [PATCH] Revert "WLC: service: add configuration and contexts for sepolicy" Revert submission 27233359-wlcservice-main Reason for revert: Droidmonitor triggered revert due to b/341014314. Test is still flaky on all devices except akita. Will be verifying through ABTD before submission. Reverted changes: /q/submissionid:27233359-wlcservice-main Change-Id: Idf2749208a361c14ebac92ad221cc2599fc8135e --- wireless_charger/compatibility_matrix.xml | 8 -------- wireless_charger/sepolicy/dumpstate.te | 1 - wireless_charger/sepolicy/file.te | 1 - wireless_charger/sepolicy/file_contexts | 4 ---- .../sepolicy/hal_wireless_charger.te | 1 - wireless_charger/sepolicy/hal_wlcservice.te | 18 ------------------ wireless_charger/sepolicy/service.te | 1 - wireless_charger/sepolicy/service_contexts | 1 - wireless_charger/wireless_charger.mk | 1 - 9 files changed, 36 deletions(-) delete mode 100644 wireless_charger/sepolicy/dumpstate.te delete mode 100644 wireless_charger/sepolicy/file.te delete mode 100644 wireless_charger/sepolicy/hal_wlcservice.te delete mode 100644 wireless_charger/sepolicy/service.te diff --git a/wireless_charger/compatibility_matrix.xml b/wireless_charger/compatibility_matrix.xml index b760b1d..7d18cd9 100644 --- a/wireless_charger/compatibility_matrix.xml +++ b/wireless_charger/compatibility_matrix.xml @@ -7,12 +7,4 @@ default - - vendor.google.wireless_charger.service - 1 - - IWlcService - default - - diff --git a/wireless_charger/sepolicy/dumpstate.te b/wireless_charger/sepolicy/dumpstate.te deleted file mode 100644 index 3c5fac3..0000000 --- a/wireless_charger/sepolicy/dumpstate.te +++ /dev/null @@ -1 +0,0 @@ -binder_call(dumpstate, hal_wlcservice) diff --git a/wireless_charger/sepolicy/file.te b/wireless_charger/sepolicy/file.te deleted file mode 100644 index 6dd54c8..0000000 --- a/wireless_charger/sepolicy/file.te +++ /dev/null @@ -1 +0,0 @@ -type vendor_wlc_file, file_type, data_file_type; diff --git a/wireless_charger/sepolicy/file_contexts b/wireless_charger/sepolicy/file_contexts index 98796a9..004c7a1 100644 --- a/wireless_charger/sepolicy/file_contexts +++ b/wireless_charger/sepolicy/file_contexts @@ -1,5 +1 @@ /vendor/bin/hw/vendor\.google\.wireless_charger-default u:object_r:hal_wireless_charger_exec:s0 -/vendor/bin/hw/vendor\.google\.wireless_charger\.service-default u:object_r:hal_wlcservice_exec:s0 - -# Data -/data/vendor/wireless_charger(/.*)? u:object_r:vendor_wlc_file:s0 diff --git a/wireless_charger/sepolicy/hal_wireless_charger.te b/wireless_charger/sepolicy/hal_wireless_charger.te index b5ed734..7ab8d83 100644 --- a/wireless_charger/sepolicy/hal_wireless_charger.te +++ b/wireless_charger/sepolicy/hal_wireless_charger.te @@ -17,4 +17,3 @@ userdebug_or_eng(` binder_call(hal_wireless_charger, platform_app) binder_call(hal_wireless_charger, system_app) -binder_call(hal_wireless_charger, hal_wlcservice) diff --git a/wireless_charger/sepolicy/hal_wlcservice.te b/wireless_charger/sepolicy/hal_wlcservice.te deleted file mode 100644 index eadb593..0000000 --- a/wireless_charger/sepolicy/hal_wlcservice.te +++ /dev/null @@ -1,18 +0,0 @@ -type hal_wlcservice, domain; -type hal_wlcservice_exec, exec_type, vendor_file_type, file_type; - -init_daemon_domain(hal_wlcservice) - -allow hal_wlcservice vendor_wlc_file:dir create_dir_perms; -allow hal_wlcservice vendor_wlc_file:file create_file_perms; -allow hal_wlcservice hal_wireless_charger_service:service_manager find; -allow hal_wlcservice kmsg_device:chr_file { getattr w_file_perms }; - -binder_call(hal_wlcservice, servicemanager) -add_service(hal_wlcservice, hal_wlcservice_service) - -userdebug_or_eng(` - domain_auto_trans(shell, hal_wlcservice_exec, hal_wlcservice) -') - -binder_call(hal_wlcservice, hal_wireless_charger) diff --git a/wireless_charger/sepolicy/service.te b/wireless_charger/sepolicy/service.te deleted file mode 100644 index 8f8d87b..0000000 --- a/wireless_charger/sepolicy/service.te +++ /dev/null @@ -1 +0,0 @@ -type hal_wlcservice_service, hal_service_type, protected_service, service_manager_type; diff --git a/wireless_charger/sepolicy/service_contexts b/wireless_charger/sepolicy/service_contexts index ed2faba..5813e35 100644 --- a/wireless_charger/sepolicy/service_contexts +++ b/wireless_charger/sepolicy/service_contexts @@ -1,2 +1 @@ vendor.google.wireless_charger.IWirelessCharger/default u:object_r:hal_wireless_charger_service:s0 -vendor.google.wireless_charger.service.IWlcService/default u:object_r:hal_wlcservice_service:s0 diff --git a/wireless_charger/wireless_charger.mk b/wireless_charger/wireless_charger.mk index a2dc27c..acf5fc1 100644 --- a/wireless_charger/wireless_charger.mk +++ b/wireless_charger/wireless_charger.mk @@ -1,6 +1,5 @@ PRODUCT_SOONG_NAMESPACES += vendor/google/interfaces PRODUCT_PACKAGES += vendor.google.wireless_charger-default -PRODUCT_PACKAGES += vendor.google.wireless_charger.service-default DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/wireless_charger/compatibility_matrix.xml BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/wireless_charger/sepolicy