Merge "Revert^3 "Start tracking vendor seapp coredomain violations"" into main
diff --git a/public/attributes b/public/attributes
index fdac127..d2b2cc1 100644
--- a/public/attributes
+++ b/public/attributes
@@ -300,11 +300,6 @@
attribute untrusted_app_visible_halserver_violators;
expandattribute untrusted_app_visible_halserver_violators false;
-# All system domains which are assignable with vendor's seapp_contexts files.
-# TODO(b/280547417): Remove this once there are no violations
-attribute vendor_seapp_assigns_coredomain_violators;
-expandattribute vendor_seapp_assigns_coredomain_violators false;
-
# PDX services
attribute pdx_endpoint_dir_type;
attribute pdx_endpoint_socket_type;
diff --git a/tools/check_seapp.c b/tools/check_seapp.c
index b80d0e6..21bc87a 100644
--- a/tools/check_seapp.c
+++ b/tools/check_seapp.c
@@ -22,7 +22,6 @@
#define APP_DATA_REQUIRED_ATTRIB "app_data_file_type"
#define COREDOMAIN "coredomain"
-#define VENDOR_SEAPP_ASSIGNS_COREDOMAIN_VIOLATORS "vendor_seapp_assigns_coredomain_violators"
/**
* Initializes an empty, static list.
@@ -450,13 +449,7 @@
return false;
}
- type_datum_t *attrib_violators = find_type(pol.db,
- VENDOR_SEAPP_ASSIGNS_COREDOMAIN_VIOLATORS,
- TYPE_ATTRIB);
- bool allowlisted = attrib_violators != NULL &&
- type_has_attribute(pol.db, type_dat, attrib_violators);
-
- if (type_has_attribute(pol.db, type_dat, attrib_dat) && !allowlisted) {
+ if (type_has_attribute(pol.db, type_dat, attrib_dat)) {
coredomain_violation_entry *entry = (coredomain_violation_entry *)malloc(sizeof(*entry));
entry->domain = strdup(value);
entry->filename = strdup(filename);