diff --git a/private/binder_in_vendor_violators.te b/private/binder_in_vendor_violators.te deleted file mode 100644 index 4a1218e1d..000000000 --- a/private/binder_in_vendor_violators.te +++ /dev/null @@ -1 +0,0 @@ -allow binder_in_vendor_violators binder_device:chr_file rw_file_perms; diff --git a/private/compat/30.0/30.0.cil b/private/compat/30.0/30.0.cil index 8804303e7..d16d9ed8e 100644 --- a/private/compat/30.0/30.0.cil +++ b/private/compat/30.0/30.0.cil @@ -18,6 +18,8 @@ (type ffs_prop) (type system_radio_prop) +(typeattribute binder_in_vendor_violators) + (expandtypeattribute (DockObserver_service_30_0) true) (expandtypeattribute (IProxyService_service_30_0) true) (expandtypeattribute (accessibility_service_30_0) true) diff --git a/public/attributes b/public/attributes index f1e9c92b6..ce6e540b8 100644 --- a/public/attributes +++ b/public/attributes @@ -200,11 +200,6 @@ attribute coredomain; attribute coredomain_socket; expandattribute coredomain_socket false; -# All vendor domains which violate the requirement of not using Binder -# TODO(b/35870313): Remove this once there are no violations -attribute binder_in_vendor_violators; -expandattribute binder_in_vendor_violators false; - # All vendor domains which violate the requirement of not using sockets for # communicating with core components # TODO(b/36577153): Remove this once there are no violations diff --git a/public/domain.te b/public/domain.te index f23e832f1..58b2d98fd 100644 --- a/public/domain.te +++ b/public/domain.te @@ -644,7 +644,6 @@ full_treble_only(` neverallow { domain -coredomain - -binder_in_vendor_violators # TODO(b/131617943) remove once all violators are gone } { service_manager_type -vendor_service diff --git a/tests/treble_sepolicy_tests.py b/tests/treble_sepolicy_tests.py index 1046fa8b5..9209b66a8 100644 --- a/tests/treble_sepolicy_tests.py +++ b/tests/treble_sepolicy_tests.py @@ -294,7 +294,7 @@ def TestViolatorAttribute(attribute): return ret def TestViolatorAttributes(): - ret = TestViolatorAttribute("binder_in_vendor_violators") + ret = "" ret += TestViolatorAttribute("socket_between_core_and_vendor_violators") ret += TestViolatorAttribute("vendor_executes_system_violators") return ret