diff --git a/public/mediacodec.te b/public/mediacodec.te
index 469c8bab5e8d773005507f18c9f147007d73c953..ecbe2802cf02c418020fa4ef5605c7ff5dc9f145 100644
--- a/public/mediacodec.te
+++ b/public/mediacodec.te
@@ -13,6 +13,8 @@ binder_call(mediacodec, binderservicedomain)
 binder_call(mediacodec, appdomain)
 binder_service(mediacodec)
 
+# TODO(b/36604251): Remove this once OMX HAL stops using Binder
+typeattribute mediacodec binder_in_vendor_violators;
 add_service(mediacodec, mediacodec_service)
 allow mediacodec mediametrics_service:service_manager find;
 allow mediacodec surfaceflinger_service:service_manager find;
diff --git a/vendor/hal_omx.te b/vendor/hal_omx.te
index ff290bc41f2dc5a789f293236a21d4e5e2101a1b..fdb4aca59d4a6b9d11832d7a4676b40a4ad396ba 100644
--- a/vendor/hal_omx.te
+++ b/vendor/hal_omx.te
@@ -1,3 +1 @@
-typeattribute mediacodec coredomain;
-
 init_daemon_domain(mediacodec)